diff --git a/README.md b/README.md index e6e0616..d242e32 100644 --- a/README.md +++ b/README.md @@ -16,12 +16,12 @@ This is my personal nix config. It's still in the making, but this is what I got | | Name | Type | Purpose ---|---|---|--- 💻 | nom | Gigabyte AERO 15-W8 (i7-8750H) | My laptop and my main portable development machine Framework when? +🖥️ | potksed | PC (AMD Ryzen 9 5900X) | Main workstation and development machine 🖥️ | ward | ODROID H3 | Energy efficient SBC for my home firewall and some lightweight services using microvms. 🥔 | zackbiene | ODROID N2+ | ARM SBC for home automation, isolating the sketchy stuff from my main network ☁️ | envoy | Hetzner Cloud server | Mailserver ☁️ | sentinel | Hetzner Cloud server | Proxies and protects my local services - diff --git a/hosts/potksed/default.nix b/hosts/potksed/default.nix index 63b1319..1d6449d 100644 --- a/hosts/potksed/default.nix +++ b/hosts/potksed/default.nix @@ -12,6 +12,7 @@ inputs.nixos-hardware.nixosModules.common-pc-ssd ../../modules/optional/hardware/physical.nix + ../../modules/optional/hardware/nvidia.nix ../../modules ../../modules/optional/boot-efi.nix @@ -30,21 +31,7 @@ boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"]; - hardware.nvidia.modesetting.enable = true; - hardware.opengl = { - enable = true; - driSupport = true; - driSupport32Bit = true; - }; - hardware.nvidia.powerManagement.enable = true; - hardware.nvidia.open = false; - hardware.nvidia.nvidiaSettings = true; - - environment.systemPackages = with pkgs; [ - killall - vaapiVdpau - libvdpau-va-gl - ]; + # TODO goodbye once -sk keys. environment.shellInit = '' gpg-connect-agent /bye export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) diff --git a/modules/optional/graphical/default.nix b/modules/optional/graphical/default.nix index d1903b8..4246a0b 100644 --- a/modules/optional/graphical/default.nix +++ b/modules/optional/graphical/default.nix @@ -3,4 +3,9 @@ ./fonts.nix ./wayland.nix ]; + + environment.systemPackages = with pkgs; [ + vaapiVdpau + libvdpau-va-gl + ]; } diff --git a/modules/optional/hardware/nvidia.nix b/modules/optional/hardware/nvidia.nix index 7d97703..92a59ab 100644 --- a/modules/optional/hardware/nvidia.nix +++ b/modules/optional/hardware/nvidia.nix @@ -5,12 +5,14 @@ nvidia = { modesetting.enable = true; nvidiaPersistenced = true; + nvidiaSettings = true; + open = false; + powerManagement.enable = true; }; opengl = { enable = true; + driSupport = true; driSupport32Bit = true; }; }; - - services.xserver.videoDrivers = ["nvidia"]; } diff --git a/users/common/utils.nix b/users/common/utils.nix index 0580a4c..68a2558 100644 --- a/users/common/utils.nix +++ b/users/common/utils.nix @@ -6,6 +6,7 @@ fd file hexyl + killall ncdu neofetch rage