it seems to be doing better

systems/_common/configuration.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, settings, ylib, ... } @ args:
+{ config, lib, pkgs, settings, ylib, ... } @ inputs:
 let
   home-manager = builtins.fetchTarball {
     url = "https://github.com/nix-community/home-manager/archive/release-23.11.tar.gz";
@@ -24,7 +24,7 @@ in
   security.polkit.enable = true;
   home-manager.useUserPackages = true;
   home-manager.useGlobalPkgs = true;
-  home-manager.extraSpecialArgs = { inherit settings; inherit ylib; inherit (args) ragenix; };
+  home-manager.extraSpecialArgs = { inherit settings; inherit ylib; inherit (inputs) ragenix; inherit (config) age; };
 
   # ==========
   #   Common

systems/_common/ragenix.nix

@@ -20,8 +20,8 @@ in
       #     (import secretsFile)
       # else { };
       {
-        test1 = {
-          file = /${settings.secretsDir}/test1.age;
+        nix2github = {
+          file = /${settings.secretsDir}/nix2github.age;
           owner = settings.user.username;
         };
       };

systems/gpdPocket3/configuration.nix

@@ -1,12 +1,11 @@
 { config, lib, pkgs, settings, ... } @ args:
-let
-  homeManagerUser = import "${settings.usersDir}/${settings.user.username}/home.nix";
-in
 {
   imports =
     [
       # Our custom stuff
       ./stupid-keyboard.nix
+      (settings.usersDir + "/root/configuration.nix")
+      (settings.usersDir + "/josh/configuration.nix")
     ];
 
   # Use the systemd-boot EFI boot loader.
@@ -88,20 +87,6 @@ in
     (nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
   ];
 
-  users.users.root.initialPassword = "password1";
-  users.users.${settings.user.username} = {
-    initialPassword = "password1";
-    isNormalUser = true;
-    extraGroups = [ "wheel" "networkmanager" "video" "input" ];
-    shell = pkgs.zsh;
-  };
-  # TODO how to do this from home manager file instead
-  environment.pathsToLink = [ "/share/zsh" ];
-  programs.zsh = {
-    enable = true;
-  };
-  home-manager.users.${settings.user.username} = homeManagerUser;
-
   services.xserver.enable = true;
   services.xserver.displayManager.gdm.enable = true;
   services.xserver.desktopManager.gnome.enable = true;