From 984f76cbc6b655a394365bdc91371c29872b6245 Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Fri, 29 Sep 2023 21:04:46 +0000 Subject: [PATCH] Fix nvidia --- hosts/kadan/hardware-configuration.nix | 16 +++++++++++----- modules/misc/default.nix | 3 --- modules/misc/impermanence.nix | 4 ++++ modules/server/default.nix | 4 ++++ 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/hosts/kadan/hardware-configuration.nix b/hosts/kadan/hardware-configuration.nix index 5330f11..98469d2 100644 --- a/hosts/kadan/hardware-configuration.nix +++ b/hosts/kadan/hardware-configuration.nix @@ -1,6 +1,7 @@ { config, lib, + pkgs, modulesPath, ... }: { @@ -9,9 +10,12 @@ ]; boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"]; - boot.initrd.kernelModules = []; + # boot.initrd.kernelModules = ["nivida"]; boot.kernelModules = ["kvm-intel"]; - boot.extraModulePackages = []; + boot.extraModulePackages = [config.boot.kernelPackages.nvidia_x11]; + boot.blacklistedKernelModules = ["nouveau"]; + # boot.kernelPackages = pkgs.linuxPackages_latest; + fileSystems."/" = { device = "none"; @@ -22,7 +26,7 @@ fileSystems."/tmp" = { device = "none"; fsType = "tmpfs"; - options = [ "size=8G" "mode=755" ]; + options = [ "size=4G" "mode=755" ]; }; fileSystems."/nix" = { @@ -42,7 +46,7 @@ # still possible to use this option, but it's recommended to use it in conjunction # with explicit per-interface declarations with `networking.interfaces..useDHCP`. networking.useDHCP = lib.mkDefault true; - # networking.interfaces.wlo1.useDHCP = lib.mkDefault true; + #networking.interfaces.eno1.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; @@ -78,9 +82,11 @@ # Enable the Nvidia settings menu, # accessible via `nvidia-settings`. - nvidiaSettings = false; + nvidiaSettings = true; # Optionally, you may need to select the appropriate driver version for your specific GPU. package = config.boot.kernelPackages.nvidiaPackages.stable; }; + + system.stateVersion = "23.05"; } diff --git a/modules/misc/default.nix b/modules/misc/default.nix index 22fcfb0..1f65ec8 100644 --- a/modules/misc/default.nix +++ b/modules/misc/default.nix @@ -59,7 +59,4 @@ # boot.kernelPackages = pkgs.linuxPackages_latest; # This was needed on older versions of the kernel. #boot.kernelParams = ["i915.force_probe=46a6" "i915.enable_psr=0"]; - - # Never change this. - system.stateVersion = "22.11"; } diff --git a/modules/misc/impermanence.nix b/modules/misc/impermanence.nix index 187fe3a..2f4d0da 100644 --- a/modules/misc/impermanence.nix +++ b/modules/misc/impermanence.nix @@ -30,6 +30,10 @@ ]; files = [ "/etc/machine-id" + "/etc/ssh/ssh_host_ed25519_key" + "/etc/ssh/ssh_host_ed25519_key.pub" + "/etc/ssh/ssh_host_rsa_key" + "/etc/ssh/ssh_host_rsa_key.pub" ]; users.zoriya = { directories = [ diff --git a/modules/server/default.nix b/modules/server/default.nix index 35905d3..0df12c4 100644 --- a/modules/server/default.nix +++ b/modules/server/default.nix @@ -17,6 +17,10 @@ services.fail2ban = { enable = true; bantime = "-1"; + ignoreIP = [ + "192.168.0.0/16" + ]; + maxretry = 5; }; virtualisation.oci-containers.containers."watchtower" = {