diff --git a/Assets/background.svg b/Assets/background.svg new file mode 100755 index 0000000..5d910a8 --- /dev/null +++ b/Assets/background.svg @@ -0,0 +1,840 @@ + + + + diff --git a/Hosts/hertog-laptop/configuration.nix b/Hosts/hertog-laptop/configuration.nix index b730c46..52ec381 100644 --- a/Hosts/hertog-laptop/configuration.nix +++ b/Hosts/hertog-laptop/configuration.nix @@ -7,6 +7,14 @@ networking.hostName = "puter"; security.polkit.enable = true; services.xserver.displayManager.sessionPackages = [ pkgs.sway ]; + boot.kernelParams = [ "i915.force_probe=9a49" ]; + hardware = { + opengl = { + enable = true; + driSupport32Bit = true; + }; + }; + # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion system.stateVersion = "23.05"; } diff --git a/Hosts/hertog-laptop/hardware-configuration.nix b/Hosts/hertog-laptop/hardware-configuration.nix index 8aa9663..9c00619 100644 --- a/Hosts/hertog-laptop/hardware-configuration.nix +++ b/Hosts/hertog-laptop/hardware-configuration.nix @@ -26,7 +26,7 @@ }; swapDevices = - [ { device = "/dev/disk/by-uuid/0cc81e3a-c57d-4a62-8ef9-f93b412aa12e"; } + [ ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking diff --git a/Programs/steam.nix b/Programs/steam.nix new file mode 100644 index 0000000..d34dcdd --- /dev/null +++ b/Programs/steam.nix @@ -0,0 +1,9 @@ +{ config, pkgs, ... }: + +{ + programs.steam = { + enable = true; + remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play + dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server + }; +} diff --git a/Users/Hertog/homeFull.nix b/Users/Hertog/homeFull.nix index 8a23a28..3e44227 100644 --- a/Users/Hertog/homeFull.nix +++ b/Users/Hertog/homeFull.nix @@ -20,7 +20,6 @@ # Security keepassxc # Entertainment - steam cartridges prismlauncher-qt5 qFlipper @@ -31,6 +30,7 @@ inkscape gimp # Shell + nushell thefuck pmbootstrap wally-cli diff --git a/Users/Hertog/sway.nix b/Users/Hertog/sway.nix index 8789d55..bfcc201 100755 --- a/Users/Hertog/sway.nix +++ b/Users/Hertog/sway.nix @@ -128,7 +128,7 @@ menu = "wofi --show drun"; startup = [ {command = "export QT_QPA_PLATFORM=wayland";} - {command = "swaybg -i Pictures/AchterGronden/blobcat_hertog.svg";} + {command = "swaybg -i /etc/nixos/Assets/background.svg";} {command = "keepassxc";} ]; colors = { diff --git a/Users/Hertog/zsh.nix b/Users/Hertog/zsh.nix index b83b08e..84196eb 100644 --- a/Users/Hertog/zsh.nix +++ b/Users/Hertog/zsh.nix @@ -10,7 +10,7 @@ shellAliases = { ll = "ls -l"; please = "sudo"; - update = "sudo nixos-rebuild switch --flake /etc/nixos/"; + update = "sudo nixos-rebuild switch --flake /etc/nixos/#laptop"; }; plugins = [ { diff --git a/flake.lock b/flake.lock index fcecf05..5986c1e 100644 --- a/flake.lock +++ b/flake.lock @@ -21,6 +21,22 @@ "type": "github" } }, + "nixos-hardware": { + "locked": { + "lastModified": 1700392353, + "narHash": "sha256-KARn8aVJu5fdW0jdJYoOQ1SPqWlNdz4l7r90NbArWSY=", + "owner": "NixOS", + "repo": "nixos-hardware", + "rev": "2b00bc76dc893cd996a3d76a2f059d657a5ef37a", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "master", + "repo": "nixos-hardware", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1699099776, @@ -39,6 +55,7 @@ "root": { "inputs": { "home-manager": "home-manager", + "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs" } } diff --git a/flake.nix b/flake.nix index 8253299..4fe9198 100644 --- a/flake.nix +++ b/flake.nix @@ -7,9 +7,12 @@ url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixpkgs"; }; + nixos-hardware = { + url = "github:NixOS/nixos-hardware/master"; + }; }; - outputs = { self, nixpkgs, home-manager, ... }@inputs: + outputs = { self, nixpkgs, home-manager, nixos-hardware, ... }@inputs: let system = "x86_64-linux"; currentSystem = system; @@ -27,6 +30,7 @@ modules = [ # Set hardware config for the right host ./Hosts/hertog-laptop/hardware-configuration.nix + nixos-hardware.nixosModules.framework-11th-gen-intel # System ./System/configuration.nix ./Hosts/hertog-laptop/configuration.nix @@ -38,6 +42,7 @@ ./System/appliances.nix # Systemwide installed pacakges userpackages are set through home-manager ./System/packages.nix + ./Programs/steam.nix ./Hosts/hertog-laptop/packages.nix # Users still need to be set outside of home-manager ./Users/Hertog/user.nix