Change desktop to headless

flake.nix

@@ -34,6 +34,8 @@
       username = "opdavies";
 
       specialArgs = {
+        headless = false;
+
         inherit
           inputs
           outputs
@@ -59,7 +61,6 @@
       nixosConfigurations = {
         lemp11 = nixpkgs.lib.nixosSystem {
           specialArgs = specialArgs // {
-            desktop = true;
             hostname = "lemp11";
           };
 
@@ -68,7 +69,6 @@
 
         t490 = nixpkgs.lib.nixosSystem {
           specialArgs = specialArgs // {
-            desktop = true;
             hostname = "t490";
           };
 
@@ -81,7 +81,11 @@
         };
 
         hetznix = nixpkgs.lib.nixosSystem {
-          inherit specialArgs system;
+          inherit system;
+
+          specialArgs = specialArgs // {
+            headless = true;
+          };
 
           modules = [
             disko.nixosModules.disko
@@ -95,7 +99,7 @@
           inherit pkgs;
 
           extraSpecialArgs = specialArgs // {
-            desktop = false;
+            headless = true;
             hostname = "PW05CH3L";
           };
 

nix/home/opdavies/default.nix

@@ -1,6 +1,6 @@
 {
   config,
-  desktop,
+  headless ? false,
   hostname,
   inputs,
   outputs,
@@ -44,7 +44,7 @@ let
 
   shared-packages = import "${self}/nix/lib/shared/home-manager-packages.nix" {
     inherit
-      desktop
+      headless
       inputs
       pkgs
       username
@@ -56,7 +56,7 @@ in
 
   home.packages =
     shared-packages
-    ++ pkgs.lib.optionals desktop (
+    ++ pkgs.lib.optionals (!headless) (
       with pkgs;
       [
         build-glove80

nix/hosts/lemp11/configuration.nix

@@ -1,9 +1,9 @@
 {
+  headless ? false,
   hostname,
   inputs,
   outputs,
   pkgs,
-  desktop ? false,
   self,
   system,
   username,
@@ -27,7 +27,7 @@
         hostname
         inputs
         outputs
-        desktop
+        headless
         self
         system
         username
@@ -178,7 +178,7 @@
       yt-dlp
       ytfzf
     ]
-    ++ pkgs.lib.optionals desktop [
+    ++ pkgs.lib.optionals (!headless) [
       acpi
       arandr
       brightnessctl

nix/hosts/t490/configuration.nix

@@ -1,9 +1,9 @@
 {
+  headless ? false,
   hostname,
   inputs,
   outputs,
   pkgs,
-  desktop ? false,
   self,
   system,
   username,
@@ -21,7 +21,7 @@
         hostname
         inputs
         outputs
-        desktop
+        headless
         self
         system
         username
@@ -170,7 +170,7 @@
       yt-dlp
       ytfzf
     ]
-    ++ pkgs.lib.optionals desktop [
+    ++ pkgs.lib.optionals (!headless) [
       acpi
       arandr
       brightnessctl

nix/lib/shared/home-manager-packages.nix

@@ -1,6 +1,5 @@
 {
-  desktop,
+  headless,
-  inputs,
   pkgs,
   username,
   ...
@@ -70,7 +69,7 @@ with pkgs;
   deliver
   run
 ]
-++ pkgs.lib.optionals desktop [
+++ pkgs.lib.optionals (!headless) [
   # Scripts.
   _timer
   export-video-list