Refactor desktop HM into desktop-home-base and per-host home.nix

modules/hosts/uConsole/configuration.nix

@@ -103,40 +103,6 @@
 
       chiasson.users.enabled = [ "olivier" ];
 
-      chiasson.users.extraModules.olivier = [
-        self.homeManagerModules.wisdomFilebrowsersDolphin
-        self.homeManagerModules.wisdomTerminalsKitty
-        self.homeManagerModules.wisdomBrowsersZen
-        self.homeManagerModules.wisdomEditorsKate
-        self.homeManagerModules.wisdomShellFish
-        self.homeManagerModules.wisdomShellOhMyPosh
-        self.homeManagerModules.wisdomAppsSpotify
-        self.homeManagerModules.wisdomAppsLocalsend
-        self.homeManagerModules.wisdomDesktopScreenshot
-        self.homeManagerModules.wisdomHardwareUconsoleGamepad
-        {
-          chiasson.home = {
-            shell = {
-              fish.enable = true;
-              ohMyPosh.enable = true;
-            };
-            terminals.kitty.enable = true;
-            filebrowsers.dolphin.enable = true;
-            browsers.zen.enable = true;
-            editors.kate.enable = true;
-            apps.spotify.enable = true;
-            apps.localsend.enable = true;
-            desktop = {
-              screenshot = {
-                enable = true;
-                swiftshareApiKeyFile = "/run/secrets/swiftshare/API_KEY"; #TODO[epic=sops] redo this by passing sops file output directly
-              };
-            };
-            hardware.uconsoleGamepad.enable = true;
-          };
-        }
-      ];
-
       console.packages = with pkgs; [ terminus_font ];
     };
 }

modules/hosts/uConsole/default.nix

@@ -14,6 +14,7 @@
       inputs.oom-hardware.nixosModules.uc.configtxt
       inputs.oom-hardware.nixosModules.uc.base-cm5
       self.nixosModules.uConsoleConfiguration
+      self.nixosModules.uConsoleHome
     ];
   };
 }

modules/hosts/uConsole/home.nix

@@ -0,0 +1,16 @@
+{ self, inputs, ... }:
+{
+  flake.nixosModules.uConsoleHome =
+    { self, ... }:
+    {
+      imports = [ self.nixosModules.desktopHomeBase ];
+
+      chiasson.users.extraModules.olivier = [
+        {
+          chiasson.home = {
+            hardware.uconsoleGamepad.enable = true;
+          };
+        }
+      ];
+    };
+}