feat: added user2 and refactored to accommodate

flake.lock

@@ -72,21 +72,6 @@
         "type": "github"
       }
     },
-    "crane_2": {
-      "locked": {
-        "lastModified": 1736898272,
-        "narHash": "sha256-D10wlrU/HCpSRcb3a7yk+bU3ggpMD1kGbseKtO+7teo=",
-        "owner": "ipetkov",
-        "repo": "crane",
-        "rev": "6a589f034202a7c6e10bce6c5d1d392d7bc0f340",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ipetkov",
-        "repo": "crane",
-        "type": "github"
-      }
-    },
     "direnv": {
       "inputs": {
         "gomod2nix": "gomod2nix",
@@ -228,21 +213,6 @@
         "type": "github"
       }
     },
-    "flake-compat_7": {
-      "locked": {
-        "lastModified": 1733328505,
-        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": [
@@ -362,14 +332,14 @@
     },
     "flake-utils_4": {
       "inputs": {
-        "systems": "systems_8"
+        "systems": "systems_7"
       },
       "locked": {
-        "lastModified": 1726560853,
+        "lastModified": 1731533236,
-        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
         "type": "github"
       },
       "original": {
@@ -401,7 +371,7 @@
     },
     "flake-utils_6": {
       "inputs": {
-        "systems": "systems_12"
+        "systems": "systems_11"
       },
       "locked": {
         "lastModified": 1731533236,
@@ -668,35 +638,6 @@
         "type": "github"
       }
     },
-    "hyprgraphics_2": {
-      "inputs": {
-        "hyprutils": [
-          "hyprlock",
-          "hyprutils"
-        ],
-        "nixpkgs": [
-          "hyprlock",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprlock",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1737634889,
-        "narHash": "sha256-9JZE3KxcXOqZH9zs3UeadngDiK/yIACTiAR8HSA/TNI=",
-        "owner": "hyprwm",
-        "repo": "hyprgraphics",
-        "rev": "0d77b4895ad5f1bb3b0ee43103a5246c58b65591",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprgraphics",
-        "type": "github"
-      }
-    },
     "hypridle": {
       "inputs": {
         "hyprland-protocols": "hyprland-protocols",
@@ -740,11 +681,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1738059592,
+        "lastModified": 1738107811,
-        "narHash": "sha256-xyGGTu6JazGtrI30RSNJrs+tNn2Xc5a2Oh3eQKtBodQ=",
+        "narHash": "sha256-+57jB0fv53OmAQ8QpK3eiRXfypBfKJtfdepRusNX+DM=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "1d3904c3e7a8b74ea83669f73ee408bd38390b11",
+        "rev": "3d1dd6b5c7b90e513e86c1ad27c6c01a5c69e4f8",
         "type": "github"
       },
       "original": {
@@ -929,60 +870,6 @@
         "type": "github"
       }
     },
-    "hyprlang_3": {
-      "inputs": {
-        "hyprutils": [
-          "hyprlock",
-          "hyprutils"
-        ],
-        "nixpkgs": [
-          "hyprlock",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprlock",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1737634606,
-        "narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=",
-        "owner": "hyprwm",
-        "repo": "hyprlang",
-        "rev": "f41271d35cc0f370d300413d756c2677f386af9d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprlang",
-        "type": "github"
-      }
-    },
-    "hyprlock": {
-      "inputs": {
-        "hyprgraphics": "hyprgraphics_2",
-        "hyprlang": "hyprlang_3",
-        "hyprutils": "hyprutils_3",
-        "hyprwayland-scanner": "hyprwayland-scanner_3",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "systems": "systems_7"
-      },
-      "locked": {
-        "lastModified": 1737837801,
-        "narHash": "sha256-i7nKSo/FGU5Sjq2xM+UFahZHqqrjZn5WUekOZFsjO2w=",
-        "owner": "hyprwm",
-        "repo": "hyprlock",
-        "rev": "e77bc92b99e06ee66ccd684afbfe3a743af1f01d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprlock",
-        "type": "github"
-      }
-    },
     "hyprutils": {
       "inputs": {
         "nixpkgs": [
@@ -1033,31 +920,6 @@
         "type": "github"
       }
     },
-    "hyprutils_3": {
-      "inputs": {
-        "nixpkgs": [
-          "hyprlock",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprlock",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1737632363,
-        "narHash": "sha256-X9I8POSlHxBVjD0fiX1O2j7U9Zi1+4rIkrsyHP0uHXY=",
-        "owner": "hyprwm",
-        "repo": "hyprutils",
-        "rev": "006620eb29d54ea9086538891404c78563d1bae1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprutils",
-        "type": "github"
-      }
-    },
     "hyprwayland-scanner": {
       "inputs": {
         "nixpkgs": [
@@ -1108,43 +970,18 @@
         "type": "github"
       }
     },
-    "hyprwayland-scanner_3": {
-      "inputs": {
-        "nixpkgs": [
-          "hyprlock",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprlock",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1735493474,
-        "narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=",
-        "owner": "hyprwm",
-        "repo": "hyprwayland-scanner",
-        "rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprwayland-scanner",
-        "type": "github"
-      }
-    },
     "lix": {
       "flake": false,
       "locked": {
-        "lastModified": 1729298361,
+        "lastModified": 1737234286,
-        "narHash": "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=",
+        "narHash": "sha256-CCKIAE84dzkrnlxJCKFyffAxP3yfsOAbdvydUGqq24g=",
-        "rev": "ad9d06f7838a25beec425ff406fe68721fef73be",
+        "rev": "2837da71ec1588c1187d2e554719b15904a46c8b",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ad9d06f7838a25beec425ff406fe68721fef73be.tar.gz?rev=ad9d06f7838a25beec425ff406fe68721fef73be"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2837da71ec1588c1187d2e554719b15904a46c8b.tar.gz?rev=2837da71ec1588c1187d2e554719b15904a46c8b"
       },
       "original": {
         "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz"
+        "url": "https://git.lix.systems/lix-project/lix/archive/2.92.0.tar.gz"
       }
     },
     "lix-module": {
@@ -1157,15 +994,15 @@
         ]
       },
       "locked": {
-        "lastModified": 1732605668,
+        "lastModified": 1737237494,
-        "narHash": "sha256-DN5/166jhiiAW0Uw6nueXaGTueVxhfZISAkoxasmz/g=",
+        "narHash": "sha256-YMLrcBpf0TR5r/eaqm8lxzFPap2TxCor0ZGcK3a7+b8=",
-        "rev": "f19bd752910bbe3a861c9cad269bd078689d50fe",
+        "rev": "b90bf629bbd835e61f1317b99e12f8c831017006",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/f19bd752910bbe3a861c9cad269bd078689d50fe.tar.gz?rev=f19bd752910bbe3a861c9cad269bd078689d50fe"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/b90bf629bbd835e61f1317b99e12f8c831017006.tar.gz?rev=b90bf629bbd835e61f1317b99e12f8c831017006"
       },
       "original": {
         "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-2.tar.gz"
+        "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz"
       }
     },
     "ngipkgs": {
@@ -1177,7 +1014,7 @@
         "nixpkgs-stable": "nixpkgs-stable_2",
         "pre-commit-hooks": "pre-commit-hooks_2",
         "sops-nix": "sops-nix",
-        "systems": "systems_9"
+        "systems": "systems_8"
       },
       "locked": {
         "lastModified": 1737974228,
@@ -1298,11 +1135,11 @@
         "treefmt-nix": "treefmt-nix_2"
       },
       "locked": {
-        "lastModified": 1738096417,
+        "lastModified": 1738121352,
-        "narHash": "sha256-Ilaq4ZBWLKRQnnrVdo07RPXvL2bgLSpRRYQbEkTmY8E=",
+        "narHash": "sha256-/zTcxOuUlorG5xuVqZM74AEqyoUuvAGFgf7ZRsY0fB0=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "9749661663bff263eb630f3a7f200e8b5a6ce3da",
+        "rev": "1c718529e3d4d262ad378d25faa009019d9f4a1a",
         "type": "github"
       },
       "original": {
@@ -1429,18 +1266,16 @@
         "home-manager": "home-manager",
         "hypridle": "hypridle",
         "hyprland": "hyprland",
-        "hyprlock": "hyprlock",
         "lix-module": "lix-module",
         "ngipkgs": "ngipkgs",
         "nixpkgs": "nixpkgs_2",
         "nur": "nur",
         "pre-commit-hooks-nix": "pre-commit-hooks-nix",
         "sops-nix": "sops-nix_2",
-        "systems": "systems_10",
+        "systems": "systems_9",
         "waybar": "waybar",
         "wpaperd": "wpaperd",
-        "yazi": "yazi",
+        "yazi": "yazi"
-        "zed-editor": "zed-editor"
       }
     },
     "rust-overlay": {
@@ -1506,27 +1341,6 @@
         "type": "github"
       }
     },
-    "rust-overlay_4": {
-      "inputs": {
-        "nixpkgs": [
-          "zed-editor",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1737166965,
-        "narHash": "sha256-vlDROBAgq+7PEVM0vaS2zboY6DXs3oKK0qW/1dVuFs4=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "fc839c9d5d1ebc789b4657c43c4d54838c7c01de",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    },
     "slimlock": {
       "inputs": {
         "nixpkgs": [
@@ -1607,21 +1421,6 @@
       }
     },
     "systems_10": {
-      "locked": {
-        "lastModified": 1680978846,
-        "narHash": "sha256-Gtqg8b/v49BFDpDetjclCYXm8mAnTrUzR0JnE2nv5aw=",
-        "owner": "nix-systems",
-        "repo": "x86_64-linux",
-        "rev": "2ecfcac5e15790ba6ce360ceccddb15ad16d08a8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "x86_64-linux",
-        "type": "github"
-      }
-    },
-    "systems_11": {
       "locked": {
         "lastModified": 1689347949,
         "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
@@ -1636,7 +1435,7 @@
         "type": "github"
       }
     },
-    "systems_12": {
+    "systems_11": {
       "locked": {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -1727,21 +1526,6 @@
       }
     },
     "systems_7": {
-      "locked": {
-        "lastModified": 1689347949,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "type": "github"
-      }
-    },
-    "systems_8": {
       "locked": {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -1756,7 +1540,7 @@
         "type": "github"
       }
     },
-    "systems_9": {
+    "systems_8": {
       "locked": {
         "lastModified": 1689347949,
         "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
@@ -1771,6 +1555,21 @@
         "type": "github"
       }
     },
+    "systems_9": {
+      "locked": {
+        "lastModified": 1680978846,
+        "narHash": "sha256-Gtqg8b/v49BFDpDetjclCYXm8mAnTrUzR0JnE2nv5aw=",
+        "owner": "nix-systems",
+        "repo": "x86_64-linux",
+        "rev": "2ecfcac5e15790ba6ce360ceccddb15ad16d08a8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "x86_64-linux",
+        "type": "github"
+      }
+    },
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": [
@@ -1841,7 +1640,7 @@
           "nixpkgs"
         ],
         "rust-overlay": "rust-overlay_2",
-        "systems": "systems_11"
+        "systems": "systems_10"
       },
       "locked": {
         "lastModified": 1734445299,
@@ -1918,29 +1717,6 @@
         "type": "github"
       }
     },
-    "zed-editor": {
-      "inputs": {
-        "crane": "crane_2",
-        "flake-compat": "flake-compat_7",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "rust-overlay": "rust-overlay_4"
-      },
-      "locked": {
-        "lastModified": 1738098895,
-        "narHash": "sha256-jWN5w2+NcGktdF0JnzyMg+E8sFhYXALHx2r6NBjtk4Q=",
-        "owner": "zed-industries",
-        "repo": "zed",
-        "rev": "c4e6c619ba2295279b2c3f257a03b9ae5d07494f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "zed-industries",
-        "repo": "zed",
-        "type": "github"
-      }
-    },
     "zig": {
       "inputs": {
         "flake-compat": [

flake.nix

@@ -4,7 +4,7 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     lix-module = {
-      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-2.tar.gz";
+      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     flake-parts = {
@@ -18,11 +18,11 @@
     ghostty = {
       url = "github:ghostty-org/ghostty";
     };
+    ngipkgs.url = "github:ngi-nix/ngipkgs";
     nur = {
       url = "github:nix-community/NUR";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    ngipkgs.url = "github:ngi-nix/ngipkgs";
     pre-commit-hooks-nix = {
       url = "github:cachix/pre-commit-hooks.nix";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -45,10 +45,6 @@
       url = "github:hyprwm/hypridle";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    hyprlock = {
-      url = "github:hyprwm/hyprlock";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     wpaperd = {
       url = "github:danyspin97/wpaperd";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -61,10 +57,6 @@
       url = "github:direnv/direnv";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    zed-editor = {
-      url = "github:zed-industries/zed";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
   };
 
   outputs =
@@ -104,6 +96,7 @@
               config.nixosModules.shared
               inputs.home-manager.nixosModules.home-manager
               inputs.lix-module.nixosModules.default
+              inputs.sops-nix.nixosModules.sops
             ];
             laptop = inputs.self.lib.mkLinuxSystem [
               ./systems/laptop

home/modules/gui/apps/code/zed/default.nix

@@ -10,12 +10,10 @@ let
   userKeymapsPath = import (configPath + /userKeymaps);
   userSettingsPath = import (configPath + /userSettings) { inherit flake lib pkgs; };
   extraPackagesPath = import (configPath + /extraPackages) { inherit pkgs; };
-  packagePath = flake.inputs.zed-editor.packages.${pkgs.system}.default;
 in
 {
   programs.zed-editor = {
     enable = true;
-    # package = packagePath;
     extraPackages = extraPackagesPath;
     extensions = extensionsPath;
     userKeymaps = userKeymapsPath;

home/modules/gui/desktop/hypridle/config/settings.nix

@@ -1,7 +1,3 @@
-{
-  pkgs,
-  ...
-}:
 {
   general = {
     after_sleep_cmd = "hyprctl dispatch dpms on";

home/modules/gui/desktop/hypridle/default.nix

@@ -5,11 +5,7 @@
 }:
 let
   configPath = ./config;
-  settingsPath = import (configPath + /settings.nix) {
+  settingsPath = import (configPath + /settings.nix);
-    inherit
-      pkgs
-      ;
-  };
 in
 {
   services.hypridle = {

home/modules/gui/desktop/hyprland/config/exec-once.nix

@@ -15,7 +15,6 @@ in
   "waybar"
   "nm-applet"
   "blueman-applet"
-  "blueman-manager"
   "easyeffects -r"
   "emote"
   "flameshot"

home/modules/gui/desktop/hyprland/default.nix

@@ -10,12 +10,7 @@ let
   configPath = ./config;
   configImports = {
     animations = import (configPath + /animations.nix);
-    bind = import (configPath + /bind.nix) {
+    bind = import (configPath + /bind.nix) { inherit flake config; };
-      inherit
-        flake
-        config
-        ;
-    };
     bindm = import (configPath + /bindm.nix);
     binds = import (configPath + /binds.nix);
     # bindl =
@@ -24,16 +19,8 @@ let
     #   else null;
     decoration = import (configPath + /decoration.nix);
     dwindle = import (configPath + /dwindle.nix);
-    exec-once = import (configPath + /exec-once.nix) {
+    exec-once = import (configPath + /exec-once.nix) { inherit flake; };
-      inherit
+    general = import (configPath + /general.nix) { inherit flake; };
-        flake
-        ;
-    };
-    general = import (configPath + /general.nix) {
-      inherit
-        flake
-        ;
-    };
     input = import (configPath + /input.nix);
     misc = import (configPath + /misc.nix);
     windowrulev2 = import (configPath + /windowrulev2.nix);

nixos/modules/doas.nix

@@ -1,9 +1,17 @@
-{flake, ...}: let
+{ flake, config, ... }:
-  inherit
+let
-    (flake.config.people)
+  inherit (flake.config.people)
     user0
+    user2
     ;
-in {
+  inherit (flake.config.machines)
+    devices
+    ;
+  hostname = config.networking.hostName;
+  desktop = devices.desktop.name;
+  fallaryn = devices.fallaryn.name;
+in
+{
   security = {
     doas = {
       enable = true;
@@ -12,7 +20,14 @@ in {
           keepEnv = true;
           noPass = true;
           users = [
-            user0
+            (
+              if hostname == desktop then
+                user0
+              else if hostname == fallaryn then
+                user2
+              else
+                ""
+            )
           ];
         }
       ];

nixos/modules/environment.nix

@@ -29,7 +29,7 @@
       USE_WAYLAND_GRIM = "1";
       USE_WAYLAND_CLIPBOARD = "1";
       GTK_THEME = "catppuccin-macchiato-mauve-compact";
-      ANTHROPIC_API_KEY = config.sops.secrets.claude-api-key.path;
+      # ANTHROPIC_API_KEY = config.sops.secrets.claude-api-key.path;
     };
   };
 }

nixos/modules/sops.nix

@@ -1,9 +1,25 @@
-{flake, ...}: let
+{ flake, config, ... }:
-  inherit
+let
-    (flake.config.people)
+  inherit (flake.config.people)
     user0
+    user2
     ;
-in {
+  inherit (flake.config.machines)
+    devices
+    ;
+  hostname = config.networking.hostName;
+  desktop = devices.desktop.name;
+  fallaryn = devices.fallaryn.name;
+
+  userLogic =
+    if hostname == desktop then
+      user0
+    else if hostname == fallaryn then
+      user2
+    else
+      "";
+in
+{
   sops = {
     defaultSopsFile = ../../secrets/secrets.yaml;
     validateSopsFiles = false;
@@ -13,21 +29,21 @@ in {
     };
     secrets = {
       "ssh/private" = {
-        path = "/home/${user0}/.ssh/id_ed25519";
+        path = "/home/${userLogic}/.ssh/id_ed25519";
-        owner = user0;
+        owner = userLogic;
       };
       "ssh/public" = {
-        path = "/home/${user0}/.ssh/id_ed25519.pub";
+        path = "/home/${userLogic}/.ssh/id_ed25519.pub";
-        owner = user0;
+        owner = userLogic;
       };
       "ssh/hosts" = {
-        path = "/home/${user0}/.ssh/known_hosts";
+        path = "/home/${userLogic}/.ssh/known_hosts";
-        owner = user0;
+        owner = userLogic;
-      };
-      "claude-api-key" = {
-        path = "/home/${user0}/.config/zed/claude-api-key";
-        owner = user0;
       };
+      # "claude-api-key" = {
+      #   path = "/home/${user0}/.config/zed/claude-api-key";
+      #   owner = user0;
+      # };
     };
   };
 }

nixos/modules/ssh.nix

@@ -1,14 +1,33 @@
-{flake, ...}: let
+{
-  inherit
+  flake,
-    (flake.config.people)
+  config,
+  ...
+}:
+let
+  inherit (flake.config.people)
     user0
+    user2
     ;
-  inherit
+  inherit (flake.config.people.users.${userLogic})
-    (flake.config.people.users.${user0})
     sshKeys
     ;
-in {
+  inherit (flake.config.machines)
-  users.users.${user0} = {
+    devices
+    ;
+  hostname = config.networking.hostName;
+  desktop = devices.desktop.name;
+  fallaryn = devices.fallaryn.name;
+
+  userLogic =
+    if hostname == desktop then
+      user0
+    else if hostname == fallaryn then
+      user2
+    else
+      "";
+in
+{
+  users.users.${userLogic} = {
     openssh.authorizedKeys.keys = sshKeys;
   };
 }

profiles/user2/default.nix

@@ -8,7 +8,7 @@ let
   inherit (flake) self;
   inherit (flake.config.people) user2;
   inherit (flake.config.machines) devices;
-  inherit (flake.config.people.user.${user2}) name paths;
+  inherit (flake.config.people.users.${user2}) name paths;
   hostname = config.networking.hostName;
 in
 

systems/fallaryn/config/filesystem.nix

@@ -4,8 +4,8 @@
   ...
 }:
 let
-  inherit (flake.config.people) user0;
+  inherit (flake.config.people) user2;
-  inherit (flake.config.system.device) fallaryn;
+  inherit (flake.config.machines.devices) fallaryn;
 in
 {
   imports = [ ];
@@ -44,9 +44,9 @@ in
   ];
 
   systemd.tmpfiles.rules = [
-    "Z ${config.home-manager.users.${user0}.home.homeDirectory} 0755 ${user0} users -"
+    "Z ${config.home-manager.users.${user2}.home.homeDirectory} 0755 ${user2} users -"
-    "Z ${fallaryn.storage0.mount} 0755 ${user0} users -"
+    "Z ${fallaryn.storage0.mount} 0755 ${user2} users -"
-    "Z ${fallaryn.storage1.mount} 0755 ${user0} users -"
+    "Z ${fallaryn.storage1.mount} 0755 ${user2} users -"
   ];
 
   services.udisks2.enable = true;

systems/fallaryn/config/networking.nix

@@ -4,7 +4,7 @@
   ...
 }:
 let
-  inherit (flake.config.system.device) fallaryn;
+  inherit (flake.config.machines.devices) fallaryn;
 in
 {
   networking = {