diff --git a/flake.nix b/flake.nix index 4dc6b6a..661be42 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,9 @@ home-manager, ... } @ inputs: let + # args will later be used in outputs to inherit the flake and its inputs for use in modules. args = {inherit self inputs;}; + # mkSystem lets us repeat the same config for multiple systems, called later in outputs. mkSystem = hostname: nixpkgs.lib.nixosSystem { specialArgs = args; diff --git a/systems/modules/hardware/nvidia.nix b/systems/modules/hardware/nvidia.nix index b5afa71..58a9d37 100644 --- a/systems/modules/hardware/nvidia.nix +++ b/systems/modules/hardware/nvidia.nix @@ -4,11 +4,7 @@ config, ... }: { - # Should not be needed because we set modesetting.enable = true; - boot.kernelParams = [ - "nvidia-drm.modeset=1" - "nvidia-drm.fbdev=1" - ]; + # Accept the license by default; needed for some packages. nixpkgs.config.nvidia.acceptLicense = true; services.xserver.videoDrivers = ["nvidia"]; environment.variables = { @@ -35,4 +31,5 @@ package = config.boot.kernelPackages.nvidiaPackages.latest; }; }; + boot.initrd.availableKernelModules = ["nvidia" "nvidia_modeset" "nvidia_uvm" "nvidia_drm"]; } diff --git a/systems/nemesis.nix b/systems/nemesis.nix index 38321d3..36fb08e 100644 --- a/systems/nemesis.nix +++ b/systems/nemesis.nix @@ -16,5 +16,4 @@ boot.plymouth = { enable = true; }; - boot.initrd.availableKernelModules = ["nvidia" "nvidia_modeset" "nvidia_uvm" "nvidia_drm"]; } diff --git a/users/modules/utils.nix b/users/modules/utils.nix index 54a3d3c..8a9d3e3 100644 --- a/users/modules/utils.nix +++ b/users/modules/utils.nix @@ -5,6 +5,8 @@ aichat # duh ripgrep devenv + thefuck + bat ]; services = {