chn/nixos
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixos.git synced 2026-01-12 04:39:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "devices.pc: switch to nvidia"

Browse Source 
This reverts commit 7fb18889e0.
This commit is contained in:
陈浩南
2024-04-09 19:24:01 +08:00
parent 7fb18889e0
commit abe81f230c
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
devices/pc/default.nix
View File

@@ -57,12 +57,11 @@ inputs:
kernel = { varient = "cachyos"; patches = [ "cjktty" "hibernate-progress" ]; };
networking.hostname = "pc";
sysctl.laptop-mode = 5;
gui.defaultX11 = true;
};
hardware =
{
cpus = [ "amd" ];
gpu = { type = "nvidia"; dynamicBoost = true; };
gpu = { type = "amd+nvidia"; prime.busId = { amd = "8:0:0"; nvidia = "1:0:0"; }; dynamicBoost = true; };
legion = {};
};
packages.packageSet = "workstation";
@@ -118,7 +117,7 @@ inputs:
publicKey = "l1gFSDCeBxyf/BipXNvoEvVvLqPgdil84nmr5q6+EEw=";
wireguardIp = "192.168.83.3";
};
gamemode = { enable = true; drmDevice = 0; };
gamemode = { enable = true; drmDevice = 1; };
slurm = { enable = true; cpu = { cores = 16; threads = 2; }; memoryMB = 90112; gpus."4060" = 1; };
xrdp =
{
@@ -133,16 +132,14 @@ inputs:
virtualisation.virtualbox.host = { enable = true; enableExtensionPack = true; };
specialisation =
{
hybrid-offload.configuration =
nvidia.configuration =
{
nixos =
{
hardware.gpu =
{ type = inputs.lib.mkForce "amd+nvidia"; prime.busId = { amd = "8:0:0"; nvidia = "1:0:0"; }; };
services.gamemode.drmDevice = inputs.lib.mkForce 1;
system.gui.defaultX11 = inputs.lib.mkForce false;
hardware.gpu.type = inputs.lib.mkForce "nvidia";
services.gamemode.drmDevice = inputs.lib.mkForce 0;
};
system.nixos.tags = [ "hybrid-offload" ];
system.nixos.tags = [ "nvidia" ];
};
hybrid-sync.configuration =
{

3
modules/system/gui.nix
View File

@@ -6,7 +6,6 @@ inputs:
{ type = types.bool; default = builtins.elem "desktop" inputs.config.nixos.packages._packageSets; };
preferred = mkOption { type = types.bool; default = inputs.config.nixos.system.gui.enable; };
autoStart = mkOption { type = types.bool; default = inputs.config.nixos.system.gui.preferred; };
defaultX11 = mkOption { type = types.bool; default = false; };
};
config =
let
@@ -21,7 +20,7 @@ inputs:
displayManager =
{
sddm.enable = true;
defaultSession = if gui.defaultX11 then "plasma" else "plasmawayland";
defaultSession = "plasmawayland";
};
desktopManager.plasma5.enable = true;
};