koishi/nixos
1
0
Fork 0
Code Issues Pull requests Projects Activity

global(gpu): rename from gui

Browse source
This commit is contained in:
514fpv 2024-01-27 22:14:03 +08:00
parent cdf4b29004
commit 665d0a3d7d
Signed by: koishi
SSH key fingerprint: SHA256:axz0uIzzY+5W19i7QOUuiw5LSqhKfCBKPf3L4xFRxLw
14 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

8
global/gui/default.nix → global/gpu/default.nix
View file

@ -2,7 +2,7 @@
, lib
, config
, ... }: with lib; let
cfg = config.global.gui;
cfg = config.global.gpu;
intel = cfg.type == "intel" || (cfg.type == "prime" && config.hardware.nvidia.prime.intelBusId != "");
amdgpu = cfg.type == "amdgpu" || (cfg.type == "prime" && config.hardware.nvidia.prime.amdgpuBusId != "");
@ -13,7 +13,7 @@ in {
./greetd.nix
];
options.global.gui = {
options.global.gpu = {
enable = mkEnableOption "various setup required for GUI and support software";
session = mkEnableOption "software required for a graphical session" // { default = true; };
type = mkOption {
@ -77,14 +77,14 @@ in {
specialisation.integratedGraphics = mkIf (cfg.type == "prime") {
configuration = {
global.gui.type = mkForce (if intel then "intel" else if amdgpu then "amdgpu" else "prime");
global.gpu.type = mkForce (if intel then "intel" else if amdgpu then "amdgpu" else "prime");
boot.blacklistedKernelModules = [ "nouveau" ];
};
};
specialisation.withArc = mkIf (cfg.arc != null) {
configuration = {
global.gui.arc = mkForce null;
global.gpu.arc = mkForce null;
powerManagement.cpuFreqGovernor = mkForce "performance";
};
};

2
global/gui/greetd.nix → global/gpu/greetd.nix
View file

@ -2,7 +2,7 @@
, lib
, config
, ... }: with lib; let
cfg = config.global.gui;
cfg = config.global.gpu;
in mkIf (cfg.enable && cfg.session) {
programs.regreet = {
enable = true;

4
global/gui/plymouth.nix → global/gpu/plymouth.nix
View file

@ -2,10 +2,10 @@
, lib
, config
, ... }: with lib; let
cfg = config.global.gui;
cfg = config.global.gpu;
in mkIf cfg.enable {
boot = {
loader.timeout = lib.mkDefault 0;
loader.timeout = mkDefault 0;
consoleLogLevel = 0;
initrd.verbose = false;
initrd.systemd.enable = true;

2
global/io/default.nix
View file

@ -3,7 +3,7 @@
, config
, ... }: with lib; let
cfg = config.global.io;
gui = with config.global.gui; enable && session;
gui = with config.global.gpu; enable && session;
in {
options.global.io = {
betaflight = mkEnableOption "betaflight udev rules" // { default = true; };

2
global/oci/default.nix
View file

@ -11,7 +11,7 @@ in {
config = mkIf cfg.enable {
virtualisation.podman = {
enable = true;
enableNvidia = with config.global.gui; mkDefault (type == "prime" || type == "nvidia");
enableNvidia = with config.global.gpu; mkDefault type == "prime" || type == "nvidia";
dockerCompat = true;
};