diff options
Diffstat (limited to 'hosts')
-rw-r--r-- | hosts/myrtle/configuration.nix | 47 |
1 files changed, 28 insertions, 19 deletions
diff --git a/hosts/myrtle/configuration.nix b/hosts/myrtle/configuration.nix index 74f4861..f0bcb81 100644 --- a/hosts/myrtle/configuration.nix +++ b/hosts/myrtle/configuration.nix | |||
@@ -12,8 +12,8 @@ | |||
12 | boot.kernelPackages = pkgs.linuxPackages_latest; | 12 | boot.kernelPackages = pkgs.linuxPackages_latest; |
13 | boot.blacklistedKernelModules = [ "nouveau" ]; | 13 | boot.blacklistedKernelModules = [ "nouveau" ]; |
14 | boot.kernelParams = [ | 14 | boot.kernelParams = [ |
15 | "i915.modeset=0" | 15 | # "i915.modeset=0" |
16 | # "intel_pstate=disable" | 16 | # "intel_pstate=disable" |
17 | ]; | 17 | ]; |
18 | 18 | ||
19 | networking = { | 19 | networking = { |
@@ -106,14 +106,14 @@ | |||
106 | nvidia = { | 106 | nvidia = { |
107 | prime = { | 107 | prime = { |
108 | offload.enable = true; | 108 | offload.enable = true; |
109 | intelBusId = "PCI:00:02:0"; | 109 | intelBusId = "PCI:0:2:0"; |
110 | nvidiaBusId = "PCI:01:00:0"; | 110 | nvidiaBusId = "PCI:1:0:0"; |
111 | }; | 111 | }; |
112 | package = config.boot.kernelPackages.nvidiaPackages.latest; | 112 | package = config.boot.kernelPackages.nvidiaPackages.latest; |
113 | powerManagement = { | 113 | # powerManagement = { |
114 | enable = true; | 114 | # enable = true; |
115 | finegrained = true; | 115 | # finegrained = true; |
116 | }; | 116 | # }; |
117 | }; | 117 | }; |
118 | }; | 118 | }; |
119 | 119 | ||
@@ -126,22 +126,31 @@ | |||
126 | xserver = { | 126 | xserver = { |
127 | enable = true; | 127 | enable = true; |
128 | layout = "us"; | 128 | layout = "us"; |
129 | videoDrivers = [ "nvidia" "intel" ]; | 129 | videoDrivers = [ "nvidia" ]; |
130 | displayManager.startx.enable = true; | 130 | displayManager.startx.enable = true; |
131 | dpi = 192; | ||
132 | libinput.enable = true; | 131 | libinput.enable = true; |
133 | serverLayoutSection = '' | 132 | dpi = 192; |
134 | Screen "Screen-nvidia[0]" | 133 | screenSection = '' |
135 | ''; | 134 | Option "metamodes" "nvidia-auto-select +0+0 {ForceFullCompositionPipeline=On}" |
136 | config = lib.mkAfter '' | 135 | Option "AllowIndirectGLXProtocol" "off" |
137 | Section "Screen" | 136 | Option "TripleBuffer" "on" |
138 | Identifier "Screen-nvidia[0]" | ||
139 | Device "Device-nvidia[0]" | ||
140 | EndSection | ||
141 | ''; | 137 | ''; |
138 | # serverLayoutSection = lib.mkAfter '' | ||
139 | # Screen 0 "Screen-nvidia[0]" | ||
140 | # ''; | ||
141 | # config = lib.mkAfter '' | ||
142 | # Section "Screen" | ||
143 | # Identifier "Screen-nvidia[0]" | ||
144 | # Device "Device-nvidia[0]" | ||
145 | # EndSection | ||
146 | # ''; | ||
142 | }; | 147 | }; |
143 | 148 | ||
144 | openssh.enable = true; | 149 | openssh = { |
150 | enable = true; | ||
151 | forwardX11 = true; | ||
152 | allowSFTP = true; | ||
153 | }; | ||
145 | 154 | ||
146 | asusd = { | 155 | asusd = { |
147 | enable = true; | 156 | enable = true; |