From 2f56994696936c755209f2d849e1063a80ef1120 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.dev>
Date: Sun, 6 Apr 2025 00:23:37 +0100
Subject: [PATCH] Move desktop/non-headless packages

---
 flake.nix                         |  8 ------
 home/opdavies/default.nix         | 12 ++------
 home/opdavies/desktop/default.nix |  4 ---
 home/opdavies/modules/default.nix |  4 ---
 hosts/t480/configuration.nix      | 10 +++++++
 modules/mixins/common/default.nix | 47 ++++++++++---------------------
 6 files changed, 28 insertions(+), 57 deletions(-)
 delete mode 100644 home/opdavies/desktop/default.nix
 delete mode 100644 home/opdavies/modules/default.nix

diff --git a/flake.nix b/flake.nix
index 1ab158c3..0f583c7e 100644
--- a/flake.nix
+++ b/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
diff --git a/home/opdavies/default.nix b/home/opdavies/default.nix
index dce140ca..339c0234 100644
--- a/home/opdavies/default.nix
+++ b/home/opdavies/default.nix
@@ -1,6 +1,5 @@
 {
   config,
-  headless ? false,
   inputs,
   outputs,
   system,
@@ -28,14 +27,9 @@ let
   inherit (pkgs) lib;
 in
 {
-  imports =
-    [
-      ./home.nix
-      ./modules
-    ]
-    ++ pkgs.lib.optionals (!headless) [
-      ./desktop
-    ];
+  imports = [
+    ./home.nix
+  ];
 
   home.sessionVariables = {
     EDITOR = "nvim";
diff --git a/home/opdavies/desktop/default.nix b/home/opdavies/desktop/default.nix
deleted file mode 100644
index f7e9be4a..00000000
--- a/home/opdavies/desktop/default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  imports = [
-  ];
-}
diff --git a/home/opdavies/modules/default.nix b/home/opdavies/modules/default.nix
deleted file mode 100644
index f7e9be4a..00000000
--- a/home/opdavies/modules/default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  imports = [
-  ];
-}
diff --git a/hosts/t480/configuration.nix b/hosts/t480/configuration.nix
index 3aa609f1..20e6929f 100644
--- a/hosts/t480/configuration.nix
+++ b/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
diff --git a/modules/mixins/common/default.nix b/modules/mixins/common/default.nix
index 77f9fabe..b4af3823 100644
--- a/modules/mixins/common/default.nix
+++ b/modules/mixins/common/default.nix
@@ -1,5 +1,4 @@
 {
-  headless,
   hostname,
   inputs,
   outputs,
@@ -35,37 +34,22 @@
 
   users.defaultUserShell = pkgs.zsh;
 
-  environment.systemPackages =
-    with pkgs;
-    [
-      cryptsetup
-      fastfetch
-      mermaid-cli
-      mkcert
-      passmenu-otp
+  environment.systemPackages = with pkgs; [
+    cryptsetup
+    fastfetch
+    mermaid-cli
+    mkcert
+    passmenu-otp
 
-      (pass.withExtensions (
-        e: with e; [
-          passExtensions.pass-audit
-          passExtensions.pass-import
-          passExtensions.pass-otp
-          passExtensions.pass-update
-        ]
-      ))
-    ]
-    ++ pkgs.lib.optionals (!headless) [
-      acpi
-      arandr
-      brightnessctl
-      cpufrequtils
-      libnotify
-      pmutils
-      ffmpegthumbnailer
-      hunspellDicts.en-gb-large
-      libreoffice
-      shotwell
-      vscode
-    ];
+    (pass.withExtensions (
+      e: with e; [
+        passExtensions.pass-audit
+        passExtensions.pass-import
+        passExtensions.pass-otp
+        passExtensions.pass-update
+      ]
+    ))
+  ];
 
   home-manager = {
     extraSpecialArgs = {
@@ -73,7 +57,6 @@
         hostname
         inputs
         outputs
-        headless
         self
         system
         username