disko upd

homes/x86_64-linux/admin@jallen-nas/default.nix

@@ -1,8 +1,8 @@
-{ pkgs, ... }:
+{ pkgs, namespace, ... }:
 {
   home.username = "admin";
 
-  mjallen = {
+  ${namespace} = {
     shell-aliases = {
       enable = true;
       buildHost = ""; # NAS builds locally

homes/x86_64-linux/deck@steamdeck/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, namespace, ... }:
 let
   shellAliases = {
     update-boot = "sudo nixos-rebuild boot --max-jobs 10 --build-host admin@10.0.1.3";
@@ -10,7 +10,7 @@ in
 {
   home.username = "deck";
 
-  mjallen.desktop.gnome.enable = true;
+  ${namespace}.desktop.gnome.enable = true;
 
   sops = {
     age.keyFile = "/home/deck/.config/sops/age/keys.txt";

homes/x86_64-linux/matt@matt-nixos/default.nix

@@ -1,5 +1,6 @@
-{ pkgs, ... }:
+{ lib, pkgs, namespace, ... }:
 let
+  inherit (lib.${namespace}) enabled disabled;
   displayLeft = {
     input = "DP-1";
     resolution = "3840x2160";
@@ -14,22 +15,12 @@ in
 {
   home.username = "matt";
 
-  mjallen = {
+  ${namespace} = {
     sops = {
       enable = true;
     };
     shell-aliases = {
       enable = true;
-      flakeInputs = [
-        "desktop-nixpkgs"
-        "desktop-chaotic"
-        "desktop-home-manager"
-        "desktop-impermanence"
-        "desktop-lanzaboote"
-        "desktop-nixos-hardware"
-        "desktop-sops-nix"
-        "desktop-steam-rom-manager"
-      ];
     };
 
     programs = {
@@ -68,7 +59,7 @@ in
           browser = pkgs.firefox;
         };
       };
-      btop.enable = true;
+      btop = enabled;
       kitty = {
         enable = true;
         font = {
@@ -80,8 +71,8 @@ in
         enable = true;
         fontName = "JetBrainsMono NFM";
       };
-      nwg-dock.enable = true;
-      nwg-drawer.enable = true;
+      nwg-dock = enabled;
+      nwg-drawer = enabled;
       nwg-panel = {
         enable = true;
         defaultApps = {
@@ -134,8 +125,8 @@ in
           }
         '';
       };
-      wlogout.enable = true;
-      wofi.enable = true;
+      wlogout = enabled;
+      wofi = enabled;
     };
   };
 
@@ -147,11 +138,11 @@ in
   };
 
   programs = {
-    password-store.enable = true;
+    password-store = enabled;
   };
 
   home.packages = with pkgs; [
-    pkgs.mjallen.bolt-launcher
+    pkgs.${namespace}.bolt-launcher
 
     bottles
     compose2nix
@@ -177,4 +168,22 @@ in
     vorta
     waydroid-helper
   ];
+
+  specialisation = {
+    "cosmic".configuration = {
+      ${namespace} = {
+        programs = {
+          hyprland = lib.mkForce disabled;
+          kitty = lib.mkForce disabled;
+          mako = lib.mkForce disabled;
+          nwg-dock = lib.mkForce disabled;
+          nwg-drawer = lib.mkForce disabled;
+          nwg-panel = lib.mkForce disabled;
+          waybar = lib.mkForce disabled;
+          wlogout = lib.mkForce disabled;
+          wofi = lib.mkForce disabled;
+        };
+      };
+    };
+  };
 }