rest server

.sops.yaml

@@ -9,6 +9,7 @@ creation_rules:
     - age:
       - *john-pc
       - *soteria
+      - *test-nix
   - path_regex: john-p14s/secrets\.yaml$
     key_groups:
     - age:

flake.lock

@@ -1,12 +1,28 @@
 {
   "nodes": {
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1751685974,
+        "narHash": "sha256-NKw96t+BgHIYzHUjkTK95FqYRVKB8DHpVhefWSz/kTw=",
+        "ref": "refs/heads/main",
+        "rev": "549f2762aebeff29a2e5ece7a7dc0f955281a1d1",
+        "revCount": 92,
+        "type": "git",
+        "url": "https://git.lix.systems/lix-project/flake-compat.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.lix.systems/lix-project/flake-compat.git"
+      }
+    },
     "flake-file": {
       "locked": {
-        "lastModified": 1773637821,
+        "lastModified": 1775848911,
-        "narHash": "sha256-Cp1x/5/97iNjXOI5hLCA51BwR6hc1dWJiZp4VPogkTw=",
+        "narHash": "sha256-dqva/tlWxsXj32wYPdt06UrrR4l2QdK9JWyvPooWRi4=",
         "owner": "vic",
         "repo": "flake-file",
-        "rev": "bb9fbe00ba6a1945fbdd6973c2585ab770f404b0",
+        "rev": "b36cbd5fc01e9794a001ccb0c58b314efaabae08",
         "type": "github"
       },
       "original": {
@@ -22,11 +38,32 @@
         ]
       },
       "locked": {
-        "lastModified": 1772408722,
+        "lastModified": 1775087534,
-        "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
+        "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3",
+        "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-parts_2": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "nvf",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1769996383,
+        "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
         "type": "github"
       },
       "original": {
@@ -58,11 +95,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1774647770,
+        "lastModified": 1776046499,
-        "narHash": "sha256-UNNi14XiqRWWjO8ykbFwA5wRwx7EscsC+GItOVpuGjc=",
+        "narHash": "sha256-Wzc4nn07/0RL21ypPHRzNDQZcjhIC8LaYo7QJQjM5T4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "02371c05a04a2876cf92e2d67a259e8f87399068",
+        "rev": "287f84846c1eb3b72c986f5f6bebcff0bd67440d",
         "type": "github"
       },
       "original": {
@@ -86,6 +123,43 @@
         "type": "github"
       }
     },
+    "mnw": {
+      "locked": {
+        "lastModified": 1770419553,
+        "narHash": "sha256-b1XqsH7AtVf2dXmq2iyRr2NC1yG7skY7Z6N2MpWHlK4=",
+        "owner": "Gerg-L",
+        "repo": "mnw",
+        "rev": "2aaffa8030d0b262176146adbb6b0e6374ce2957",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Gerg-L",
+        "repo": "mnw",
+        "type": "github"
+      }
+    },
+    "ndg": {
+      "inputs": {
+        "nixpkgs": [
+          "nvf",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1768214250,
+        "narHash": "sha256-hnBZDQWUxJV3KbtvyGW5BKLO/fAwydrxm5WHCWMQTbw=",
+        "owner": "feel-co",
+        "repo": "ndg",
+        "rev": "a6bd3c1ce2668d096e4fdaaa03ad7f03ba1fbca8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "feel-co",
+        "ref": "refs/tags/v2.6.0",
+        "repo": "ndg",
+        "type": "github"
+      }
+    },
     "nixgl": {
       "inputs": {
         "flake-utils": "flake-utils",
@@ -110,11 +184,11 @@
     "nixos-hardware": {
       "flake": false,
       "locked": {
-        "lastModified": 1774567711,
+        "lastModified": 1775490113,
-        "narHash": "sha256-uVlOHBvt6Vc/iYNJXLPa4c3cLXwMllOCVfAaLAcphIo=",
+        "narHash": "sha256-2ZBhDNZZwYkRmefK5XLOusCJHnoeKkoN95hoSGgMxWM=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "3f6f874dfc34d386d10e434c48ad966c4832243e",
+        "rev": "c775c2772ba56e906cbeb4e0b2db19079ef11ff7",
         "type": "github"
       },
       "original": {
@@ -125,11 +199,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1774106199,
+        "lastModified": 1775423009,
-        "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=",
+        "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655",
+        "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9",
         "type": "github"
       },
       "original": {
@@ -141,11 +215,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1774273680,
+        "lastModified": 1775888245,
-        "narHash": "sha256-WLxi1vfcykjq9Yb2umqBJs6lVM6MpV2tXfcrAjroxUk=",
+        "narHash": "sha256-qTVvODr6edFBLD2lncXPF8yTQeCafZUuKVtpV3Xb3yM=",
-        "rev": "fdc7b8f7b30fdbedec91b71ed82f36e1637483ed",
+        "rev": "13043924aaa7375ce482ebe2494338e058282925",
         "type": "tarball",
-        "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre968305.fdc7b8f7b30f/nixexprs.tar.xz"
+        "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre978638.13043924aaa7/nixexprs.tar.xz"
       },
       "original": {
         "type": "tarball",
@@ -154,11 +228,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1773840656,
+        "lastModified": 1775579569,
-        "narHash": "sha256-9tpvMGFteZnd3gRQZFlRCohVpqooygFuy9yjuyRL2C0=",
+        "narHash": "sha256-/m3yyS/EnXqoPGBJYVy4jTOsirdgsEZ3JdN2gGkBr14=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9cf7092bdd603554bd8b63c216e8943cf9b12512",
+        "rev": "dfd9566f82a6e1d55c30f861879186440614696e",
         "type": "github"
       },
       "original": {
@@ -168,6 +242,31 @@
         "type": "github"
       }
     },
+    "nvf": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "flake-parts": "flake-parts_2",
+        "mnw": "mnw",
+        "ndg": "ndg",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1775892726,
+        "narHash": "sha256-1TK1pe33cEHNvGW41TP5xAzrbG1Gp7LfyFL6c3+xf+I=",
+        "owner": "notashelf",
+        "repo": "nvf",
+        "rev": "5ab359ee7dfd3fa09a5c6f863efaf810bb9a9436",
+        "type": "github"
+      },
+      "original": {
+        "owner": "notashelf",
+        "repo": "nvf",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "flake-file": "flake-file",
@@ -180,8 +279,10 @@
         "nixpkgs-lib": [
           "nixpkgs"
         ],
+        "nvf": "nvf",
         "sops-nix": "sops-nix",
-        "wrapper-modules": "wrapper-modules"
+        "wrapper-modules": "wrapper-modules",
+        "wrappers": "wrappers"
       }
     },
     "sops-nix": {
@@ -191,11 +292,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1774303811,
+        "lastModified": 1775971308,
-        "narHash": "sha256-fhG4JAcLgjKwt+XHbjs8brpWnyKUfU4LikLm3s0Q/ic=",
+        "narHash": "sha256-VKp9bhVSm0bT6JWctFy06ocqxGGnWHi1NfoE90IgIcY=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "614e256310e0a4f8a9ccae3fa80c11844fba7042",
+        "rev": "31ac5fe5d015f76b54058c69fcaebb66a55871a4",
         "type": "github"
       },
       "original": {
@@ -219,16 +320,31 @@
         "type": "github"
       }
     },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "wrapper-modules": {
       "inputs": {
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1774622331,
+        "lastModified": 1775940860,
-        "narHash": "sha256-73C9XYuBrgo8unDbmqEFq4pNwQaSGXrTnBckqkOXmBk=",
+        "narHash": "sha256-8Jxnn2uoFhm2H579ycVxFWDtrywJ6Mc8RmqWbZwk5So=",
         "owner": "BirdeeHub",
         "repo": "nix-wrapper-modules",
-        "rev": "364e0007179fc2c910a6588e8826fd3fd7a45c14",
+        "rev": "fb62851ffc5f6a4d53ebc00b93743e29b41e6224",
         "type": "github"
       },
       "original": {
@@ -236,6 +352,26 @@
         "repo": "nix-wrapper-modules",
         "type": "github"
       }
+    },
+    "wrappers": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1775600302,
+        "narHash": "sha256-2fgKImv78CXIcfo1RsY7EI4uMZ84x/MggA5rrusYc7c=",
+        "owner": "lassulus",
+        "repo": "wrappers",
+        "rev": "9d8397d8ef1ac35763085f3338589f558128f7db",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lassulus",
+        "repo": "wrappers",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -21,10 +21,18 @@
     };
     nixpkgs.url = "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz";
     nixpkgs-lib.follows = "nixpkgs";
+    nvf = {
+      url = "github:notashelf/nvf";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     sops-nix = {
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     wrapper-modules.url = "github:BirdeeHub/nix-wrapper-modules";
+    wrappers = {
+      url = "github:lassulus/wrappers";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 }

modules/default.nix

@@ -4,4 +4,6 @@
     # https://github.com/vic/flake-file/tree/main/modules/dendritic
     inputs.flake-file.flakeModules.dendritic
   ];
+
+  systems = [ "x86_64-linux" "aarch64-linux" ];
 }

modules/features/desktop.nix

@@ -8,10 +8,8 @@
       vscode
     ];
     home.packages = with pkgs; [
-      discord
       mangohud
       sublime4
-      proton-vpn
     ];
   };
 }

modules/features/forgejo.nix

