diff --git a/flake.nix b/flake.nix index 0dd6aae..155f275 100644 --- a/flake.nix +++ b/flake.nix @@ -38,7 +38,7 @@ { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - home-manager.users.nora = import ./home-manager/desktop.nix; + home-manager.users.nora = import ./home-manager/home.nix; home-manager.extraSpecialArgs = { inherit inputs; }; } ]; @@ -52,7 +52,7 @@ { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - home-manager.users.nora = import ./home-manager/desktop.nix; + home-manager.users.nora = import ./home-manager/home.nix; home-manager.extraSpecialArgs = { inherit inputs; }; }*/ ]; diff --git a/home-manager/desktop.nix b/home-manager/home.nix similarity index 100% rename from home-manager/desktop.nix rename to home-manager/home.nix diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 3faac4c..f4ec6e7 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -136,7 +136,6 @@ in }; programs.waybar.enable = true; - programs.coolercontrol.enable = true; services.flatpak.enable = true; console.keyMap = "sg"; @@ -302,9 +301,6 @@ in }; }; - # TODO: ENABLE NVIDIA DRIVERS WHEN THEY STOP BEING READY - #hardware.nvidia-container-toolkit.enable = true; - hardware.enableAllFirmware = true; # Open ports in the firewall. diff --git a/nixos/desktop.nix b/nixos/desktop.nix index 794bc12..2a6fef2 100644 --- a/nixos/desktop.nix +++ b/nixos/desktop.nix @@ -46,6 +46,7 @@ open = true; }; + programs.coolercontrol.enable = true; programs.coolercontrol.nvidiaSupport = true; services.tailscale = { @@ -89,6 +90,9 @@ checkReversePath = "loose"; }; + # TODO: ENABLE NVIDIA DRIVERS WHEN THEY STOP BEING READY + #hardware.nvidia-container-toolkit.enable = true; + networking.interfaces.enp39s0.wakeOnLan.enable = true; # This value determines the NixOS release from which the default