Move desktop/non-headless packages

flake.nix

@@ -40,8 +40,6 @@
       username = "opdavies";
 
       specialArgs = {
-        headless = false;
-
         inherit
           inputs
           outputs
@@ -85,7 +83,6 @@
 
         nixedo = nixpkgs.lib.nixosSystem {
           specialArgs = specialArgs // {
-            headless = true;
             hostname = "nixedo";
             stateVersion = "24.11";
           };
@@ -131,7 +128,6 @@
           inherit system;
 
           specialArgs = specialArgs // {
-            headless = true;
             hostname = "PW05CH3L";
             stateVersion = "22.11";
           };
@@ -148,10 +144,6 @@
         hetznix = nixpkgs.lib.nixosSystem {
           inherit system;
 
-          specialArgs = specialArgs // {
-            headless = true;
-          };
-
           modules = [
             agenix.nixosModules.default
             disko.nixosModules.disko

home/opdavies/default.nix

@@ -1,6 +1,5 @@
 {
   config,
-  headless ? false,
   inputs,
   outputs,
   system,
@@ -28,14 +27,9 @@ let
   inherit (pkgs) lib;
 in
 {
-  imports =
+  imports = [
-    [
+    ./home.nix
-      ./home.nix
+  ];
-      ./modules
-    ]
-    ++ pkgs.lib.optionals (!headless) [
-      ./desktop
-    ];
 
   home.sessionVariables = {
     EDITOR = "nvim";

home/opdavies/desktop/default.nix

@@ -1,4 +0,0 @@
-{
-  imports = [
-  ];
-}

home/opdavies/modules/default.nix

@@ -1,4 +0,0 @@
-{
-  imports = [
-  ];
-}

hosts/t480/configuration.nix

@@ -68,19 +68,29 @@
 
   environment.systemPackages = with pkgs; [
     abook
+    acpi
+    arandr
     backup-websites
+    brightnessctl
     build-glove80
+    cpufrequtils
     displayselect
+    ffmpegthumbnailer
     gscan2pdf
     gtypist
+    hunspellDicts.en-gb-large
     isync
     kdePackages.okular
+    libnotify
+    libreoffice
     meslo-lg
     obs-studio
     pam_gnupg
     pamixer
     pavucontrol
     peek
+    pmutils
+    shotwell
     slack
     sxiv
     ttyper

modules/mixins/common/default.nix

@@ -1,5 +1,4 @@
 {
-  headless,
   hostname,
   inputs,
   outputs,
@@ -35,37 +34,22 @@
 
   users.defaultUserShell = pkgs.zsh;
 
-  environment.systemPackages =
+  environment.systemPackages = with pkgs; [
-    with pkgs;
+    cryptsetup
-    [
+    fastfetch
-      cryptsetup
+    mermaid-cli
-      fastfetch
+    mkcert
-      mermaid-cli
+    passmenu-otp
-      mkcert
-      passmenu-otp
 
-      (pass.withExtensions (
+    (pass.withExtensions (
-        e: with e; [
+      e: with e; [
-          passExtensions.pass-audit
+        passExtensions.pass-audit
-          passExtensions.pass-import
+        passExtensions.pass-import
-          passExtensions.pass-otp
+        passExtensions.pass-otp
-          passExtensions.pass-update
+        passExtensions.pass-update
-        ]
+      ]
-      ))
+    ))
-    ]
+  ];
-    ++ pkgs.lib.optionals (!headless) [
-      acpi
-      arandr
-      brightnessctl
-      cpufrequtils
-      libnotify
-      pmutils
-      ffmpegthumbnailer
-      hunspellDicts.en-gb-large
-      libreoffice
-      shotwell
-      vscode
-    ];
 
   home-manager = {
     extraSpecialArgs = {
@@ -73,7 +57,6 @@
         hostname
         inputs
         outputs
-        headless
         self
         system
         username