@@ -0,0 +1,147 @@
+{ self, inputs, ... }: {
+  flake.modules.nixos.forgejo = {config, pkgs, lib, ... }:
+    let
+      cfg = config.forgejo;
+      needsPrivilegedPort = cfg.port < 1024;
+    in
+    {
+      options.forgejo = {
+        enable = lib.mkEnableOption "Enable Forgejo backed with PostgreSQL";
+        root_url = lib.mkOption {
+          type = lib.types.str;
+        };
+
+        port = lib.mkOption {
+          type = lib.types.port;
+          default = 3000;
+          description = "TCP port for the Forgejo web interface.";
+        };
+
+        openFirewall = lib.mkOption {
+          type = lib.types.bool;
+          default = true;
+          description = "Open the Forgejo web interface port in the firewall.";
+        };
+
+        https = lib.mkEnableOption "Open the Forgejo web interface port in the firewall.";
+      };
+
+      config = lib.mkIf cfg.enable {
+        networking.firewall.allowedTCPPorts = lib.optionals cfg.openFirewall [ cfg.port ];
+
+        systemd.services.forgejo.serviceConfig = lib.mkIf needsPrivilegedPort {
+          AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];
+          CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ];
+          PrivateUsers = lib.mkForce false;
+        };
+
+        sops.secrets = {
+          "forgejo/secret_key".owner = config.services.forgejo.user;
+          "forgejo/internal_token".owner = config.services.forgejo.user;
+          "forgejo/jwt_secret".owner = config.services.forgejo.user;
+          "forgejo/lfs_jwt_secret".owner = config.services.forgejo.user;
+        };
+
+        services = {
+          forgejo = {
+            enable = true;
+            lfs.enable = true;
+            database.type = "postgres";
+            settings = {
+              DEFAULT = {
+                RUN_MODE = "dev";
+              };
+              server = lib.mkMerge [
+                {
+                  HTTP_PORT = cfg.port;
+                  DISABLE_SSH = true;
+                  ROOT_URL = cfg.root_url;
+                }
+                (lib.mkIf cfg.https {
+                  PROTOCOL = "https";
+                  COOKIE_SECURE = true;
+                  KEY_FILE = config.mtls.keyFile;
+                  CERT_FILE = config.mtls.certFile;
+                })
+              ];
+              oauth2_client = {
+                ENABLE_AUTO_REGISTRATION = true;
+                USERNAME = "nickname";
+                UPDATE_AVATAR = true;
+                ACCOUNT_LINKING = "login";
+                REGISTER_EMAIL_CONFIRM = false;
+              };
+              repository = {
+                ENABLE_PUSH_CREATE_USER = true;
+              };
+              ui.SHOW_USER_EMAIL = false;
+              markup = {
+                ENABLED = true;
+              };
+            };
+
+            secrets = {
+              security = {
+                SECRET_KEY = lib.mkForce config.sops.secrets."forgejo/secret_key".path;
+                INTERNAL_TOKEN = lib.mkForce config.sops.secrets."forgejo/internal_token".path;
+              };
+              oauth2.JWT_SECRET = lib.mkForce config.sops.secrets."forgejo/jwt_secret".path;
+              server.LFS_JWT_SECRET = lib.mkForce config.sops.secrets."forgejo/lfs_jwt_secret".path;
+            };
+            dump = {
+              enable = true;
+              type = "tar";
+              interval = "*-*-* 00/12:00:00";
+            };
+          };
+
+          postgresql = {
+            enable = true;
+            enableTCPIP = false;
+          };
+        };
+
+        # https://forgejo.org/docs/latest/admin/command-line/#dump
+        systemd.services.forgejo-dump.serviceConfig.ExecStart = lib.mkForce ''
+          ${lib.getExe config.services.forgejo.package} dump --verbose \
+          --type ${config.services.forgejo.dump.type} \
+          --database postgres \
+          --work-path ${config.services.forgejo.dump.backupDir}
+        '';
+
+        environment.systemPackages =
+          let
+            systemctl = lib.getExe' pkgs.systemd "systemctl";
+            clean-forgejo = (pkgs.writeShellScriptBin "clean-forgejo" ''
+              set -euo pipefail
+              sudo ${systemctl} stop forgejo.service
+              ${lib.getExe' pkgs.coreutils "echo"} "Stopped Forgejo"
+              sudo ${lib.getExe' pkgs.coreutils "rm"} -rf ${config.services.forgejo.stateDir}
+              ${lib.getExe' pkgs.coreutils "echo"} "Removed ${config.services.forgejo.stateDir}"
+            '');
+            clean-postgres = (pkgs.writeShellScriptBin "clean-postgres" ''
+              set -euo pipefail
+              sudo ${systemctl} stop postgresql.service
+              ${lib.getExe' pkgs.coreutils "echo"} "Stopped PostgreSQL"
+              sudo ${lib.getExe' pkgs.coreutils "rm"} -rf ${config.services.postgresql.dataDir}
+              ${lib.getExe' pkgs.coreutils "echo"} "Removed ${config.services.postgresql.dataDir}"
+            '');
+          in [
+            clean-forgejo
+            clean-postgres
+            (pkgs.writeShellScriptBin "clean-all" ''
+              set -euo pipefail
+              GREEN_CHECK="\e[32m✔\e[0m"
+              YELLOW_BANG="\e[33m!\e[0m"
+              ${lib.getExe' pkgs.coreutils "echo"} -n -e "$YELLOW_BANG Remove everything related to Forgejo and the PostgreSQL database behind it?"
+              read -p " (y/n) " -n 1 -r
+              if [[ $REPLY =~ ^[Yy]$ ]]; then
+                ${lib.getExe clean-forgejo}
+                ${lib.getExe clean-postgres}
+                ${lib.getExe' pkgs.coreutils "echo"} -e "$GREEN_CHECK Removed everything related to forgejo"
+              fi
+            '')
+          ];
+      };
+    };
+}

modules/features/greetd.nix

@@ -1,6 +1,6 @@
 # https://github.com/glabrie/dotfiles/blob/main/modules/system/settings/greetd.nix
 { inputs, ... }: {
-  flake.module.nixos.greetd = { pkgs, lib, ... }: {
+  flake.modules.nixos.greetd = { pkgs, lib, ... }: {
     services.greetd = {
       enable = true;
       settings = {

modules/features/mtls.nix

@@ -1,7 +1,7 @@
 { self, inputs, lib, ... }:
 let
-  # Options that will be in common between
+  # Options that will be in common between the nixos module and the home-manager module.
-  opts = {
+  mkOpts = config: let cfg = config.mtls; in {
     enable = lib.mkEnableOption "Enable mTLS";
     subject = lib.mkOption {
       description = "The Common Name, DNS Name, or IP address that will be set as the Subject Common Name for the certificate. If no Subject Alternative Names (SANs) are configured (via the --san flag) then the subject will be set as the only SAN.";
@@ -11,20 +11,25 @@ let
       description = "String path to the directory where the certs will be stored";
       type = lib.types.str;
     };
-    keyFilename = lib.mkOption {
+    caFile = lib.mkOption {
-      description = "String filename for the private key";
+      description = "String path for the root CA file";
       type = lib.types.str;
-      default = "key.pem";
+      default = "${cfg.certDir}/root_ca.crt";
     };
-    certFilename = lib.mkOption {
+    keyFile = lib.mkOption {
-      description = "String filename for the public certificate";
+      description = "String path for the private key";
       type = lib.types.str;
-      default = "cert.pem";
+      default = "${cfg.certDir}/key.pem";
     };
-    bundleFilename = lib.mkOption {
+    certFile = lib.mkOption {
-      description = "String filename for the mTLS key bundle";
+      description = "String path for the public cert";
       type = lib.types.str;
-      default = "mtls.pem";
+      default = "${cfg.certDir}/cert.pem";
+    };
+    bundleFile = lib.mkOption {
+      description = "String path for the mTLS key bundle";
+      type = lib.types.str;
+      default = "${cfg.certDir}/mtls.pem";
     };
     san = lib.mkOption {
       description = "List of SAN to give the mTLS cert";
@@ -37,7 +42,7 @@ let
     };
     lifetime = lib.mkOption {
       type = lib.types.str;
-      default = "6h";
+      default = "24h";
     };
     renew = {
       enable = lib.mkOption {
@@ -61,9 +66,9 @@ let
         default = "root";
       };
       group = lib.mkOption {
-        description = "Group to run the mTLS renewal service as. Defaults to the configured renewal user when null.";
+        description = "Group to run the mTLS renewal service as. Defaults to the configured renewal user.";
         type = lib.types.nullOr lib.types.str;
-        default = null;
+        default = "mtls";
       };
       reloadUnits = lib.mkOption {
         description = "systemd units to try-reload-or-restart after a successful certificate renewal.";
@@ -83,104 +88,119 @@ let
     subject,
     provisioner,
     san,
-    tlsCert,
+    certFile,
-    tlsKey,
+    keyFile,
-    mtlsBundle,
+    bundleFile,
     lifetime,
+    user,
+    group,
   }:
   let
-    stepCmd = lib.getExe pkgs.step-cli;
     sanArgs = lib.concatMapStringsSep " " (s: "--san \"${s}\"") san;
   in
-    pkgs.writeShellScriptBin "mtls-generate" ''
+    pkgs.writeShellApplication {
-      set -euo pipefail
+      name = "mtls-generate";
-      ${stepCmd} ca certificate \
+      runtimeInputs = with pkgs; [ coreutils step-cli ];
-        ${subject} ${tlsCert} ${tlsKey} \
+      text = ''
-        --not-before=-5m --not-after=${lifetime} \
+        set -euo pipefail
-        --provisioner ${provisioner} \
+        step ca certificate ${subject} ${certFile} ${keyFile} \
-        ${sanArgs} \
+          --provisioner ${provisioner} \
-        "$@"
+          --not-before=-5m --not-after=${lifetime} \
-      cat ${tlsCert} ${tlsKey} > ${mtlsBundle}
+          ${sanArgs} \
-    '';
+          "$@"
+        (umask 077; cat ${certFile} ${keyFile} > ${bundleFile})
+        chown ${user}:${group} ${certFile} ${keyFile} ${bundleFile}
+        chmod 640 ${certFile} ${keyFile} ${bundleFile}
+        printf '\033[32m✔\033[0m \033[1mmTLS Bundle:\033[0m %s\n' ${lib.escapeShellArg bundleFile}
+      '';
+    };
   
-  mkMtlsCheckScript = { pkgs, mtlsBundle }: pkgs.writeShellScriptBin "mtls-check" ''
+  mkMtlsCheckScript = { pkgs, bundleFile }: pkgs.writeShellApplication {
-    ${lib.getExe pkgs.openssl} x509 \
+    name = "mtls-check";
-    -noout -subject -issuer \
+    runtimeInputs = with pkgs; [ openssl ];
-    -ext subjectAltName,extendedKeyUsage \
+    text = ''
-    -enddate -in ${mtlsBundle}
+      openssl x509 -noout -in ${bundleFile} \
-  '';
+        -subject -issuer \
+        -ext subjectAltName,extendedKeyUsage \
+        -enddate
+    '';
+  };
 
   mkMtlsRenewScript = {
     pkgs,
-    tlsCert,
+    cfg,
-    tlsKey,
-    mtlsBundle,
-    reloadUnits ? [ ],
-    postCommands ? [ ],
     systemctlArgs ? [ ],
   }:
   let
-    echoCmd = lib.getExe' pkgs.coreutils "echo";
+    systemctlCmd = "systemctl ${lib.escapeShellArgs systemctlArgs}";
-    systemctl = lib.getExe' pkgs.systemd "systemctl";
+
-    escapedArgs = lib.escapeShellArgs systemctlArgs;
+    hasReloadUnits = cfg.renew.reloadUnits != [ ];
-    systemctlCommand = "${systemctl} ${escapedArgs}";
     renewReloadScript = lib.concatMapStringsSep "\n" (unit: ''
-      if ${systemctlCommand} --quiet is-active "${unit}"; then
+      if ${systemctlCmd} --quiet is-active "${unit}"; then
-        ${systemctlCommand} try-reload-or-restart "${unit}"
+        ${systemctlCmd} try-reload-or-restart "${unit}"
       fi
-    '') reloadUnits;
+    '') cfg.renew.reloadUnits;
-    renewPostCommands = lib.concatStringsSep "\n" postCommands;
+
+    hasPostCommands = cfg.renew.postCommands != [ ];
+    renewPostCommands = lib.concatStringsSep "\n" cfg.renew.postCommands;
+
+    fileOwner = "${cfg.renew.user}:${cfg.renew.group}";
   in
-    pkgs.writeShellScriptBin "mtls-renew" ''
+    pkgs.writeShellApplication {
+      name = "mtls-renew";
+      runtimeInputs = with pkgs; [ coreutils step-cli systemd ];
+      text = ''
       set -euo pipefail
 
-      if ${lib.getExe pkgs.step-cli} certificate needs-renewal "${tlsCert}"; then
+      YELLOW_BANG="\e[33m!\e[0m"
-        ${echoCmd} "Renewing mTLS certificate"
+
-      else
+      force=0
-        ${echoCmd} "Skipping renew"
+      while [[ $# -gt 0 ]]; do
-        exit "$?"
+      case $1 in
+        --force)
+        force=1
+        shift
+        ;;
+        *)
+        echo -e "$YELLOW_BANG Warning: ignoring unrecognized argument '$1'"
+        exit 1
+        ;;
+      esac
+      done
+
+      if [[ $force -eq 0 ]] && ! step certificate needs-renewal "${cfg.certFile}"; then
+        echo "Skipping renew"
+        exit 0
       fi
 
-      ${lib.getExe pkgs.step-cli} ca renew --force "${tlsCert}" "${tlsKey}"
+      echo "Renewing mTLS certificate"
+      step ca renew --force "${cfg.certFile}" "${cfg.keyFile}"
+      (umask 077; cat "${cfg.certFile}" "${cfg.keyFile}" > "${cfg.bundleFile}")
+      chown ${fileOwner} ${cfg.certFile} ${cfg.keyFile} ${cfg.bundleFile}
+      chmod 640 ${cfg.certFile} ${cfg.keyFile} ${cfg.bundleFile}
 
-      umask 077
+      ${lib.optionalString hasReloadUnits ''
-      ${lib.getExe' pkgs.coreutils "cat"} "${tlsCert}" "${tlsKey}" > "${mtlsBundle}"
+        echo "Reloading units: ${lib.concatStringsSep ", " cfg.renew.reloadUnits}"
+        ${renewReloadScript}
+      ''}
 
-      ${echoCmd} "Reloading units:"
+      ${lib.optionalString hasPostCommands ''echo "Post commands:" ${renewPostCommands}''}
-      ${renewReloadScript}
+      '';
-
-      ${echoCmd} "Post commands:"
-      ${renewPostCommands}
-    '';
-
-  mkNixosMtlsRenewService = {
-    pkgs,
-    tlsCert,
-    tlsKey,
-    mtlsBundle,
-    reloadUnits ? [ ],
-    postCommands ? [ ],
-    user ? "root",
-    group ? null,
-  }:
-  let
-    serviceGroup = if group == null then user else group;
-    renewScript = mkMtlsRenewScript {
-      inherit pkgs tlsCert tlsKey mtlsBundle reloadUnits postCommands;
     };
-  in
+
-  {
+  mkNixosMtlsRenewService = { pkgs, cfg, ... }:
-    description = "Renew the mTLS certificate when Smallstep marks it ready";
+    {
-    wantedBy = [ ];
+      description = "Renew the mTLS certificate when Smallstep marks it ready";
-    after = [ "network-online.target" ];
+      wantedBy = [ ];
-    wants = [ "network-online.target" ];
+      after = [ "network-online.target" ];
-    serviceConfig = {
+      wants = [ "network-online.target" ];
-      Type = "oneshot";
+      serviceConfig = {
-      User = user;
+        Type = "oneshot";
-      Group = serviceGroup;
+        User = cfg.renew.user;
-      ExecStart = lib.getExe renewScript;
+        Group = cfg.renew.group;
+        ExecStart = lib.getExe (mkMtlsRenewScript { inherit pkgs cfg; });
+      };
     };
-  };
 
   mkNixosMtlsRenewTimer = {
     onCalendar,
@@ -198,17 +218,10 @@ let
     };
   };
 
-  mkHomeManagerMtlsRenewService = {
+  mkHomeManagerMtlsRenewService = { pkgs, cfg, ... }:
-    pkgs,
-    tlsCert,
-    tlsKey,
-    mtlsBundle,
-    reloadUnits ? [ ],
-    postCommands ? [ ],
-  }:
   let
     renewScript = mkMtlsRenewScript {
-      inherit pkgs tlsCert tlsKey mtlsBundle reloadUnits postCommands;
+      inherit pkgs cfg;
       systemctlArgs = [ "--user" ];
     };
   in
@@ -249,39 +262,45 @@ in
   flake.modules.nixos.mtls = { config, lib, pkgs, ... }:
     let
       cfg = config.mtls;
-      tlsKey = "${cfg.certDir}/${cfg.keyFilename}";
-      tlsCert = "${cfg.certDir}/${cfg.certFilename}";
-      mtlsBundle = "${cfg.certDir}/${cfg.bundleFilename}";
       sanArgs = lib.concatMapStringsSep " " (san: "--san \"${san}\"") cfg.san;
     in
     {
-      options.mtls = opts // {
+      options.mtls = (mkOpts config) // {
         certDir = lib.mkOption {
           description = "String path to where the mtls certs will be stored.";
           type = lib.types.str;
-          default = "/etc/step/certs";
+          default = "/etc/step-ca/certs";
+        };
+        certReaders = lib.mkOption {
+          description = "";
+          type = lib.types.listOf lib.types.str;
+          default = [ ];
         };
       };
 
       config = lib.mkIf cfg.enable {
+        users.groups.certReaders = {
+          name = cfg.renew.group;
+          members = cfg.certReaders;
+        };
+
         environment.systemPackages = with pkgs; lib.optionals cfg.enable [
-          step-cli
+          # step-cli
           (mkMtlsGenerateScript {
-            inherit (cfg) subject provisioner san lifetime;
+            inherit pkgs;
-            inherit pkgs tlsCert tlsKey mtlsBundle;
+            inherit (cfg) subject provisioner san certFile keyFile bundleFile lifetime;
+            inherit (cfg.renew) user group;
           })
-          (mkMtlsCheckScript { inherit pkgs mtlsBundle; })
+          (mkMtlsCheckScript { inherit pkgs; inherit (cfg) bundleFile; })
-          (mkMtlsRenewScript { inherit pkgs tlsCert tlsKey mtlsBundle; })
+          (mkMtlsRenewScript { inherit pkgs cfg; })
         ];
 
         systemd.tmpfiles.rules = [
-          "d ${cfg.certDir} 0750 ${cfg.renew.user} ${if cfg.renew.group == null then cfg.renew.user else cfg.renew.group} -"
+          "d ${cfg.certDir} 0750 ${cfg.renew.user} ${cfg.renew.group} -"
         ];
 
-        systemd.services.mtls-renew = lib.mkIf cfg.renew.enable (mkNixosMtlsRenewService {
+        systemd.services.mtls-renew = lib.mkIf cfg.renew.enable
-          inherit pkgs tlsCert tlsKey mtlsBundle;
+          (mkNixosMtlsRenewService { inherit pkgs cfg; });
-          inherit (cfg.renew) reloadUnits postCommands user group;
-        });
 
         systemd.timers.mtls-renew = lib.mkIf cfg.renew.enable (mkNixosMtlsRenewTimer {
           inherit (cfg.renew) onCalendar randomizedDelaySec;
@@ -292,13 +311,13 @@ in
   flake.modules.homeManager.mtls = { config, lib, pkgs, ... }:
     let
       cfg = config.mtls;
-      tlsKey = "${cfg.certDir}/${cfg.keyFilename}";
+      keyFile = cfg.keyFile;
-      tlsCert = "${cfg.certDir}/${cfg.certFilename}";
+      certFile = cfg.certFile;
-      mtlsBundle = "${cfg.certDir}/${cfg.bundleFilename}";
+      bundleFile = cfg.bundleFile;
       sanArgs = lib.concatMapStringsSep " " (san: "--san \"${san}\"") cfg.san;
     in
     {
-      options.mtls = opts // {
+      options.mtls = (mkOpts config) // {
         certDir = lib.mkOption {
           description = "String path to where the mtls certs will be stored.";
           type = lib.types.str;
@@ -308,23 +327,22 @@ in
 
       config = {
         home.packages = with pkgs; lib.optionals cfg.enable [
-          step-cli
+          # step-cli
           (mkMtlsGenerateScript {
             inherit (cfg) subject provisioner san lifetime;
-            inherit pkgs tlsCert tlsKey mtlsBundle;
+            inherit (cfg.renew) user group;
+            inherit pkgs certFile keyFile bundleFile;
           })
-          (mkMtlsCheckScript { inherit pkgs mtlsBundle; })
+          (mkMtlsCheckScript { inherit pkgs bundleFile; })
-          (mkMtlsRenewScript { inherit pkgs tlsCert tlsKey mtlsBundle; })
+          (mkMtlsRenewScript { inherit pkgs cfg; systemctlArgs = [ "--user" ]; })
         ];
 
         systemd.user.tmpfiles.rules = lib.mkIf cfg.enable [
           "d ${cfg.certDir} 0700 - - -"
         ];
 
-        systemd.user.services.mtls-renew = lib.mkIf cfg.renew.enable (mkHomeManagerMtlsRenewService {
+        systemd.user.services.mtls-renew = lib.mkIf cfg.renew.enable
-          inherit pkgs tlsCert tlsKey mtlsBundle;
+          (mkHomeManagerMtlsRenewService { inherit pkgs cfg; });
-          inherit (cfg.renew) reloadUnits postCommands;
-        });
 
         systemd.user.timers.mtls-renew = lib.mkIf cfg.renew.enable (mkHomeManagerMtlsRenewTimer {
           inherit (cfg.renew) onCalendar randomizedDelaySec;

modules/features/restic.nix

@@ -1,4 +1,4 @@
-{ inputs, ... }: {
+{ self, inputs, ... }: {
   flake.modules.nixos.restic-server = { config, pkgs, lib, ... }: {
     services.restic.server = {
       enable = true;
@@ -19,6 +19,11 @@
           type = lib.types.str;
           default = "john-ubuntu";
         };
+        repoUrl = lib.mkOption {
+          description = "URL to the REST endpoint";
+          type = lib.types.str;
+          default = "rest:https://soteria.john-stream.com/${cfg.repoName}";
+        };
         passwordFile = lib.mkOption {
           description = "String path to the restic password file";
           type = lib.types.str;
@@ -44,29 +49,24 @@
         };
       };
 
-      config = let
+      config = {
-        resticRepository = "rest:https://soteria.john-stream.com/${cfg.repoName}";
-        caCert = "${config.mtls.certDir}/root_ca.crt";
-        mtlsClientCert = "${config.mtls.certDir}/${config.mtls.bundleFilename}";
-      in
-      {
         home.sessionVariables = {
-          RESTIC_REPOSITORY = resticRepository;
+          RESTIC_REPOSITORY = cfg.repoUrl;
           RESTIC_PASSWORD_FILE = cfg.passwordFile;
-          RESTIC_CACERT = caCert;
+          RESTIC_CACERT = config.mtls.caFile;
-          RESTIC_TLS_CLIENT_CERT = mtlsClientCert;
+          RESTIC_TLS_CLIENT_CERT = config.mtls.bundleFile;
         };
         
         # This is necessary because the restic service in home manager doesn't otherwise expose these options.
         systemd.user.services."restic-backups-${cfg.repoName}".Service.Environment = [
-          "RESTIC_CACERT=${caCert}"
+          "RESTIC_CACERT=${config.mtls.caFile}"
-          "RESTIC_TLS_CLIENT_CERT=${mtlsClientCert}"
+          "RESTIC_TLS_CLIENT_CERT=${config.mtls.bundleFile}"
         ];
 
         services.restic = {
           enable = true;
           backups.${cfg.repoName} = {
-            repository = resticRepository;
+            repository = cfg.repoUrl;
             passwordFile = cfg.passwordFile;
             paths = cfg.paths;
             timerConfig = {

modules/features/shell-tools.nix

@@ -21,6 +21,9 @@
       home.shell.enableShellIntegration = true;
       programs.zsh.enable  = lib.mkForce (config.shell.program == "zsh");
       home.packages = with pkgs; [
+        nh
+        nvd
+        nix-output-monitor
         wget
         curl
         busybox
@@ -31,6 +34,7 @@
         xclip
         jq
         ripgrep
+        (writeShellScriptBin "ds" ''${lib.getExe pkgs.gdu} -x -I /snap /'')
       ];
     };
   };

modules/hosts/janus/default.nix

@@ -2,12 +2,57 @@
 let
   username = "john";
   hostname = "janus";
+  ca-url = "https://janus.john-stream.com/";
+  fingerprint = builtins.readFile ./fingerprint;
 in
 {
+  flake.modules.nixos.janus-ca =
+    { config, lib, ... }:
+    let
+      cfg = config.janus-ca;
+      johnHome = lib.attrByPath [ "users" "users" username "home" ] "/home/${username}" config;
+      johnGroup = lib.attrByPath [ "users" "users" username "group" ] username config;
+      cfgInEtc = lib.hasPrefix "/etc/" cfg.certDir;
+      certDirEtcPath =
+        if cfgInEtc then
+          lib.removePrefix "/etc/" cfg.certDir
+        else
+          cfg.certDir;
+      certRootEtcPath = "${certDirEtcPath}/root_ca.crt";
+      mkStepRules = home: user: group: [
+        "d ${home}/.step 0700 ${user} ${group} -"
+        "d ${home}/.step/config 0700 ${user} ${group} -"
+        "d ${home}/.step/certs 0700 ${user} ${group} -"
+        "L+ ${home}/.step/config/defaults.json - - - - /etc/step-ca/defaults.json"
+        "L+ ${home}/.step/certs/root_ca.crt - - - - ${cfg.certDir}/root_ca.crt"
+      ];
+    in
+    {
+      options.janus-ca = {
+        certDir = lib.mkOption {
+          description = "String path to where the mtls certs will be stored.";
+          type = lib.types.str;
+          default = "/etc/step-ca/certs";
+        };
+      };
+
+      config = {
+        environment.etc = lib.mkIf cfgInEtc {
+          "step-ca/defaults.json".text = builtins.toJSON {
+            inherit ca-url fingerprint;
+            root = "/etc/${certRootEtcPath}";
+          };
+          "${certRootEtcPath}".source = ./root_ca.crt;
+        };
+        systemd.tmpfiles.rules =
+          mkStepRules johnHome username johnGroup
+          ++ mkStepRules "/root" "root" "root";
+      };
+    };
+
   flake.modules.homeManager.janus-ca = { config, ... }: {
     home.file.".step/config/defaults.json".text = builtins.toJSON {
-      "ca-url" = "https://janus.john-stream.com/";
+      inherit ca-url fingerprint;
-      fingerprint = "2036c44f7b5901566ff7611ea6c927291ecc6d2dd00779c0eead70ec77fa10d6";
       root = "${config.home.homeDirectory}/.step/certs/root_ca.crt";
     };
     home.file.".step/certs/root_ca.crt".source = ./root_ca.crt;
@@ -18,9 +63,9 @@ in
       nixos.lxc
       nixos.mysops
       nixos.step-ssh-host
+      nixos.janus-ca
       inputs.home-manager.nixosModules.home-manager
       nixos."${username}"
-      nixos.zsh
       nixos.docker
       nixos.login-text
       nixos.mtls
@@ -40,9 +85,8 @@ in
 
         home-manager.users."${username}" = {
           imports = with inputs.self.modules.homeManager; [
-            sops
+            mysops
             step-ssh-user
-            janus-ca
           ];
           shell.program = "zsh";
           docker.enable = true;
@@ -50,4 +94,16 @@ in
       }
     ];
   };
+
+  perSystem = { system, pkgs, lib, ... }: {
+    packages.janus-ca = inputs.wrappers.lib.wrapPackage {
+      inherit pkgs;
+      package = pkgs.step-cli;
+      binName = "janus-cert";
+      args = [
+        "ca" "certificate"
+        "--ca-url=${ca-url}"
+      ];
+    };
+  };
 }

modules/hosts/janus/fingerprint

@@ -0,0 +1 @@
+2036c44f7b5901566ff7611ea6c927291ecc6d2dd00779c0eead70ec77fa10d6

modules/hosts/john-p14s/configuration.nix

@@ -3,7 +3,9 @@
   flake.modules.nixos.p14sConfiguration = { config, pkgs, lib, ... }:
     let
       hostname = "john-p14s";
-      flakeDir = "${config.home-manager.users.john.home.homeDirectory}/Documents/dendritic";
+      homeDirectory = config.home-manager.users.john.home.homeDirectory;
+      flakeDir = "${homeDirectory}/Documents/dendritic";
+      my-neovim = inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.my-neovim;
     in
     {
       imports = [
@@ -16,6 +18,8 @@
         allowUnfree = true;
       };
 
+      rebuild.flakeDir = flakeDir;
+
       networking = {
         hostName = hostname;
         networkmanager.enable = true;
@@ -37,6 +41,7 @@
         busybox
         dig
         samba
+        my-neovim
       ];
 
       security.pam.services.swaylock = {};
@@ -66,18 +71,19 @@
       time.timeZone = "America/Chicago";
 
       # Select internationalisation properties.
-      i18n.defaultLocale = "en_US.UTF-8";
+      i18n = {
-
+        defaultLocale = "en_US.UTF-8";
-      i18n.extraLocaleSettings = {
+        extraLocaleSettings = {
-        LC_ADDRESS = "en_US.UTF-8";
+          LC_ADDRESS = "en_US.UTF-8";
-        LC_IDENTIFICATION = "en_US.UTF-8";
+          LC_IDENTIFICATION = "en_US.UTF-8";
-        LC_MEASUREMENT = "en_US.UTF-8";
+          LC_MEASUREMENT = "en_US.UTF-8";
-        LC_MONETARY = "en_US.UTF-8";
+          LC_MONETARY = "en_US.UTF-8";
-        LC_NAME = "en_US.UTF-8";
+          LC_NAME = "en_US.UTF-8";
-        LC_NUMERIC = "en_US.UTF-8";
+          LC_NUMERIC = "en_US.UTF-8";
-        LC_PAPER = "en_US.UTF-8";
+          LC_PAPER = "en_US.UTF-8";
-        LC_TELEPHONE = "en_US.UTF-8";
+          LC_TELEPHONE = "en_US.UTF-8";
-        LC_TIME = "en_US.UTF-8";
+          LC_TIME = "en_US.UTF-8";
+        };
       };
 
       services.libinput.enable = true; # Enable touchpad support (enabled default in most desktopManager).
@@ -99,11 +105,9 @@
         # media-session.enable = true;
       };
 
-      home-manager.useGlobalPkgs = true;
       home-manager.users.root = {
         imports = with inputs.self.modules.homeManager; [
           rebuild
-          janus-ca
         ];
         home.stateVersion = "25.11";
       };
@@ -112,7 +116,6 @@
         desktop
         mysops
         rebuild
-        janus-ca
         {
           my-vscode.enable = true;
           mysops.hostSecretFile = "${flakeDir}/modules/hosts/john-p14s/secrets.yaml";
@@ -121,13 +124,21 @@
           home.packages = with pkgs; [
             bash
             discord
+            my-neovim
+            proton-vpn
+            joplin-desktop
           ];
+          ssh.certificates.enable = true;
+          ssh.matchSets = {
+            appdaemon = true;
+            homelab = true;
+            dev = true;
+            certs = true;
+          };
         }
       ];
       sops.defaultSopsFile = ./secrets.yaml;
-      sops.age.sshKeyPaths = [
+      sops.age.sshKeyPaths = [ "${homeDirectory}/.ssh/id_ed25519" ];
-        "${config.home-manager.users.john.home.homeDirectory}/.ssh/id_ed25519"
-      ];
       mtls = {
         enable = true;
         subject = hostname;

modules/hosts/john-p14s/default.nix

@@ -12,6 +12,8 @@
       "${inputs.nixos-hardware}/lenovo/thinkpad/p14s/amd/gen4"
     ] ++ (with self.modules.nixos; [
       p14sConfiguration
+      janus-ca
+      rebuild
       sudo
       john
       gnome

modules/hosts/john-pc/default.nix

@@ -1,17 +1,25 @@
-{ inputs, ... }:
+{ withSystem, self, inputs, ... }:
 let
   username = "john";
   hostname = "john-pc-ubuntu";
-  testTarget = "fded:fb16:653e:25da:be24:11ff:fea0:753f"; # test-nix
+
   # testTarget = "fded:fb16:653e:25da:be24:11ff:fe89:1cc3"; # soteria
+  # testTarget = "fded:fb16:653e:25da:be24:11ff:fea0:753f"; # test-nix
+  testHost = "soteria"; # which host to test build
+  testTarget = "test-nix";
+
 in
 {
-  flake.modules.homeManager."${hostname}" = { pkgs, config, ... }:
+  flake.modules.homeManager."${hostname}" = { config, pkgs, lib, ... }:
   let
-    flakeDir = "${config.xdg.configHome}/home-manager/jsl-dendritic";
+    selfPkgs = inputs.self.packages.${pkgs.stdenv.hostPlatform.system};
-    certDir = "${config.mtls.certDir}";
-    mtlsBundle = "${certDir}/${config.mtls.bundleFilename}";
     resticPasswordFile = "${config.xdg.configHome}/restic/password.txt";
+    flakeDir = "${config.xdg.configHome}/home-manager/jsl-dendritic";
+    test-push = with pkgs; writeShellApplication {
+      name = "test-push";
+      runtimeInputs = [ nh ];
+      text = ''nh os switch ${flakeDir}#${testHost} --target-host root@${testTarget} -e none'';
+    };
   in
   {
     imports = with inputs.self.modules.homeManager; [
@@ -25,28 +33,25 @@ in
       docker
       desktop
     ];
-    targets.genericLinux.enable = true;
-
-    shell.program = "zsh";
-
-    home.username = "${username}";
-    home.homeDirectory = "/home/${username}";
-
-    home.packages = with pkgs; [
-      nixos-rebuild
-      (writeShellScriptBin "test-push" ''
-        mkdir -p /var/tmp/nix-build
-        chmod 1777 /var/tmp/nix-build
-        nixos-rebuild switch \
-          --flake ${flakeDir}#${hostname} \
-          --target-host root@${testTarget}
-      '')
-    ];
-
     # TODO: make this more restrictive, rather than allowing all unfree packages
     nixpkgs.config.allowUnfree = true;
     nixpkgs.config.permittedInsecurePackages = [ "openssl-1.1.1w" ];
 
+    targets.genericLinux.enable = true;
+
+    home.username = "${username}";
+    home.homeDirectory = "/home/${username}";
+    home.packages = with pkgs; [
+      nixos-rebuild
+      test-push
+      selfPkgs.neovim-min
+      # ${selfPkgs}.my-neovim
+      # selfPkgs.richPrinter
+      selfPkgs.janus-ca
+    ];
+
+    shell.program = "zsh";
+  
     homeManagerFlakeDir = flakeDir;
     docker.enable = true;
 
@@ -57,6 +62,9 @@ in
     };
     ssh = {
       certificates.enable = true;
+      knownHosts = [
+        "fded:fb16:653e:25da:be24:11ff:fea0:753f ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ9ZqiWPrCwHjxFCiu0lT4rlQs7KyMapxKJQQ5PJP1eh"
+      ];
       matchSets = {
         certs = true;
         appdaemon = true;
@@ -101,10 +109,9 @@ in
     };
   };
 
-  flake.homeConfigurations."${hostname}" = inputs.home-manager.lib.homeManagerConfiguration {
+  flake.homeConfigurations."john@john-pc-ubuntu" = withSystem "x86_64-linux" (ctx@{ config, inputs', ...}:
-    pkgs = import inputs.nixpkgs { system = "x86_64-linux"; };
+    inputs.home-manager.lib.homeManagerConfiguration {
-    modules = with inputs.self.modules; [
+      pkgs = inputs'.nixpkgs.legacyPackages;
-      homeManager."${hostname}"
+      modules = [ inputs.self.modules.homeManager."${hostname}" ];
-    ];
+  });
-  };
 }

modules/hosts/soteria/secrets.yaml

@@ -1,26 +1,44 @@
 janus:
-    admin_password: ENC[AES256_GCM,data:4pnSq0f1iTNFWn/Qcw+J7LWIXXd/j5v3WwFSzXfqgKA=,iv:/usSHYST8zv7AMvDNuW/fFLL+40IrderjL6bUWzBNd4=,tag:V/q1+SjIcYsZ0+PC/Q7c1A==,type:str]
+    admin_jwk: ENC[AES256_GCM,data:2XcN5X77wTQ+OUXa4C9xAErGvrwJKseHjCcgoj6jt+c=,iv:9x+M1wM0dYND1JYkJjM4N8pSOok2OF+P9vmm9NCumTI=,tag:dTCfh+KB1iRJBVoNsGqvuw==,type:str]
+forgejo:
+    #ENC[AES256_GCM,data:/wtm0uXbiWFoGNWtlTzVuNxBR7CPm2FMB98t3AxSj5V5rltLvzF9BjgWoJCiX3ltzmU=,iv:xaZXbUIGJHxPrLRQzEQI7hgRgc0y061jIhoE3zlcMaA=,tag:fQGheCIdBKm6wE+vtj7g6A==,type:comment]
+    secret_key: ENC[AES256_GCM,data:/jcyeDcsryLqu9Q3VnNaENb71/Tl5JUr0zDzxt8L5UCtnJ/YHA6MKItrQ9ZHFv1XROtnSfZl9D5kKomeM8EVqA==,iv:HxMKAMVQ08gkq6SWENj0/d8i9PhcgPCp5eqbztj9bSg=,tag:nO2dFWT/vfgGc/9JIDZrGw==,type:str]
+    #ENC[AES256_GCM,data:TADqVsZwXpH/zfrXNclavH8Sv++jX081UjK/Mkys5x52gU5fU0ikk478EmwzeergsHpmxxon,iv:v9HsIsud+eiko7F0u622MBrTVDsIxlpqru0Viifvqow=,tag:FLgNTW0EcGhHT6iI9I6Bsg==,type:comment]
+    internal_token: ENC[AES256_GCM,data:7eZM+misgHZz1p6HH9VzCAPIIFjp2vT0kyc9B1KllE+x2URyrgs5IR9SZ+T5vNdMdnlNzF25pUhKzjbak8tVN554rYWp06SczzqhLyaoHKs8iGBohMqfJkoZxxIVSB7g7GC+/SAsb719,iv:XbBXqXh/PqjEcAj0qsajR7Ij56KGT/9Spdp5T549p9I=,tag:o4ONucOkIE2VJ6VjOlPb6w==,type:str]
+    #ENC[AES256_GCM,data:ZqwgnKjaolJtjcy287fnDOkb/oSLnBpfWfsTeVPwbIE8YLRSoPP4gbCnHJBLq+TJNNI=,iv:zTvw4ZS6C1ifUwOijNLuTfUQ3JM+5gj1X2f/s8MwWXc=,tag:Y1yKlL+jIRHVBulGlSErog==,type:comment]
+    jwt_secret: ENC[AES256_GCM,data:e59MlATOorsTIQjtTUKfX5Yo3CVsbbfuKczp1gh1m2D1kkZK3ORFztYpjg==,iv:JH3PVUmXToiThEKDkDJ8MGVMAPlIEgPSWhru+9WgNjk=,tag:FfDpaCPejpw6kGDkxJwDWw==,type:str]
+    lfs_jwt_secret: ENC[AES256_GCM,data:xi9PEKFUGRyc3YOg3JM3KrrENi9xsbeBjiz4R16SK5WDafoGFLazN6KRJQ==,iv:1IhPyQDwA8tZ22pfZJiU8TRTCLCHC/HAnKdmSGDfvcM=,tag:rLdREVSKBm67rt8ayN16Vw==,type:str]
+restic_password: ENC[AES256_GCM,data:u7QOZXJkxVG4J75K5nphb2uJGdz6jbWuVSsKKu+41fshp7cVoRijtr/Cs02LjVse,iv:bt1W2FeBTG6ypBFYzMPXPIkYTSn0uHURY2ui6MRgYY8=,tag:DObAMws/zQcM+UKUe9EECA==,type:str]
 sops:
     age:
         - recipient: age1ykcs39e62pz3xu6cedg8ea685kv5d5qsrhgkndygzm8rx30xd5ys5t3qxt
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB0V1JsVDhnMHpaNHRQRCtw
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA5QThHOFdVQ0F6ZDE3QXdL
-            V3JMQm1SREZSYUpaYmZNQ1FEVmN0VFZRSlQ0Ck9wQlpqZFBrRUJENWVBbTd5cVVo
+            QVF0WW5yRkNtNXIyRm1LeEhwY2dRRWo0WENZCmZoWmlXZDh4ZGlUR2JYOUxuaVAx
-            ZlhYZnhGamk1ZlQ0N001ZWcrQ1Evb3cKLS0tIHpuTWhRTU1QeWFRUytiU21CMW94
+            WjhXVHBMNWdrdkgvTENJR2RpWldkNTAKLS0tIEF1bS9JSnFTbytBa1U5RjVzWkd3
-            eFc0ankvcWhqK3Q4MjRCVC9nTlJteU0K1tJvYM2M1XmlsCTpadHyf6EGE2Lg+XBL
+            S0pKVVI2RFN5a1BMYXBEY3VOUUM5QTAKNarYZm9DKRQhosSJBn9yryFxDkmFTV/o
-            TGTjMPSWqClWYB9HFZ4nCurEK/JidBanmGkc0Y9eFz9XYKl7rtyXUw==
+            i8b/tZ1ZybjEXX+X1EsgylM5u8iKkbEyUzqKO0E0gpg4qXSsJaMMYQ==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1h0prahyukq4l564yqwgcpg3g6gdrjflk0suklussjjrjstxd9uesws8633
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBNRzFlWTNxSGpaNU85QTFj
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBhdEN2M1lkMFoyQzg3bCsz
-            SnlRZkpZQTZQVjNqWFhLMHhKVm5ZVXB4Rms0CmZQclFzYkpWLzlqT2xNUTJMd2dJ
+            cVB0NUlkV1JPRjQ1TW5RSVFHUjdNMERoRXlzCk9tc25iMG00TkZjWjk2S2cyVE1J
-            Wm5PQXNabjRwV1hVRXFGVmxteGk2emMKLS0tIG5kcm5KamxNZmpKVGt5bUo1dVg5
+            cUFITDh2SkZGN0lpeWJVcWM3V3JrTTQKLS0tIENOWVBzTFYrdHRsMERwV0RKS01j
-            dFN2RGdqM29mM3hadXpBakY4QThxZnMKI9RbfXJHIHvYHy/2corfwDq+OHRPrmkA
+            QVI5TVl4L0dwOWpoQ1I2THZ6cWovWGMKIo1x1ZbdTyr/dNlPhvuomfk2MoPLsHyU
-            tWLH/KWqwGt0hvc5j8bUfRECgjdXmbC9kpAgDs8PhJF+X1ijVFrIYg==
+            N3CP3Scu3aZ7vqVua7uwtv4xQqyQI/yOnFjwxrVYPJ+N5Y/b4wsC6A==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2026-03-23T22:27:45Z"
+        - recipient: age1gvplss0ddmyf6vpjy363wu3n057vhm0j6n7tc94cxd8kadapypws5mtaj0
-    mac: ENC[AES256_GCM,data:tQ8EMXWqw7wd/QZqUPn/sAczk0G4jSUR96AF83cmJGYuoZkMkOzsMFt448IkWxNWOJHPmIc0vs+c3ngQxHyx6Uf9jVWzMkvfdzMYj82QuLsmXQ9e4/IAE9h+52uagbwgoOJwPCF+AQetSHez/jWPPIQPN5DLfz0edg4xYReX7DA=,iv:GsvotFkehIz5L4I9j0oQ89oM5XjZQAr6vrVd79tqFes=,tag:wLi4sXz8JqvaoUaYjEj/vA==,type:str]
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGSGQvL2ZYM2dtV1JWaDR1
+            RjJnN0YwWFM4d1IwTElqUnZQQkVDTmdydUJjCjdCUWxCVDNXUHVLd2ZHcDA5L0Mw
+            cEVxVE84L2xmQnRoYmsxVEdMSEZjdGcKLS0tIHViRVJyTWt4Q3JrMWtYaS9QdHlS
+            Yjd0MUcxcExvWVpCOUR3MkdZdGQyWUkKnru0Y2A98+0Mps7EtVK7ct3vPqIGveUt
+            E5fzpcKvdefzObrx7BPTwJ19t2fZg/dSi7HKwx3vmKZSzyQaqJOzsg==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2026-04-04T23:18:43Z"
+    mac: ENC[AES256_GCM,data:qBgeli5lHb4pyA8nAADBuRBAaq8VbAIsFI37OZtgnbnoHW2crxo3YC+EknaIYnZpZ48kwVhQS5lGRjI6JsWWhTH3+LVAhTmS2Qj/pZTD/JDLK6XJGXS4U9nB7m9aGYyW8gFCy9/DfoJWGsS//+ZmUikKPfd5kMZgh1zGoYCIGug=,iv:h+2fA+bO2SMCNrEslP36x3BPRaIy25cU/DNX8CYSC6A=,tag:RvVyUZ4ONRaKaqGiT31eUQ==,type:str]
     unencrypted_suffix: _unencrypted
-    version: 3.12.1
+    version: 3.12.2

modules/hosts/soteria/soteria.nix

@@ -1,4 +1,4 @@
-{ inputs, ... }:
+{ self, inputs, lib, ... }:
 let
   username = "john";
   hostname = "soteria";
@@ -7,65 +7,110 @@ in
   flake.nixosConfigurations."${hostname}" = inputs.nixpkgs.lib.nixosSystem {
     modules = with inputs.self.modules; [
       nixos.lxc
+      nixos."${username}"
       nixos.mysops
       nixos.step-ssh-host
-      inputs.home-manager.nixosModules.home-manager
-      nixos."${username}"
-      nixos.zsh
       nixos.login-text
-      # nixos.mtls
+      nixos.docker
+      nixos.mtls
+      nixos.janus-ca
+      nixos.forgejo
       # nixos.restic-server
       # nixos.restic-envoy
-      {
+      ({ config, pkgs, ... }: {
         networking.hostName = hostname;
-        nix.settings.build-dir = "/var/tmp/nix-build";
+        time.timeZone = "America/Chicago";
-        systemd.tmpfiles.rules = [
+
-          "d /var/tmp/nix-build 1777 root root -"
+        # Removes password for sudo
+        security.sudo-rs.extraRules = lib.mkAfter [
+          {
+            users = [ username ];
+            commands = [
+              {
+                command = "ALL";
+                options = [ "NOPASSWD" ];
+              }
+            ];
+          }
         ];
-        step-ssh-host = {
+
-          hostname = hostname;
+        users.users."${username}".extraGroups = [ "mtls" ];
+        mtls = {
+          enable = true;
+          certDir = config.janus-ca.certDir;
+          subject = hostname;
+          san = [
+            "${hostname}.john-stream.com"
+            # "192.168.1.142"
+            "forgejo.john-stream.com"
+            "192.168.1.244"
+          ];
+          lifetime = "12h";
+          renew.onCalendar = "*:3/15";
+          renew.reloadUnits = [ "forgejo.service" "restic-rest-server.service" ];
+          certReaders = [ config.services.forgejo.user "restic" ];
+        };
+        forgejo = {
+          enable = true;
+          root_url = "https://forgejo.john-stream.com";
+          https = true;
+          port = 443;
         };
 
-        home-manager.users."${username}" = {
+        networking.firewall.allowedTCPPorts = [ 8000 ];
-          imports = with inputs.self.modules; [
+        services.restic.server = {
-            homeManager"${hostname}"
+          enable = true;
+          privateRepos = true;
+          listenAddress = "0.0.0.0:8000";
+          extraFlags = [
+            "--no-auth"
+            "--tls"
+            "--tls-cert=${config.mtls.certFile}"
+            "--tls-key=${config.mtls.keyFile}"
           ];
         };
-      }
+
+        loginText.extraServiceStatus = {
+          Docker = "docker";
+          "mTLS Renewal" = "mtls-renew.timer";
+          Forgejo = "forgejo.service";
+          "Forgejo Backup" = "forgejo-dump.timer";
+          "Restic REST Server" = "restic-rest-server.service";
+        };
+
+        step-ssh-host.hostname = hostname;
+
+        # This provides the secrets at install time
+        sops.defaultSopsFile = ./secrets.yaml;
+
+        programs.zsh.enable = true;
+        home-manager.users."${username}" = {
+          imports = with inputs.self.modules; [
+            homeManager."${hostname}"
+          ];
+        };
+
+        environment.systemPackages = [
+          inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.janus-ca
+          inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.my-neovim
+          inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.jsl-zsh
+        ];
+      })
     ];
   };
 
-  flake.modules.homeManager."${hostname}" = { config, lib, pkgs, ... }: {
+  flake.modules.homeManager."${hostname}" = { config, pkgs, lib, ... }: {
     imports = with inputs.self.modules; [
       homeManager.rebuild
       homeManager.mysops
-      homeManager.janus-ca
-      homeManager.mtls
-      homeManager.docker
     ];
 
     homeManagerFlakeDir = "${config.xdg.configHome}/home-manager";
-    home.username = "${username}";
-    home.homeDirectory = "/home/${username}";
     shell.program = "zsh";
     docker.enable = true;
 
     # This will provide the edit-secrets script targeting this file
-    mysops.hostSecretFile = "${config.xdg.configHome}/home-manager/modules/hosts/soteria/secrets.yaml";
+    mysops.hostSecretFile = "${config.homeManagerFlakeDir}/modules/hosts/soteria/secrets.yaml";
-
-    mtls = {
-      enable = true;
-      subject = hostname;
-      san = [
-        "${hostname}.john-stream.com"
-        "192.168.1.142"
-      ];
-      lifetime = "1h";
-      renew.onCalendar = "*:3/15";
-      renew.postCommands = [
-        "${lib.getExe pkgs.docker} restart envoy"
-      ];
-    };
   };
 
   flake.homeConfigurations."${hostname}" = inputs.home-manager.lib.homeManagerConfiguration {

modules/hosts/test-nix.nix

@@ -11,12 +11,11 @@ in
       nixos.step-ssh-host
       inputs.home-manager.nixosModules.home-manager
       nixos."${username}"
-      nixos.zsh
       nixos.docker
       {
         home-manager.users."${username}" = {
           imports = with inputs.self.modules.homeManager; [
-            sops
+            mysops
           ];
           shell.program = "zsh";
           docker.enable = true;

modules/nix-tools/rebuild.nix

@@ -1,22 +1,104 @@
 { self, inputs, ... }:
 {
-  flake.modules.homeManager.rebuild =
+  flake.modules.nixos.rebuild =
-    { pkgs, lib, config, ... }:
+    { config, pkgs, lib, ... }:
     let
-      nixBin = lib.getExe pkgs.nix;
+      flakeDir = config.rebuild.flakeDir;
-      flakeDir = config.homeManagerFlakeDir;
       echoCmd = lib.getExe' pkgs.coreutils "echo";
       hostnameCmd = "$(${lib.getExe pkgs.hostname} -s)";
-      nhms = (pkgs.writeShellScriptBin "nhms" ''
+
-        HOSTNAME=${hostnameCmd}
+      nfs = with pkgs; writeShellApplication {
-        ${echoCmd} "Switching to the $HOSTNAME home-manager profile"
+        name = "nfs";
-        ${lib.getExe pkgs.home-manager} switch --impure --flake ${flakeDir}#$HOSTNAME
+        runtimeInputs = [ coreutils hostname nh ];
-      '');
+        text = ''
-      nfs = (pkgs.writeShellScriptBin "nfs" ''
+          HOSTNAME=$(hostname -s)
-        HOSTNAME=${hostnameCmd}
+          echo "Switching to the $HOSTNAME nixos profile"
-        ${echoCmd} "Switching to the $HOSTNAME nixos profile"
+          nh os switch "$@" "${flakeDir}#$HOSTNAME"
-        sudo ${lib.getExe pkgs.nixos-rebuild} switch --impure --flake ${flakeDir}#$HOSTNAME
+        '';
-      '');
+      };
+      nfsu = with pkgs; writeShellApplication {
+        name = "nfsu";
+        runtimeInputs = [ nfs pkgs.git ];
+        text = ''nfs --refresh "$@"'';
+      };
+    in
+    {
+      options.rebuild = {
+        flakeDir = lib.mkOption {
+          description = "Path to the flake directory.";
+          type = lib.types.str;
+          default = "/etc/nixos";
+        };
+      };
+
+      config = {
+        environment.systemPackages = with pkgs; [ nfs nfsu ];
+      };
+    };
+
+  flake.modules.homeManager.rebuild =
+    { config, pkgs, lib, ... }:
+    let
+      flakeDir = config.homeManagerFlakeDir;
+      hostnameCmd = "$(${lib.getExe pkgs.hostname} -s)";
+
+      flake-parts-check = with pkgs; writeShellApplication {
+        name = "flake-parts-check";
+        runtimeInputs = [ nix ];
+        text = ''
+          cd ${flakeDir}
+          nix run "${flakeDir}#write-flake"
+          nix flake check
+        '';
+      };
+
+      nhms = with pkgs; writeShellApplication {
+        name = "nhms";
+        runtimeInputs = [ coreutils hostname nh ];
+        text = ''
+          HOSTNAME=$(hostname -s)
+          echo "Switching to the $HOSTNAME home-manager profile"
+          nh home switch ${flakeDir} -c "$HOSTNAME" "$@"
+        '';
+      };
+
+      nhmu = with pkgs; writeShellApplication {
+        name = "nhmu";
+        runtimeInputs = [ nhms ];
+        text = ''nhms --update'';
+      };
+
+      test-build = with pkgs; writeShellApplication {
+        name = "test-build";
+        runtimeInputs = [ coreutils nix hostname ];
+        text = ''
+          if [ -z "$1" ]; then
+            HOSTNAME=$(hostname -s)
+          else
+            HOSTNAME="$1"
+          fi
+          echo "Testing the evaulation of the nixos config for $HOSTNAME"
+          nix eval "${flakeDir}#nixosConfigurations.$HOSTNAME.config.system.build.toplevel.drvPath"
+        '';
+      };
+
+      cleanup = with pkgs; writeShellApplication {
+        name = "cleanup";
+        runtimeInputs = [ coreutils home-manager nix ];
+        text = ''
+          set -e
+          DAYS=$1
+          if [ -z "$DAYS" ]; then
+            echo "usage: cleanup <days>"
+            exit 1
+          fi
+          home-manager expire-generations "-$DAYS days"
+          nix profile wipe-history --older-than "''${DAYS}d"
+          nix store gc
+          nix store optimise
+        '';
+      };
+
     in
     {
       options = {
@@ -25,57 +107,25 @@
           type = lib.types.str;
           default = "${config.xdg.configHome}/home-manager";
         };
-        buildHostname = lib.mkOption {
-          description = "Hostname for the NixOS configuration to use.";
-          type = lib.types.str;
-          default = hostnameCmd;
-        };
       };
 
       config = {
         home.activation.printFlakeDir = lib.hm.dag.entryAfter ["writeBoundary"] ''
-          run ${echoCmd} "Home Manager flake directory: ${flakeDir}"
+          run echo "Home Manager flake directory: ${flakeDir}"
         '';
 
         home.packages = with pkgs; [
           home-manager
-
+          (symlinkJoin {
-          #
+            name = "build-tools";
-          # Flake-Parts checks
+            paths = [
-          #
+              flake-parts-check
-          (writeShellScriptBin "flake-parts-check" ''
+              nhms
-            cd ${flakeDir}
+              nhmu
-            ${nixBin} run "${flakeDir}#write-flake"
+              test-build
-            ${nixBin} flake check
+              cleanup
-          '')
+            ];
-
+          })
-          #
-          # Home-Manager rebuilds
-          #
-          nhms
-          (writeShellScriptBin "nhmu" ''
-            ${nixBin} flake update --flake ${flakeDir}
-            ${lib.getExe nhms}
-          '')
-
-          #
-          # NixOS rebuilds
-          #
-          nfs
-          (writeShellScriptBin "nfsu" ''
-            ${nixBin} flake update --impure --flake ${flakeDir}
-            ${lib.getExe git} -C ${flakeDir} add ${flakeDir}/flake.lock > /dev/null 2>&1
-            ${lib.getExe nfs}
-          '')
-          (writeShellScriptBin "test-build" ''
-            if [ -z "$1" ]; then
-              HOSTNAME=${hostnameCmd}
-            else
-              HOSTNAME="$1"
-            fi
-            ${echoCmd} "Testing the evaulation of the nixos config for $HOSTNAME"
-            ${nixBin} eval ${flakeDir}#nixosConfigurations.$HOSTNAME.config.system.build.toplevel.drvPath
-          '')
         ];
       };
     };

modules/nix-tools/user.nix

@@ -1,41 +1,39 @@
 # Lifted from:
 # https://github.com/Doc-Steve/dendritic-design-with-flake-parts/blob/69edacdb5a4a6ca71d649bb8eb62cf8c630c8627/modules/users/bob%20%5BNDn%5D/bob.nix#L8
-{ self, ... }:
+{ self, inputs, ... }:
 {
-  config.flake.factory.user = username: isAdmin: {
+  config.flake.factory.user = {
+    username,
+    isAdmin ? false,
+    noPassword ? false,
+    # homeImports ? [ ],
+    # homePackages ? [ ],
+  }: {
     nixos."${username}" = { config, lib, pkgs, ... }: {
+      imports = [
+        inputs.home-manager.nixosModules.home-manager
+      ];
+
       users.users."${username}" = {
         isNormalUser = true;
         home = "/home/${username}";
         shell = lib.mkIf config.programs.zsh.enable pkgs.zsh;
-        extraGroups = [
+        extraGroups = [ "input" "networkmanager" ]
-          "input"
+        ++ lib.optional isAdmin "wheel"
-          "networkmanager"
+        ++ lib.optional config.virtualisation.docker.enable "docker"
-        ] ++ lib.optionals isAdmin [
+        ++ lib.optional (isAdmin && config.services.forgejo.enable) config.services.forgejo.group
-          "docker"
+        ++ lib.optional (isAdmin && config.services.postgresql.enable) "postgres";
-          "wheel"
-        ];
       };
 
-      # Removes password for sudo
+      security.sudo-rs.enable = lib.mkIf isAdmin true;
-      security.sudo-rs = lib.mkIf isAdmin {
-        enable = true;
-        extraRules = [{
-          users = [ "${username}" ];
-          commands = [{
-            command = "ALL";
-            options = [ "NOPASSWD" ];
-          }];
-        }];
-      };
 
+      home-manager.useGlobalPkgs = true;
       # https://github.com/Doc-Steve/dendritic-design-with-flake-parts/wiki/Dendritic_Aspects#multi-context-aspect
       home-manager.users."${username}" = {
+        imports = [ self.modules.homeManager."${username}" ];
         home.username = "${username}";
         home.homeDirectory = "/home/${username}";
-        imports = [
+        # home.packages = homePackages;
-          self.modules.homeManager."${username}"
-        ];
       };
     };
   };

modules/nix-tools/wrappers.nix

@@ -0,0 +1,12 @@
+{ self, inputs, ... }: {
+  flake-file.inputs = {
+    wrapper-modules = {
+      url = "github:BirdeeHub/nix-wrapper-modules";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    wrappers = {
+      url = "github:lassulus/wrappers";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+  };
+}

modules/nixos/login-text.nix

@@ -1,44 +1,56 @@
 { inputs, ... }: {
-  flake.modules.nixos.login-text = { config, ... }: {
+  flake.modules.nixos.login-text = { config, lib, ... }:
-    programs.rust-motd = {
+    let
-      enable = true;
+      defaultServiceStatus = {
-      refreshInterval = "*:0/5";
+        SSH = "sshd.socket";
-      order = [
+        "SSH Cert Renewal" = "step-ssh-host-renew.timer";
-        "global"
+      };
-        "last_login"
+    in {
-        "service_status"
+    options.loginText.extraServiceStatus = lib.mkOption {
-        # "uptime"
+      type = lib.types.attrsOf lib.types.str;
-        "memory"
+      default = { };
-        "filesystems"
+      description = "Additional rust-motd service status entries keyed by display name.";
-      ];
+    };
-      settings = {
-        global = {
-          time_format = "%Y-%m-%d %H:%M:%S %Z";
-        };
 
-        last_login = {
+    config = {
-          john = 3;
+      programs.rust-motd = {
-          root = 3;
+        enable = true;
-        };
+        refreshInterval = "*:0/5";
+        order = [
+          "global"
+          "last_login"
+          "service_status"
+          # "uptime"
+          "memory"
+          "filesystems"
+        ];
+        settings = {
+          global = {
+            time_format = "%Y-%m-%d %H:%M:%S %Z";
+          };
 
-        service_status = {
+          last_login = {
-          Docker = "docker";
+            john = 3;
-          SSH = "sshd.socket";
+            root = 3;
-          "SSH Cert Renewal" = "step-ssh-host-renew.timer";
+          };
-          "mTLS Renewal" = "mtls-renew.timer";
-        };
 
-        # This calculation is wrong for LXCs
+          service_status = lib.mkMerge [
-        # uptime = {
+            defaultServiceStatus
-        #   prefix = "Uptime";
+            config.loginText.extraServiceStatus
-        # };
+          ];
 
-        memory = {
+          # This calculation is wrong for LXCs
-          swap_pos = "beside";
+          # uptime = {
-        };
+          #   prefix = "Uptime";
+          # };
 
-        filesystems = {
+          memory = {
-          root = "/";
+            swap_pos = "beside";
+          };
+
+          filesystems = {
+            root = "/";
+          };
         };
       };
     };

modules/programs/eza.nix

@@ -1,14 +1,24 @@
-{ inputs, pkgs, lib, ... }:
+{ self, inputs, ... }:
 {
-  flake.modules.homeManager.eza = { pkgs, lib, ... }: {
+  flake.modules.homeManager.eza = { config, pkgs, lib, ... }: {
     programs.eza = {
       enable = true;
-      package = pkgs.eza;
       enableBashIntegration = true;
       enableZshIntegration = true;
-    };
+      git = true;
-    home.shellAliases = {
+      icons = "auto";
-      ls = "${lib.getExe pkgs.eza} -lgos type --no-time --follow-symlinks";
+      colors = "auto";
+      extraOptions = [
+        "--all"
+        "--long"
+        "--group-directories-first"
+        "--sort=type"
+        "--dereference"
+        "--octal-permissions"
+        "--smart-group"
+        "--no-time"
+        "--git"
+      ];
     };
   };
 }

modules/programs/files.nix

@@ -1,15 +1,25 @@
 {
-  flake.modules.homeManager.files = { pkgs, ... }:
+  flake.modules.homeManager.files = { pkgs, lib, ... }:
   {
-    programs.lf.enable = true;
+    programs.lf = {
-    programs.lf.cmdKeybindings = {
+      enable = true;
-      "D" = "delete";
+      cmdKeybindings = {
+        "D" = "delete";
+      };
+      settings = {
+        preview = true;
+        hidden = true;
+        drawbox = true;
+        icons = true;
+        ignorecase = true;
+      };
     };
 
     home.packages = with pkgs; [
       gdu
-      lf
+      # (writeShellScriptBin "lfcd" ''
-      # TODO: find a CLI file editor that's not insane
+      #   . <(${lib.getExe pkgs.lf} -print-last-dir | sed 's/^/cd /')
+      # '')
     ];
   };
 }

modules/programs/ghostty.nix

@@ -8,6 +8,17 @@
   };
 
   flake.modules.homeManager.ghostty = { config, pkgs, lib, ... }:
+  let
+    ghosttyPackage = pkgs.symlinkJoin {
+      name = "ghostty-x11";
+      paths = [ (config.lib.nixGL.wrap pkgs.ghostty) ];
+      nativeBuildInputs = [ pkgs.makeWrapper ];
+      meta.mainProgram = "ghostty";
+      postBuild = ''
+        wrapProgram $out/bin/ghostty --set GDK_BACKEND x11
+      '';
+    };
+  in
   {
     home.sessionVariables = {
       TERMINAL = "ghostty";
@@ -22,7 +33,7 @@
     programs.ghostty = {
       enable = true;
       enableZshIntegration = true;
-      package = config.lib.nixGL.wrap pkgs.ghostty;
+      package = ghosttyPackage;
       settings = {
         command = "TERM=xterm-256color ${lib.getExe pkgs.zsh}";
         font-size = 12;
@@ -32,6 +43,7 @@
         shell-integration = "zsh";
         shell-integration-features = [ "no-title" "sudo" ];
         gtk-single-instance = true;
+        mouse-scroll-multiplier = 0.375;
 
         window-position-x = 25;
         window-position-y = 25;
@@ -60,13 +72,12 @@
     # https://github.com/ghostty-org/ghostty/discussions/3763#discussioncomment-11699970
     xdg.desktopEntries."com.mitchellh.ghostty" =
     let
-      ghosttyCmd = "nixGLMesa ${lib.getExe pkgs.ghostty}";
+      ghosttyCmd = lib.getExe ghosttyPackage;
     in
     {
       name = "Ghostty";
       type = "Application";
       comment = "A terminal emulator";
-      # exec = "nixGLMesa ghostty";
       exec = ghosttyCmd;
       icon = "com.mitchellh.ghostty";
       terminal = false;
@@ -85,7 +96,6 @@
         new-window = {
           name = "New Window";
           exec = ghosttyCmd;
-          # exec = "nixGLMesa ghostty";
         };
       };
     };

modules/programs/neovim.nix

@@ -0,0 +1,158 @@
+{ self, inputs, ... }: {
+  flake-file.inputs = {
+    nvf = {
+      url = "github:notashelf/nvf";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+  };
+
+  perSystem = { system, pkgs, config, ... }: {
+    packages.my-neovim = ((inputs.nvf.lib.neovimConfiguration {
+      inherit pkgs;
+      modules = [
+        {
+          # https://nvf.notashelf.dev/search.html
+          config.vim = {
+            options = {
+              number = true;
+              relativenumber = true;
+              expandtab = true;
+              shiftwidth = 4;
+              tabstop = 4;
+              softtabstop = 4;
+
+              wrap = true;
+              linebreak = true;
+            };
+
+            syntaxHighlighting = true;
+
+            # Enable custom theming options
+            theme.enable = true;
+            theme.name = "catppuccin";
+            theme.style = "mocha";
+
+            git.enable = true;
+            # git.neogit.enable = true;
+
+            # https://github.com/akinsho/toggleterm.nvim
+            terminal.toggleterm.enable = true;
+            terminal.toggleterm.lazygit.enable = true;
+            terminal.toggleterm.lazygit.direction = "float";
+            terminal.toggleterm.lazygit.mappings.open = "<C-g>";
+
+
+            utility.nix-develop.enable = true;
+
+            utility.oil-nvim.enable = true;
+            utility.oil-nvim.gitStatus.enable = true;
+
+            filetree.neo-tree = {
+              enable = true;
+            };
+
+            # lazy = {
+            #   enable = true;
+            # };
+
+            # globals = {
+            #   SimpylFold_docstring_preview = 1;
+            #   SimpylFold_fold_blank = 0;
+            # };
+
+            # extraPlugins = with pkgs.vimPlugins; {
+            #   SimpylFold.package = SimpylFold;
+            # };
+
+            telescope = {
+              enable = true;
+              extensions  = [
+                {
+                  name = "fzf";
+                  packages = [pkgs.vimPlugins.telescope-fzf-native-nvim];
+                  setup = {fzf = {fuzzy = true;};};
+                }
+              ];
+            };
+
+            # Enable Treesitter
+            treesitter = {
+              enable = true;
+              grammars = with pkgs.vimPlugins.nvim-treesitter-parsers; [ python ];
+            };
+
+            lsp.enable = true;
+
+            languages = {
+              enableTreesitter = true;
+              enableFormat = true;
+
+              markdown = {
+                enable = true;
+                extensions = {
+                  # render-markdown-nvim.enable = true;
+                  markview-nvim.enable = true;
+                };
+              };
+
+              bash.enable = true;
+              css.enable = true;
+              yaml.enable = true;
+              toml.enable = true;
+
+              nix = {
+                enable = true;
+              };
+
+              python = {
+                enable = true;
+                dap.enable = true;
+                format.type = [ "ruff" ];
+              };
+            };
+
+            keymaps = [
+              {
+                desc = "Edit key mappings";
+                key = "<leader>ekm";
+                mode = [ "n" ];
+                silent = false;
+                action = "<cmd>:edit +/keymaps /home/john/.config/home-manager/jsl-dendritic/modules/programs/neovim.nix<CR>";
+              }
+              {
+                desc = "Home Manager Switch";
+                key = "<leader>nhms";
+                mode = [ "n" ];
+                silent = false;
+                action = "<cmd>:TermExec cmd='clear && nhms && exit' name='Nix Home Manager Switch' direction=float<CR>";
+              }
+              {
+                desc = "Key Maps [Telescope]";
+                key = "<leader>fkm";
+                mode = "n";
+                silent = false;
+                action = "<cmd>:Telescope keymaps<CR>";
+              }
+              {
+                desc = "Toggle Filesystem Tree [NeoTree]";
+                key = "<C-b>";
+                mode = [ "n" "v" "t" ];
+                silent = false;
+                action = "<cmd>:Neotree toggle filesystem left action=show<CR>";
+              }
+              {
+                key = "<C-`>";
+                mode = ["n" "v" "t"];
+                silent = false;
+                action = "<cmd>:ToggleTerm<CR>";
+              } 
+            ];
+          };
+        }
+      ];
+    }).neovim).overrideAttrs (old: {
+      pname = "my-neovim";
+      version = "custom";
+    });
+  };
+}

modules/programs/niri.nix

@@ -1,9 +1,4 @@
 { self, inputs, ... }: {
-  flake-file.inputs = {
-    wrapper-modules.url = "github:BirdeeHub/nix-wrapper-modules";
-    # wrapper-modules.inputs.nixpkgs.follows = "nixpkgs";
-  };
-
   flake.modules.nixos.niri = { pkgs, lib, ... }: {
     programs.niri = {
       enable = true;

modules/programs/onepassword.nix

@@ -1,16 +1,10 @@
 { self, inputs, ... }: {
-  flake.modules.homeManager.onepassword = { config, pkgs, lib, ... }: {
+  flake.modules.homeManager.onepassword = { config, ... }: {
     home.file.".config/1Password/ssh/agent.toml".text = ''
       # https://developer.1password.com/docs/ssh/agent/config
       [[ssh-keys]]
       vault = "Private"
     '';
-    programs.ssh = {
+    programs.ssh.matchBlocks."*".identityAgent = "${config.home.homeDirectory}/.1password/agent.sock";
-      enable = true;
-      extraConfig = ''
-        Host *
-            IdentityAgent ${config.home.homeDirectory}/.1password/agent.sock
-      '';
-    };
   };
 }

modules/programs/sops.nix

@@ -64,8 +64,8 @@ in
         (writeShellScriptBin "gen-age-key" ''
           set -eu
 
-          if [ ! -f "${config.ssh.IdentityFile}" ]; then
+          if [ ! -f "${config.ssh.identityFile}" ]; then
-            ${echo} "SSH identity file not found: ${config.ssh.IdentityFile}" >&2
+            ${echo} "SSH identity file not found: ${config.ssh.identityFile}" >&2
             exit 1
           fi
 
@@ -75,7 +75,7 @@ in
           fi
 
           ${mkdir} -p "$(${dirname} "${cfg.ageKeyFile}")"
-          ${lib.getExe pkgs.ssh-to-age} -i ${config.ssh.IdentityFile} -private-key > ${cfg.ageKeyFile}
+          ${lib.getExe pkgs.ssh-to-age} -i ${config.ssh.identityFile} -private-key > ${cfg.ageKeyFile}
           ${echo} -n "Created ${cfg.ageKeyFile}: "
           ${echo} $(${lib.getExe show-age-key})
         '')
@@ -90,7 +90,7 @@ in
       sops = {
         defaultSopsFile = sopsSecretsPath;
         defaultSopsFormat = "yaml";
-        age.sshKeyPaths = [ "${config.ssh.IdentityFile}" ];
+        age.sshKeyPaths = [ "${config.ssh.identityFile}" ];
       };
     };
   };

modules/programs/step-client.nix

@@ -29,7 +29,7 @@
           ${principalArgs} \
           --provisioner "${cfg.provisioner}" \
           --provisioner-password-file "${config.sops.secrets."janus/admin_jwk".path}" \
-          "${firstPrincipal}" "${config.ssh.IdentityFile}.pub"
+          "${firstPrincipal}" "${config.ssh.identityFile}.pub"
         '')
       ];
     };

modules/programs/zsh.nix

@@ -1,4 +1,4 @@
-{ inputs, ... }:
+{ self, inputs, ... }:
 let
   username = "john";
 in
@@ -50,5 +50,139 @@ in
       };
     };
   };
-  
+
+  perSystem = { system, pkgs, ... }: {
+    packages.jsl-zsh = inputs.wrapper-modules.wrappers.zsh.wrap {
+      inherit pkgs;
+      extraPackages = with pkgs; [
+        inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.neovim-min
+        btop
+        coreutils
+        curl
+        wget
+        yazi
+        zsh
+      ];
+    };
+
+    packages.neovim-min = ((inputs.nvf.lib.neovimConfiguration {
+      inherit pkgs;
+      modules = [
+        {
+          # https://nvf.notashelf.dev/search.html
+          config.vim = {
+            options = {
+              number = true;
+              relativenumber = true;
+              expandtab = true;
+              shiftwidth = 4;
+              tabstop = 4;
+              softtabstop = 4;
+
+              wrap = true;
+              linebreak = true;
+            };
+
+            syntaxHighlighting = true;
+
+            # Enable custom theming options
+            theme.enable = true;
+            theme.name = "catppuccin";
+            theme.style = "mocha";
+
+            git.enable = true;
+            # git.neogit.enable = true;
+            extraPlugins = with pkgs.vimPlugins; {
+              icons = {
+                package = nvim-web-devicons;
+              };
+              octo = {
+                package = octo-nvim;
+                setup = "require('octo').setup {}";
+                after = ["telescope" "icons"];
+              };
+            };
+
+            # https://github.com/akinsho/toggleterm.nvim
+            terminal.toggleterm.enable = true;
+            terminal.toggleterm.lazygit.enable = true;
+            terminal.toggleterm.lazygit.direction = "float";
+            terminal.toggleterm.lazygit.mappings.open = "<C-g>";
+
+            utility.nix-develop.enable = true;
+
+            filetree.neo-tree.enable = true;
+
+            telescope = {
+              enable = true;
+              extensions  = [
+                {
+                  name = "fzf";
+                  packages = [pkgs.vimPlugins.telescope-fzf-native-nvim];
+                  setup = {fzf = {fuzzy = true;};};
+                }
+              ];
+            };
+
+            languages = {
+              enableTreesitter = true;
+              enableFormat = true;
+
+              markdown = {
+                enable = true;
+                extensions = {
+                  markview-nvim.enable = true;
+                };
+              };
+
+              bash.enable = true;
+              yaml.enable = true;
+              toml.enable = true;
+              nix.enable = true;
+            };
+
+            keymaps = [
+              {
+                desc = "Edit key mappings";
+                key = "<leader>ekm";
+                mode = [ "n" ];
+                silent = false;
+                action = "<cmd>:edit +/keymaps /home/john/.config/home-manager/jsl-dendritic/modules/programs/neovim.nix<CR>";
+              }
+              {
+                desc = "Home Manager Switch";
+                key = "<leader>nhms";
+                mode = [ "n" ];
+                silent = false;
+                action = "<cmd>:TermExec cmd='clear && nhms && exit' name='Nix Home Manager Switch' direction=float<CR>";
+              }
+              {
+                desc = "Key Maps [Telescope]";
+                key = "<leader>fkm";
+                mode = "n";
+                silent = false;
+                action = "<cmd>:Telescope keymaps<CR>";
+              }
+              {
+                desc = "Toggle Filesystem Tree [NeoTree]";
+                key = "<C-b>";
+                mode = [ "n" "v" "t" ];
+                silent = false;
+                action = "<cmd>:Neotree toggle filesystem left action=show<CR>";
+              }
+              {
+                key = "<C-`>";
+                mode = ["n" "v" "t"];
+                silent = false;
+                action = "<cmd>:ToggleTerm<CR>";
+              } 
+            ];
+          };
+        }
+      ];
+    }).neovim).overrideAttrs (old: {
+      pname = "neovim-min";
+      version = "custom";
+    });
+  };
 }

modules/services/docker.nix

@@ -1,20 +1,13 @@
-{ inputs, ... }:
+{ self, inputs, ... }:
 {
   flake.modules.nixos.docker = {
-    virtualisation.docker = {
+    virtualisation.docker.enable = true;
-      enable = true;
+    home-manager.sharedModules = [ inputs.self.modules.homeManager.docker ];
-    };
-    home-manager.sharedModules = with inputs.self.modules.homeManager; [
-      docker
-    ];
   };
 
   flake.modules.homeManager.docker = { config, lib, pkgs, ... }:
   {
-    options.docker = {
+    options.docker.enable = lib.mkEnableOption "Docker tools and utilities";
-      enable = lib.mkEnableOption "Docker tools and utilities";
-    };
-
     config = lib.mkIf config.docker.enable {
       programs.lazydocker.enable = true;
       programs.docker-cli.enable = true;

modules/services/ssh.nix

@@ -1,22 +1,32 @@
-{inputs, ... }:
+{ inputs, ... }:
 let
   userName = "john";
   sshHostCAPubKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBNug18oLH0vZxnibXJzMJvTWFPZTnSlhCDDVi+rHhgnIum6ZXQ4SF+VHOOAM5BbzZmMKitNJ5lcrGP15Eur7DzQ=";
 in
 {
-  flake.modules.nixos.ssh = { pkgs, config, lib, ... }:
+  flake.modules.nixos.ssh = { config, pkgs, lib, ... }:
   let
     cfg = config.ssh;
-    userCAPath = "ssh/ssh_user_ca.pub";
+    configDir = "/etc/ssh";
-    hostKeyFile = "ssh/ssh_host_ed25519_key";
   in
   {
     options.ssh = {
+      hostKey = lib.mkOption {
+        description = "String path to the host private key file";
+        type = lib.types.str;
+        default = "ssh_host_ed25519_key";
+      };
       certificates = {
         enable = lib.mkEnableOption "Enable SSH host certificates";
         userCA = lib.mkOption {
+          description = "Content for the SSH user CA file (public key)";
           type = lib.types.path;
-          default = ../../keys/ssh_user_ca.pub;
+          default = ../hosts/janus/ssh_user_ca.pub;
+        };
+        userCAFile = lib.mkOption {
+          description = "String path to the SSh user CA";
+          type = lib.types.str;
+          default = "ssh_user_ca.pub";
         };
       };
     };
@@ -29,16 +39,16 @@ in
           {
             PasswordAuthentication = false;
             KbdInteractiveAuthentication = false;
-            HostKey = "/etc/${hostKeyFile}";
+            HostKey = "${configDir}/${cfg.hostKey}";
           }
           (lib.mkIf cfg.certificates.enable {
-            TrustedUserCAKeys = "/etc/${userCAPath}";
+            TrustedUserCAKeys = "${configDir}/${cfg.certificates.userCAFile}";
-            HostCertificate = "/etc/${hostKeyFile}-cert.pub";
+            HostCertificate = "${configDir}/${cfg.hostKey}-cert.pub";
           })
         ];
       };
 
-      environment.etc."${userCAPath}" = lib.mkIf cfg.certificates.enable {
+      environment.etc."ssh/${cfg.certificates.userCAFile}" = lib.mkIf cfg.certificates.enable {
         source = cfg.certificates.userCA;
       };
 
@@ -55,52 +65,56 @@ in
     };
   };
 
-  flake.modules.homeManager.ssh = { pkgs, config, lib, ... }:
+  flake.modules.homeManager.ssh = { config, pkgs, lib, ... }:
+  let
+    cfg = config.ssh;
+    configDir = "${config.home.homeDirectory}/.ssh";
+    identityFile = cfg.identityFile;
+    publicKeyFile = "${identityFile}.pub";
+    certificateFile = "${identityFile}-cert.pub";
+  in
   {
-    options.ssh = {
+    options.ssh = with lib; {
-      IdentityFile = lib.mkOption {
+      identityFile = mkOption {
         # Intentionally not using a path type here because that will end up with the private key getting copied into the store
-        type = lib.types.str;
+        type = types.str;
         default = "${config.home.homeDirectory}/.ssh/id_ed25519";
         description = "Path to the SSH identity file.";
       };
 
       certificates = {
-        enable = lib.mkEnableOption "Enable SSH user certificates";
+        enable = mkEnableOption "Enable SSH client certificates";
-        # sshCertProvisioner = lib.mkOption {
-        #   type = lib.types.str;
-        #   default = "admin";
-        # };
       };
 
-      knownHostsFile = lib.mkOption {
+      knownHostsFile = mkOption {
-        type = lib.types.str;
+        type = types.str;
-        default = "${config.home.homeDirectory}/.ssh/known_hosts";
+        default = "${configDir}/known_hosts";
+      };
+
+      knownHosts = mkOption {
+        description = "";
+        type = types.listOf types.str;
+        default = [ ];
       };
 
       matchSets = {
-        appdaemon = lib.mkEnableOption "Enable AppDaemon SSH targets";
+        appdaemon = mkEnableOption "Enable AppDaemon SSH targets";
-        certs = lib.mkEnableOption "Enable Janus and Soteria SSH targets";
+        certs = mkEnableOption "Enable Janus and Soteria SSH targets";
-        homelab = lib.mkEnableOption "Enable various Homelab targets";
+        homelab = mkEnableOption "Enable various Homelab targets";
-        dev = lib.mkEnableOption "Enable development targets";
+        dev = mkEnableOption "Enable development targets";
       };
     };
 
     # All this stuff has to be wrapped in a config attribute because of the presence of the options here?
     config = let
-      cfg = config.ssh;
-      identityFile = cfg.IdentityFile;
-      publicKeyFile = "${identityFile}.pub";
-      certificateFile = "${identityFile}-cert.pub";
       provisionerPasswordPath = config.sops.secrets."janus/admin_jwk".path;
     in {
       home.file.".ssh/known_hosts" = {
         text = lib.concatStringsSep "\n" (
-          [
+          cfg.knownHosts ++ lib.optionals cfg.certificates.enable [
-            "fded:fb16:653e:25da:be24:11ff:fea0:753f ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ9ZqiWPrCwHjxFCiu0lT4rlQs7KyMapxKJQQ5PJP1eh"
+            "@cert-authority 192.168.1.* ${sshHostCAPubKey}"
+            "@cert-authority *.john-stream.com ${sshHostCAPubKey}"
           ]
-          ++ (lib.optional cfg.certificates.enable "@cert-authority 192.168.1.* ${sshHostCAPubKey}")
-          ++ (lib.optional cfg.certificates.enable "@cert-authority *.john-stream.com ${sshHostCAPubKey}")
         );
       };
 
@@ -109,27 +123,33 @@ in
         enableDefaultConfig = false;
         extraConfig = ''
           SetEnv TERM="xterm-256color"
-          IdentityAgent ~/.1password/agent.sock
         '';
 
         matchBlocks = lib.mkMerge [
           {
-            "*" = {
+            "john-pc-ubuntu" = {
-              user = "john";
+              hostname = "192.168.1.85";
-
-              compression = false;
-              serverAliveInterval = 0;
-              serverAliveCountMax = 3;
-
-              identitiesOnly = true;
-              inherit identityFile certificateFile;
-
-              hashKnownHosts = false;
-              userKnownHostsFile = cfg.knownHostsFile;
-
-              addKeysToAgent = "yes";
-              forwardAgent = false;
             };
+
+            "*" = lib.mkMerge [
+              {
+                user = "john";
+
+                compression = false;
+                serverAliveInterval = 0;
+                serverAliveCountMax = 3;
+
+                identitiesOnly = true;
+                inherit identityFile;
+
+                hashKnownHosts = false;
+                userKnownHostsFile = cfg.knownHostsFile;
+
+                addKeysToAgent = "yes";
+                forwardAgent = false;
+              }
+              (lib.mkIf cfg.certificates.enable { inherit certificateFile; })
+            ];
           }
           (lib.mkIf cfg.matchSets.appdaemon {
             "appdaemon" = {
@@ -173,7 +193,6 @@ in
             "test-nix" = {
               hostname = "fded:fb16:653e:25da:be24:11ff:fea0:753f";
               user = "john";
-              identityFile = identityFile;
             };
           })
         ];

modules/services/step-ca/ssh-host.nix

@@ -33,7 +33,7 @@
       networking.nameservers = [ "192.168.1.150" ];
       networking.dhcpcd.extraConfig = "nohook resolv.conf";
       environment.systemPackages = with pkgs; [
-        step-cli
+        # step-cli
         (writeShellScriptBin "ssh-host-cert-renew" ''
           ${lib.getExe pkgs.step-cli} ssh certificate \
           --host --sign \
@@ -51,7 +51,7 @@
         wantedBy = [ ];
         after = [ "network-online.target" ];
         wants = [ "network-online.target" ];
-        path = [ pkgs.step-cli pkgs.openssh pkgs.coreutils pkgs.systemd ];
+        path = with pkgs; [ coreutils systemd step-cli openssh  ];
         serviceConfig = {
           Type = "oneshot";
           User = "root";

modules/services/step-ca/step-ca.nix

@@ -17,6 +17,9 @@ in
         crt = "";
       };
     };
-    environment.systemPackages = with pkgs; [ step-ca step-cli ];
+    environment.systemPackages = with pkgs; [
+      step-ca
+      step-cli
+    ];
   };
 }

modules/users/john.nix

@@ -1,4 +1,4 @@
-{ inputs, ... }:
+{ self, inputs, lib, ... }:
 let
   username = "john";
 in
@@ -16,28 +16,33 @@ in
     ];
   };
 
-  flake.modules.nixos."${username}" = {
+  flake.modules = lib.mkMerge [
-    imports = [
+    (self.factory.user {
-      inputs.home-manager.nixosModules.home-manager
+      username = username;
-      (inputs.self.factory.user username true).nixos."${username}"
+      isAdmin = true;
-    ];
+    })
-    users.users."${username}" = {
+    {
-      openssh.authorizedKeys.keys = inputs.self.meta.users."${username}".authorizedKeys;
+      nixos."${username}" = {
-      extraGroups = [ "docker" ];
+        imports = [
-    };
+          inputs.home-manager.nixosModules.home-manager
-  };
+        ];
+        users.users."${username}" = {
+          openssh.authorizedKeys.keys = inputs.self.meta.users."${username}".authorizedKeys;
+        };
+      };
 
-  flake.modules.homeManager."${username}" = with inputs.self.meta.users."${username}"; {
+      # This module will be imported by the user factory
-    home.stateVersion = "25.11";
+      homeManager."${username}" = with inputs.self.meta.users."${username}"; {
-    xdg.enable = true;
+        home.stateVersion = "25.11";
-
+        xdg.enable = true;
-    programs.git.settings.user.name = name;
+        programs.git.settings.user.name = name;
-    programs.git.settings.user.email = email;
+        programs.git.settings.user.email = email;
-
+        imports = with inputs.self.modules.homeManager; [
-    imports = with inputs.self.modules.homeManager; [
+          ssh
-      ssh
+          shell-tools
-      shell-tools
+          git
-      git
+        ];
-    ];
+      };
-  };
+    }
+  ];
 }