finalise dendritic migration

aspects/desktop/media.nix

@@ -13,7 +13,7 @@
         ];
       };
 
-    homeManager.programs-media =
+    homeManager.media =
       { pkgs, ... }:
       {
         programs.obs-studio = {

aspects/systems/base.nix

@@ -1,44 +1,55 @@
 { inputs, ... }:
 {
-  flake.modules.nixos.base =
-    { lib, pkgs, ... }:
-    {
-      imports = with inputs.self.modules.nixos; [
-        boot
-        console
-        firewall
-        fish
-        locale
-        nix
-        security
-        ssh
-      ];
-      environment = {
-        systemPackages = with pkgs; [
-          git
-          fastfetch
-          nixos-firewall-tool
-          sysz
-          wget
-          yazi
+  flake.modules = {
+    nixos.base =
+      { lib, pkgs, ... }:
+      {
+        imports = with inputs.self.modules.nixos; [
+          boot
+          console
+          firewall
+          fish
+          locale
+          nix
+          security
+          ssh
         ];
-        shellAliases = {
-          cat = "${lib.getExe pkgs.bat} --paging=never --style=plain";
-          ls = "${lib.getExe pkgs.eza} --git --icons --group-directories-first";
-          tree = "ls --tree";
+        environment = {
+          systemPackages = with pkgs; [
+            git
+            fastfetch
+            nixos-firewall-tool
+            sysz
+            wget
+            yazi
+          ];
+          shellAliases = {
+            cat = "${lib.getExe pkgs.bat} --paging=never --style=plain";
+            ls = "${lib.getExe pkgs.eza} --git --icons --group-directories-first";
+            tree = "ls --tree";
+          };
+        };
+
+        programs.command-not-found.enable = false;
+
+        services = {
+          dbus.implementation = "broker";
+          irqbalance.enable = true;
+          fstrim.enable = true;
+          tailscale = {
+            enable = true;
+            extraUpFlags = [ "--operator=user" ];
+          };
         };
       };
 
-      programs.command-not-found.enable = false;
-
-      services = {
-        dbus.implementation = "broker";
-        irqbalance.enable = true;
-        fstrim.enable = true;
-        tailscale = {
-          enable = true;
-          extraUpFlags = [ "--operator=user" ];
-        };
+    homeManager.base =
+      { ... }:
+      {
+        imports = with inputs.self.modules.homeManager; [
+          bash
+          fish
+        ];
       };
-    };
+  };
 }

aspects/systems/desktop.nix

@@ -158,7 +158,10 @@
         ...
       }:
       {
-        imports = [ inputs.vicinae.homeManagerModules.default ];
+        imports = [
+          inputs.vicinae.homeManagerModules.default
+        ]
+        ++ (with inputs.self.modules.homeManager; [ media ]);
 
         fonts.fontconfig.enable = true;