refactor(gpu)!: rename from gui

global/gpu/default.nix

@@ -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";
       };
     };

global/gpu/greetd.nix

@@ -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;

global/gpu/plymouth.nix

@@ -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;

global/io/default.nix

@@ -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; };

global/oci/default.nix

@@ -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;
     };
 

home/chrome/nixos.nix

@@ -2,7 +2,7 @@
 , lib
 , config
 , ... }: with lib; let
-  gui = with config.global.gui; ( enable && session );
+  gui = with config.global.gpu; enable && session;
 in {
   users.home.persist.directories = mkIf gui [ ".config/google-chrome" ];
   security.chromiumSuidSandbox.enable = mkIf gui true;

home/gui/nixos.nix

@@ -2,7 +2,7 @@
 , lib
 , config
 , ... }: with lib; let
-  gui = with config.global.gui; ( enable && session );
+  gui = with config.global.gpu; enable && session;
 in {
   config = {
     users.homeModules = [

home/sway/nixos.nix

@@ -2,8 +2,8 @@
 , lib
 , config
 , ... }: with lib; let
-  gui = with config.global.gui; ( enable && session );
+  gui = with config.global.gpu; enable && session;
-  nvidia = with config.global.gui; ( type == "nvidia" || type == "prime" );
+  nvidia = with config.global.gpu; type == "nvidia" || type == "prime";
 in mkIf gui {
   services.xserver.displayManager.sessionPackages = [
     (pkgs.writeTextFile {

home/util/nixos.nix

@@ -3,7 +3,7 @@
 , config
 , ... }: with lib; let
   cfg = config.home.util;
-  gui = with config.global.gui; ( enable && session );
+  gui = with config.global.gpu; enable && session;
 in {
   options.home.util = {
     minimal = mkEnableOption "minimal system environment with less packages";

home/virt-manager/nixos.nix

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

spec/chireiden/default.nix

@@ -12,8 +12,8 @@
     fs.cryptsetup.uuids.nix = "3905f87f-7b11-49ef-8ddf-f4202c555ffd";
     fs.cryptsetup.uuids.persist = "b2322f01-1c44-433f-a995-4ddce5845cf9";
     boot.lanzaboote = true;
-    gui.enable = true;
+    gpu.enable = true;
-    gui.type = "prime";
+    gpu.type = "prime";
     android.enable = true;
   };
 

spec/eientei/default.nix

@@ -4,9 +4,9 @@
     fs.esp.uuid = "FC6D-75D8";
     fs.type = "zfs";
     boot.lanzaboote = true;
-    gui.enable = true;
+    gpu.enable = true;
-    gui.type = "intel";
+    gpu.type = "intel";
-    gui.arc = "8086:5691";
+    gpu.arc = "8086:5691";
     android.enable = true;
   };
 

spec/koumakyou/default.nix

@@ -14,8 +14,8 @@
     fs.cryptsetup.uuids.nix = "84baa53a-c76d-4716-813a-196f5a53e44d";
     fs.cryptsetup.uuids.persist = "e31f8b1c-6504-4b43-93dd-997ad17ebf5e";
     boot.lanzaboote = true;
-    gui.enable = true;
+    gpu.enable = true;
-    gui.type = "prime";
+    gpu.type = "prime";
     asusd.enable = true;
     oci.enable = true;
   };

spec/yume/default.nix

@@ -8,8 +8,8 @@
     fs.esp.uuid = "6CEB-765A";
     fs.type = "xfs";
     fs.store = "b80e8bbe-d1ff-4d2e-ae25-9e9048d67355";
-    gui.enable = true;
+    gpu.enable = true;
-    gui.type = "nvidia";
+    gpu.type = "nvidia";
   };
 
   home = {