it seems to be doing better

users/_common/programs/ssh.nix

@@ -1,4 +1,4 @@
-{ lib, ... } @ args:
+{ lib, settings, age, pkgs, ... } @ args:
 {
   # We always want a standard ssh key-pair used for secret management, create it if not there.
   home.activation.generateSshKey = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
@@ -21,7 +21,7 @@
     matchBlocks = {
       github = {
         hostname = "github.com";
-        identityFile = age.secrets.test1.file;
+        identityFile = age.secrets.nix2github.path;
       };
     };
   };

users/josh/configuration.nix

@@ -0,0 +1,32 @@
+{ config, lib, ylib, pkgs, settings, ... } @ args:
+{
+  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} = {
+    imports =
+      # Common settings all users share
+      [ (settings.usersDir + "/_common/home.nix") ]
+      # User programs
+      ++ ylib.umport {
+        paths = [ ./programs ];
+        recursive = true;
+      }
+      # User theme
+      ++ ylib.umport {
+        paths = [ ./theme ];
+        recursive = true;
+      };
+  };
+} 
+

users/josh/home.nix

@@ -1,16 +0,0 @@
-{ settings, ylib, ... }:
-{
-  imports =
-    # Common settings all users share
-    [ (settings.usersDir + "/_common/home.nix") ]
-    # User programs
-    ++ ylib.umport {
-      paths = [ ./programs ];
-      recursive = true;
-    }
-    # User theme
-    ++ ylib.umport {
-      paths = [ ./theme ];
-      recursive = true;
-    };
-}

users/root/configuration.nix

@@ -0,0 +1,9 @@
+{ config, lib, pkgs, settings, ... } @ args:
+{
+  users.users.root = {
+    initialPassword = "password1";
+  };
+
+  ## TODO github ssh key... etc
+}
+