diff --git a/hosts/tardis/default.nix b/hosts/tardis/default.nix index a0c20c3..a26198b 100644 --- a/hosts/tardis/default.nix +++ b/hosts/tardis/default.nix @@ -4,7 +4,6 @@ imports = [ ./hardware-configuration.nix - ./nvidia.nix ]; boot.blacklistedKernelModules = [ @@ -29,6 +28,26 @@ unifont ]; + hardware.graphics.enable = true; + + hardware.nvidia = { + modesetting.enable = true; + powerManagement.enable = false; + powerManagement.finegrained = false; + open = true; + nvidiaSettings = true; + package = config.boot.kernelPackages.nvidiaPackages.stable; + prime = { + offload = { + enable = true; + enableOffloadCmd = true; + }; + intelBusId = "PCI:0@0:2:0"; + nvidiaBusId = "PCI:1@0:0:0"; + }; + }; + + services.xserver = { enable = true; displayManager.startx.enable = true; diff --git a/hosts/tardis/nvidia.nix b/hosts/tardis/nvidia.nix deleted file mode 100644 index 1f9a8c5..0000000 --- a/hosts/tardis/nvidia.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ config, ... }: - -{ - hardware.graphics.enable = true; - - hardware.nvidia = { - modesetting.enable = true; - powerManagement.enable = false; - powerManagement.finegrained = false; - open = true; - nvidiaSettings = true; - package = config.boot.kernelPackages.nvidiaPackages.stable; - prime = { - offload = { - enable = true; - enableOffloadCmd = true; - }; - intelBusId = "PCI:0@0:2:0"; - nvidiaBusId = "PCI:1@0:0:0"; - }; - }; -}