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

system.gui: default coincide with packages._packageSets

Browse Source
This commit is contained in:
陈浩南
2023-12-14 23:28:30 +08:00
parent 839e56e52c
commit 9e14036e57
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
flake.nix
View File

@@ -116,7 +116,6 @@
};
nixpkgs =
{ march = "alderlake"; cuda = { enable = true; capabilities = [ "8.6" ]; forwardCompat = false; }; };
gui = { enable = true; preferred = true; };
kernel.patches = [ "cjktty" ];
impermanence.enable = true;
networking.hostname = "pc";
@@ -295,7 +294,7 @@
initrd.sshd.enable = true;
impermanence.enable = true;
networking.hostname = "vps7";
gui.enable = true;
gui.preferred = false;
};
packages.packageSet = "desktop";
services =
@@ -373,7 +372,7 @@
kernel.patches = [ "cjktty" ];
impermanence.enable = true;
networking.hostname = "nas";
gui.enable = true;
gui.preferred = false;
};
hardware = { cpus = [ "intel" ]; gpus = [ "intel" ]; };
packages.packageSet = "desktop";
@@ -440,7 +439,6 @@
rollingRootfs = { device = "/dev/mapper/root"; path = "/nix/rootfs"; };
};
nixpkgs.march = "silvermont";
gui = { enable = true; preferred = true; };
grub.installDevice = "efi";
nix.substituters = [ "https://cache.nixos.org/" "https://nix-store.chn.moe" ];
kernel.patches = [ "cjktty" ];
@@ -513,7 +511,7 @@
forwardCompat = false;
};
};
gui = { enable = true; preferred = false; };
gui.preferred = false;
kernel.patches = [ "cjktty" ];
impermanence.enable = true;
networking.hostname = "xmupc1";

5
modules/system/gui.nix
View File

@@ -2,8 +2,9 @@ inputs:
{
options.nixos.system.gui = let inherit (inputs.lib) mkOption types; in
{
enable = mkOption { type = types.bool; default = false; };
preferred = mkOption { type = types.bool; default = false; };
enable = mkOption
{ 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; };
};
config =