nhms switch keymap

2026-04-01 22:00:21 -05:00
32 changed files with 707 additions and 1397 deletions
@@ -18,11 +18,11 @@
    },
    "flake-file": {
      "locked": {
-        "lastModified": 1776202746,
-        "narHash": "sha256-RZVtJefKKy3Z2UvKWSbtRF3cUxt/2fHga2adN6MZQ1U=",
+        "lastModified": 1774886516,
+        "narHash": "sha256-w2LoQVM6DXrSdGUZBZqa1nYkMzHoB0t82DrptzZKhTs=",
        "owner": "vic",
        "repo": "flake-file",
-        "rev": "7d16dfaeb912d5efdff0d0eda2aabc0c934168dd",
+        "rev": "3daadf37de2bb85b0ff34e2a7ab0d71e077c2b9e",
        "type": "github"
      },
      "original": {
@@ -95,11 +95,11 @@
        "nixpkgs": "nixpkgs"
      },
      "locked": {
-        "lastModified": 1776562531,
-        "narHash": "sha256-Lh5Ns9DI67E+lSMOCGK0S+mFPy0mz0yOGiJTUXiR9JI=",
+        "lastModified": 1775080052,
+        "narHash": "sha256-jAB4ZZbx8ECu9GcE/PUUwT+wpooZ0Ssmn2imB8PVTdM=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "5b56ad02dc643808b8af6d5f3ff179e2ce9593f4",
+        "rev": "6267895e9898399f0ce2fe79b645e9ee4858aaff",
        "type": "github"
      },
      "original": {
@@ -184,11 +184,11 @@
    "nixos-hardware": {
      "flake": false,
      "locked": {
-        "lastModified": 1775490113,
-        "narHash": "sha256-2ZBhDNZZwYkRmefK5XLOusCJHnoeKkoN95hoSGgMxWM=",
+        "lastModified": 1774933469,
+        "narHash": "sha256-OrnCQeUO2bqaWUl0lkDWyGWjKsOhtCyd7JSfTedQNUE=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "c775c2772ba56e906cbeb4e0b2db19079ef11ff7",
+        "rev": "f4c4c2c0c923d7811ac2a63ccc154767e4195337",
        "type": "github"
      },
      "original": {
@@ -199,11 +199,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1775423009,
-        "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=",
+        "lastModified": 1774709303,
+        "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9",
+        "rev": "8110df5ad7abf5d4c0f6fb0f8f978390e77f9685",
        "type": "github"
      },
      "original": {
@@ -215,17 +215,33 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1776329215,
-        "narHash": "sha256-mBqzkn7oJti2hqeO8iTbDxKw+1ifxpP53feQ0CEXies=",
-        "rev": "b86751bc4085f48661017fa226dee99fab6c651b",
+        "lastModified": 1775064974,
+        "narHash": "sha256-PqhsO5qloSyvATi9qAIrgUcEFK67xSoacjacPw+t4H0=",
+        "rev": "6ebfbc38bdc6b22822a6f991f2d922306f33cfbc",
        "type": "tarball",
-        "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre981196.b86751bc4085/nixexprs.tar.xz"
+        "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre973084.6ebfbc38bdc6/nixexprs.tar.xz"
      },
      "original": {
        "type": "tarball",
        "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"
      }
    },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1774610258,
+        "narHash": "sha256-HaThtroVD9wRdx7KQk0B75JmFcXlMUoEdDFNOMOlsOs=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "832efc09b4caf6b4569fbf9dc01bec3082a00611",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
    "nvf": {
      "inputs": {
        "flake-compat": "flake-compat",
@@ -238,11 +254,11 @@
        "systems": "systems_2"
      },
      "locked": {
-        "lastModified": 1776608870,
-        "narHash": "sha256-lBKrueFu15TdmtMF6GsiSVCifwdrUBYFoa3+zZjYTFM=",
+        "lastModified": 1774852850,
+        "narHash": "sha256-7VK4v7ZbQw5apfgc+FvgRi8BUC45ERlcp8VTTTQ3tko=",
        "owner": "notashelf",
        "repo": "nvf",
-        "rev": "d9ba7f0a9ed6c016dc9e526cc606d1a2f7898cd4",
+        "rev": "b4d6539e7e9948aaba5efd7a67a63672d1fa80ef",
        "type": "github"
      },
      "original": {
@@ -276,11 +292,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1776119890,
-        "narHash": "sha256-Zm6bxLNnEOYuS/SzrAGsYuXSwk3cbkRQZY0fJnk8a5M=",
+        "lastModified": 1774910634,
+        "narHash": "sha256-B+rZDPyktGEjOMt8PcHKYmgmKoF+GaNAFJhguktXAo0=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "d4971dd58c6627bfee52a1ad4237637c0a2fb0cd",
+        "rev": "19bf3d8678fbbfbc173beaa0b5b37d37938db301",
        "type": "github"
      },
      "original": {
@@ -321,16 +337,14 @@
    },
    "wrapper-modules": {
      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
+        "nixpkgs": "nixpkgs_3"
      },
      "locked": {
-        "lastModified": 1776464146,
-        "narHash": "sha256-XwLFfJDz71vIF7BAhnbLhrzQjmDC2uXdo7N0oHUrYzA=",
+        "lastModified": 1774879171,
+        "narHash": "sha256-a6JZDuBIwQmuEwYM4dziH+WyrpE8HCP8F7JFIn3CNvw=",
        "owner": "BirdeeHub",
        "repo": "nix-wrapper-modules",
-        "rev": "75febede14a0845f4ef429da692a0698bf433600",
+        "rev": "bab35ffae25cf6f4e4fdb3c2f7f0ac80966ce737",
        "type": "github"
      },
      "original": {
@@ -346,11 +360,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1776505856,
-        "narHash": "sha256-VbnOijrn4EdYYJwiNQFxQNXECKBa60U66UPxUQAGkBE=",
+        "lastModified": 1774293387,
+        "narHash": "sha256-yVekLWxKTUfUyuvo9HVihtOK8llIP3IZCrJmftxT+Nc=",
        "owner": "lassulus",
        "repo": "wrappers",
-        "rev": "738d4bf81cbf306f6917c540a5b798110e3cf1e8",
+        "rev": "3cf1e8371129e8746d37c863c5d56a81fb16caa0",
        "type": "github"
      },
      "original": {
@@ -29,10 +29,7 @@
      url = "github:Mic92/sops-nix";
      inputs.nixpkgs.follows = "nixpkgs";
    };
-    wrapper-modules = {
-      url = "github:BirdeeHub/nix-wrapper-modules";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    wrapper-modules.url = "github:BirdeeHub/nix-wrapper-modules";
    wrappers = {
      url = "github:lassulus/wrappers";
      inputs.nixpkgs.follows = "nixpkgs";
@@ -10,6 +10,7 @@
    home.packages = with pkgs; [
      mangohud
      sublime4
+      proton-vpn
    ];
  };
 }
@@ -2,14 +2,10 @@
  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;
@@ -29,119 +25,40 @@
      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 = {
+        services.forgejo = {
          enable = true;
          lfs.enable = true;
-            database.type = "postgres";
-            settings = {
-              DEFAULT = {
-                RUN_MODE = "dev";
-              };
-              server = lib.mkMerge [
+          settings.server = lib.mkMerge [
            {
              HTTP_PORT = cfg.port;
              DISABLE_SSH = true;
-                  ROOT_URL = cfg.root_url;
            }
            (lib.mkIf cfg.https {
+              ROOT_URL = "https://forgejo.john-stream.com";
              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;
+
+          database = {
+            type = "postgres";
+            port = config.services.postgresql.settings.port;
+            # createDatabase = false;
          };
+          # dump = {
+          #   enable = true;
+          #   interval = "12h";
+          # };
        };

-            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 = {
+        services.postgresql = {
          enable = true;
-              type = "tar";
-              interval = "*-*-* 00/12:00:00";
-            };
-          };
+          settings = {

-          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
-            '')
-          ];
      };
    };
 }
@@ -48,7 +48,7 @@ let
      enable = lib.mkOption {
        description = "Enable automatic mTLS certificate renewal using a systemd timer.";
        type = lib.types.bool;
-        default = cfg.enable;
+        default = true;
      };
      onCalendar = lib.mkOption {
        description = "systemd OnCalendar schedule for mTLS certificate renewal checks.";
@@ -66,9 +66,9 @@ let
        default = "root";
      };
      group = lib.mkOption {
-        description = "Group to run the mTLS renewal service as. Defaults to the configured renewal user.";
+        description = "Group to run the mTLS renewal service as. Defaults to the configured renewal user when null.";
        type = lib.types.nullOr lib.types.str;
-        default = "mtls";
+        default = null;
      };
      reloadUnits = lib.mkOption {
        description = "systemd units to try-reload-or-restart after a successful certificate renewal.";
@@ -92,27 +92,161 @@ let
    keyFile,
    bundleFile,
    lifetime,
-    user,
-    group,
  }:
  let
+    stepCmd = lib.getExe pkgs.step-cli;
    sanArgs = lib.concatMapStringsSep " " (s: "--san \"${s}\"") san;
  in
-    pkgs.writeShellApplication {
-      name = "mtls-generate";
-      runtimeInputs = with pkgs; [ coreutils step-cli ];
-      text = ''
+    pkgs.writeShellScriptBin "mtls-generate" ''
      set -euo pipefail
-        step ca certificate ${subject} ${certFile} ${keyFile} \
-          --provisioner ${provisioner} \
+      ${stepCmd} ca certificate \
+        ${subject} ${certFile} ${keyFile} \
        --not-before=-5m --not-after=${lifetime} \
+        --provisioner ${provisioner} \
        ${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}
+      cat ${certFile} ${keyFile} > ${bundleFile}
    '';
+  
+  mkMtlsCheckScript = { pkgs, bundleFile }: pkgs.writeShellScriptBin "mtls-check" ''
+    ${lib.getExe pkgs.openssl} x509 \
+    -noout -subject -issuer \
+    -ext subjectAltName,extendedKeyUsage \
+    -enddate -in ${bundleFile}
+  '';
+
+  mkMtlsRenewScript = {
+    pkgs,
+    certFile,
+    keyFile,
+    bundleFile,
+    reloadUnits ? [ ],
+    postCommands ? [ ],
+    systemctlArgs ? [ ],
+  }:
+  let
+    echoCmd = lib.getExe' pkgs.coreutils "echo";
+    systemctl = lib.getExe' pkgs.systemd "systemctl";
+    escapedArgs = lib.escapeShellArgs systemctlArgs;
+    systemctlCommand = "${systemctl} ${escapedArgs}";
+    renewReloadScript = lib.concatMapStringsSep "\n" (unit: ''
+      if ${systemctlCommand} --quiet is-active "${unit}"; then
+        ${systemctlCommand} try-reload-or-restart "${unit}"
+      fi
+    '') reloadUnits;
+    renewPostCommands = lib.concatStringsSep "\n" postCommands;
+  in
+    pkgs.writeShellScriptBin "mtls-renew" ''
+      set -euo pipefail
+
+      if ${lib.getExe pkgs.step-cli} certificate needs-renewal "${certFile}"; then
+        ${echoCmd} "Renewing mTLS certificate"
+      else
+        ${echoCmd} "Skipping renew"
+        exit "$?"
+      fi
+
+      ${lib.getExe pkgs.step-cli} ca renew --force "${certFile}" "${keyFile}"
+
+      umask 077
+      ${lib.getExe' pkgs.coreutils "cat"} "${certFile}" "${keyFile}" > "${bundleFile}"
+
+      ${echoCmd} "Reloading units:"
+      ${renewReloadScript}
+
+      ${echoCmd} "Post commands:"
+      ${renewPostCommands}
+    '';
+
+  mkNixosMtlsRenewService = {
+    pkgs,
+    certFile,
+    keyFile,
+    bundleFile,
+    reloadUnits ? [ ],
+    postCommands ? [ ],
+    user ? "root",
+    group ? null,
+  }:
+  let
+    serviceGroup = if group == null then user else group;
+    renewScript = mkMtlsRenewScript {
+      inherit pkgs certFile keyFile bundleFile reloadUnits postCommands;
+    };
+  in
+  {
+    description = "Renew the mTLS certificate when Smallstep marks it ready";
+    wantedBy = [ ];
+    after = [ "network-online.target" ];
+    wants = [ "network-online.target" ];
+    serviceConfig = {
+      Type = "oneshot";
+      User = user;
+      Group = serviceGroup;
+      ExecStart = lib.getExe renewScript;
+    };
+  };
+
+  mkNixosMtlsRenewTimer = {
+    onCalendar,
+    randomizedDelaySec,
+    unit ? "mtls-renew.service",
+  }: {
+    description = "Periodic Smallstep renewal for the mTLS certificate";
+    wantedBy = [ "timers.target" ];
+    timerConfig = {
+      Persistent = true;
+      OnCalendar = onCalendar;
+      AccuracySec = "1us";
+      RandomizedDelaySec = randomizedDelaySec;
+      Unit = unit;
+    };
+  };
+
+  mkHomeManagerMtlsRenewService = {
+    pkgs,
+    certFile,
+    keyFile,
+    bundleFile,
+    reloadUnits ? [ ],
+    postCommands ? [ ],
+  }:
+  let
+    renewScript = mkMtlsRenewScript {
+      inherit pkgs certFile keyFile bundleFile reloadUnits postCommands;
+      systemctlArgs = [ "--user" ];
+    };
+  in
+  {
+    Unit = {
+      Description = "Renew the mTLS certificate when Smallstep marks it ready";
+      After = [ "network-online.target" ];
+      Wants = [ "network-online.target" ];
+    };
+    Service = {
+      Type = "oneshot";
+      ExecStart = lib.getExe renewScript;
+    };
+  };
+
+  mkHomeManagerMtlsRenewTimer = {
+    onCalendar,
+    randomizedDelaySec,
+    unit ? "mtls-renew.service",
+  }: {
+    Unit = {
+      Description = "Periodic Smallstep renewal for the mTLS certificate";
+    };
+    Timer = {
+      Persistent = true;
+      OnCalendar = onCalendar;
+      AccuracySec = "1us";
+      RandomizedDelaySec = randomizedDelaySec;
+      Unit = unit;
+    };
+    Install = {
+      WantedBy = [ "timers.target" ];
+    };
  };

 in
@@ -120,23 +254,7 @@ in
  flake.modules.nixos.mtls = { config, lib, pkgs, ... }:
    let
      cfg = config.mtls;
-      mtlsRenewWrapper = inputs.self.wrappers.mtlsRenew.apply {
-        inherit pkgs;
-        inherit (cfg) certDir keyFile certFile bundleFile;
-        inherit (cfg.renew) user group reloadUnits postCommands;
-        systemd = {
-          description = "Renew the mTLS certificate when Smallstep marks it ready";
-          after = [ "network-online.target" ];
-          wants = [ "network-online.target" ];
-          serviceConfig = {
-            Type = "oneshot";
-            User = cfg.renew.user;
-            Group = cfg.renew.group;
-          };
-        } // lib.optionalAttrs cfg.renew.enable {
-          startAt = cfg.renew.onCalendar;
-        };
-      };
+      sanArgs = lib.concatMapStringsSep " " (san: "--san \"${san}\"") cfg.san;
    in
    {
      options.mtls = (mkOpts config) // {
@@ -145,64 +263,42 @@ in
          type = lib.types.str;
          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
          (mkMtlsGenerateScript {
            inherit pkgs;
            inherit (cfg) subject provisioner san certFile keyFile bundleFile lifetime;
-            inherit (cfg.renew) user group;
          })
-          (inputs.self.wrappers.mtlsCheck.apply {
-            inherit pkgs;
-            inherit (cfg) bundleFile;
-          }).wrapper
-          mtlsRenewWrapper.wrapper
+          (mkMtlsCheckScript { inherit pkgs; inherit (cfg) bundleFile; })
+          (mkMtlsRenewScript { inherit pkgs; inherit (cfg) certFile keyFile bundleFile; })
        ];

        systemd.tmpfiles.rules = [
-          "d ${cfg.certDir} 0750 ${cfg.renew.user} ${cfg.renew.group} -"
+          "d ${cfg.certDir} 0750 ${cfg.renew.user} ${if cfg.renew.group == null then cfg.renew.user else cfg.renew.group} -"
        ];

-        systemd.packages = lib.mkIf cfg.renew.enable [
-          mtlsRenewWrapper.outputs.systemd-system
-        ];
+        systemd.services.mtls-renew = lib.mkIf cfg.renew.enable (mkNixosMtlsRenewService {
+          inherit pkgs;
+          inherit (cfg) certFile keyFile bundleFile;
+          inherit (cfg.renew) reloadUnits postCommands user group;
+        });

-        systemd.timers.mtls-renew = lib.mkIf cfg.renew.enable {
-          wantedBy = [ "timers.target" ];
-          timerConfig = {
-            Persistent = true;
-            AccuracySec = "1us";
-            RandomizedDelaySec = cfg.renew.randomizedDelaySec;
-          };
-        };
+        systemd.timers.mtls-renew = lib.mkIf cfg.renew.enable (mkNixosMtlsRenewTimer {
+          inherit (cfg.renew) onCalendar randomizedDelaySec;
+        });
      };
    };

  flake.modules.homeManager.mtls = { config, lib, pkgs, ... }:
    let
      cfg = config.mtls;
-      mtlsRenewWrapper = inputs.self.wrappers.mtlsRenew.apply {
-        inherit pkgs;
-        inherit (cfg) certDir keyFile certFile bundleFile;
-        inherit (cfg.renew) reloadUnits postCommands;
-        systemctlArgs = [ "--user" ];
-        systemd = lib.optionalAttrs cfg.renew.enable {
-          startAt = cfg.renew.onCalendar;
-        };
-      };
+      keyFile = cfg.keyFile;
+      certFile = cfg.certFile;
+      bundleFile = cfg.bundleFile;
+      sanArgs = lib.concatMapStringsSep " " (san: "--san \"${san}\"") cfg.san;
    in
    {
      options.mtls = (mkOpts config) // {
@@ -217,226 +313,25 @@ in
        home.packages = with pkgs; lib.optionals cfg.enable [
          # step-cli
          (mkMtlsGenerateScript {
-            inherit pkgs;
-            inherit (cfg) keyFile certFile bundleFile;
            inherit (cfg) subject provisioner san lifetime;
-            inherit (cfg.renew) user group;
+            inherit pkgs certFile keyFile bundleFile;
          })
-          (inputs.self.wrappers.mtlsCheck.apply {
-            inherit pkgs;
-            inherit (cfg) bundleFile;
-          }).wrapper
+          (mkMtlsCheckScript { inherit pkgs bundleFile; })
+          (mkMtlsRenewScript { inherit pkgs certFile keyFile bundleFile; })
        ];

        systemd.user.tmpfiles.rules = lib.mkIf cfg.enable [
-          "d ${cfg.certDir} 0700 - - -" # Ensure the cert directory exists and is writable by the user
+          "d ${cfg.certDir} 0700 - - -"
        ];

-        # Create the systemd service files for the user.
-        xdg.dataFile = lib.mkIf cfg.renew.enable {
-          "systemd/user/mtls-renew.service".source =
-            "${mtlsRenewWrapper.outputs.systemd-user}/systemd/user/mtls-renew.service";
-          "systemd/user/mtls-renew.timer".source =
-            "${mtlsRenewWrapper.outputs.systemd-user}/systemd/user/mtls-renew.timer";
-          "systemd/user/mtls-renew.timer.d/override.conf".text = ''
-            [Timer]
-            Persistent=true
-            AccuracySec=1us
-            RandomizedDelaySec=${cfg.renew.randomizedDelaySec}
-          '';
-        };
-
-        # Ensure the timer gets started
-        home.activation.mtlsRenewTimer = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
-          if [ -n "$XDG_RUNTIME_DIR" ] && [ -S "$XDG_RUNTIME_DIR/systemd/private" ]; then
-            if [ "${lib.boolToString (cfg.enable && cfg.renew.enable)}" = "true" ]; then
-              run ${pkgs.systemd}/bin/systemctl --user daemon-reload
-              run ${pkgs.systemd}/bin/systemctl --user enable --now mtls-renew.timer
-            else
-              run ${pkgs.systemd}/bin/systemctl --user disable --now mtls-renew.timer || true
-              run ${pkgs.systemd}/bin/systemctl --user daemon-reload || true
-            fi
-          fi
-        '';
-      };
-    };
-
-  flake.wrappers = {
-    mtlsCheck = inputs.wrappers.lib.wrapModule ({ config, lib, wlib, ... }: {
-      options = {
-        bundleFile = lib.mkOption {
-          description = "String path for the mTLS key bundle";
-          type = lib.types.str;
-        };
-      };
-
-      config = {
-        binName = "mtls-check";
-        # This pattern is necessary to wrap packages like openssl that provide more than one binary
-        package = config.pkgs.symlinkJoin {
-          name = "openssl";
-          paths = [ config.pkgs.openssl.bin config.pkgs.openssl.man ];
-          meta.mainProgram = "openssl";
-        };
-        args = [
-          "x509"
-          "-noout"
-          "-in" config.bundleFile
-          "-subject"
-          "-issuer"
-          "-ext" "subjectAltName,extendedKeyUsage"
-          "-enddate"
-        ];
-      };
+        systemd.user.services.mtls-renew = lib.mkIf cfg.renew.enable (mkHomeManagerMtlsRenewService {
+          inherit pkgs certFile keyFile bundleFile;
+          inherit (cfg.renew) reloadUnits postCommands;
        });

-    mtlsNeedsRenewal = inputs.wrappers.lib.wrapModule ({ config, lib, wlib, ... }: {
-      options = {
-        certFile = lib.mkOption {
-          description = "String path for the public cert";
-          type = lib.types.str;
-        };
-      };
-
-      config = {
-        binName = "mtls-needs-renewal";
-        package = config.pkgs.step-cli;
-        preHook = ''
-          echo "Checking renewal status..."
-        '';
-        args = [ "certificate" "needs-renewal" "${config.certFile}" ];
-      };
+        systemd.user.timers.mtls-renew = lib.mkIf cfg.renew.enable (mkHomeManagerMtlsRenewTimer {
+          inherit (cfg.renew) onCalendar randomizedDelaySec;
        });
-
-    mtlsRenew = inputs.wrappers.lib.wrapModule ({ config, lib, wlib, ... }: {
-      imports = [ wlib.modules.systemd ];
-
-      options = {
-        certDir = lib.mkOption {
-          description = "String path to the directory where the certs will be stored";
-          type = lib.types.str;
      };
-        keyFile = lib.mkOption {
-          description = "String path for the private key";
-          type = lib.types.str;
-          default = "${config.certDir}/key.pem";
-        };
-        certFile = lib.mkOption {
-          description = "String path for the public cert";
-          type = lib.types.str;
-          default = "${config.certDir}/cert.pem";
-        };
-        bundleFile = lib.mkOption {
-          description = "String path for the mTLS key bundle";
-          type = lib.types.str;
-          default = "${config.certDir}/mtls.pem";
-        };
-        user = lib.mkOption {
-          description = "User that should own the renewed certificate files.";
-          type = lib.types.nullOr lib.types.str;
-          default = null;
-        };
-        group = lib.mkOption {
-          description = "Group that should own the renewed certificate files.";
-          type = lib.types.nullOr lib.types.str;
-          default = null;
-        };
-        reloadUnits = lib.mkOption {
-          description = "systemd units to try-reload-or-restart after a successful renewal.";
-          type = lib.types.listOf lib.types.str;
-          default = [ ];
-        };
-        postCommands = lib.mkOption {
-          description = "Shell commands to run after a successful renewal.";
-          type = lib.types.listOf lib.types.lines;
-          default = [ ];
-        };
-        systemctlArgs = lib.mkOption {
-          description = "Additional arguments to pass to systemctl when reloading units.";
-          type = lib.types.listOf lib.types.str;
-          default = [ ];
-        };
-      };
-
-      config = {
-        binName = "mtls-renew";
-        package = let
-          systemctlCmd = "systemctl ${lib.escapeShellArgs config.systemctlArgs}";
-
-          hasReloadUnits = config.reloadUnits != [ ];
-          renewReloadScript = lib.concatMapStringsSep "\n" (unit: ''
-            if ${systemctlCmd} --quiet is-active "${unit}"; then
-              ${systemctlCmd} try-reload-or-restart "${unit}"
-            fi
-          '') config.reloadUnits;
-
-          hasPostCommands = config.postCommands != [ ];
-          renewPostCommands = lib.concatStringsSep "\n" config.postCommands;
-
-          hasOwnership = config.user != null && config.group != null;
-        in
-          config.pkgs.writeShellApplication {
-            name = "mtls-renew";
-            runtimeInputs = with config.pkgs; [ coreutils step-cli systemd ];
-            text = ''
-            set -euo pipefail
-
-            YELLOW_BANG="\e[33m!\e[0m"
-
-            force=0
-            while [[ $# -gt 0 ]]; do
-            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 "${config.certFile}"; then
-              echo "Skipping renew"
-              exit 0
-            fi
-
-            echo "Renewing mTLS certificate"
-            step ca renew --force "${config.certFile}" "${config.keyFile}"
-            (umask 077; cat "${config.certFile}" "${config.keyFile}" > "${config.bundleFile}")
-
-            ${lib.optionalString hasOwnership ''
-              chown ${config.user}:${config.group} ${config.certFile} ${config.keyFile} ${config.bundleFile}
-              chmod 640 ${config.certFile} ${config.keyFile} ${config.bundleFile}
-            ''}
-
-            ${lib.optionalString hasReloadUnits ''
-              echo "Reloading units: ${lib.concatStringsSep ", " config.reloadUnits}"
-              ${renewReloadScript}
-            ''}
-
-            ${lib.optionalString hasPostCommands ''
-              echo "Running post commands"
-              ${renewPostCommands}
-            ''}
-            '';
-          };
-        extraPackages = [
-          config.pkgs.step-cli
-        ];
-        systemd = {
-          description = "Automatic mTLS renewal service";
-          documentation = [
-            "https://smallstep.com/docs/step-ca/certificate-authority-server-production"
-          ];
-          startLimitIntervalSec = 0;
-          after = [ "network-online.target" ];
-          wants = [ "network-online.target" ];
-          serviceConfig.Type = lib.mkDefault "oneshot";
-          # serviceConfig.ExecCondition = "";
-        };
-      };
-    });
    };
 }
@@ -1,63 +1,40 @@
 # This module provides all the shell options
-{ self, inputs, ... }: {
+{ inputs, lib, ... }:
+{
  flake.modules.homeManager.shell-tools = { config, pkgs, ... }: {
+    options.shell.program = lib.mkOption {
+      type = lib.types.enum [ "bash" "zsh" ];
+      default = "zsh";
+      description = "Which interactive shell configuration to enable.";
+    };
+
    imports = with inputs.self.modules.homeManager; [
-      # bash
+      bash
      zsh
+
+      # Tools
+      eza
      files
    ];

+    config = {
+      home.shell.enableShellIntegration = true;
+      programs.zsh.enable  = lib.mkForce (config.shell.program == "zsh");
      home.packages = with pkgs; [
+        wget
+        curl
+        busybox
+        gnugrep
+        dig
        btop
        uv
        xclip
-      inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.shell-tools
-    ];
-
-    home.shell.enableShellIntegration = true;
-  };
-
-  perSystem = { system, pkgs, self', ... }: {
-    packages.shell-tools = inputs.wrappers.lib.wrapPackage { 
-      inherit pkgs;
-      # binName = "show-tools";
-      package = (pkgs.symlinkJoin {
-        name = "show-tools";
-        meta.mainProgram = "show-tools";
-        paths = with pkgs; [
-          nh
-          ripgrep
-          fd
        jq
-          wget
-          curl
-          dig
-          self'.packages.gdu
-          self'.packages.my-eza
-          hostname
-          iproute2
-          direnv
-          (writeShellApplication {
-            name = "show-tools";
-            text = ''
-              IFS=':' read -r -a path_dirs <<< "''${PATH:-}"
-
-              for dir in "''${path_dirs[@]}"; do
-                [[ "$dir" == */bin ]] || continue
-                [[ -d "$dir" ]] || continue
-
-                printf '%s\n' "$dir"/*
-              done
-            '';
-          })
+        ripgrep
+        (writeShellScriptBin "ds" ''
+          ${lib.getExe pkgs.gdu} -x -I /snap /
+        '')
      ];
-      });
-    };
-
-    packages.gdu = inputs.wrappers.lib.wrapPackage {
-      inherit pkgs;
-      package = pkgs.gdu;
-      args = [ "-x" "--si" "--collapse-path" "--mouse" "$@" ];
    };
  };
 }
@@ -1,100 +0,0 @@
-{ self, inputs, ... }:
-let
-  mkPrincipalArgs = principals:
-    builtins.concatLists (map (principal: [ "--principal" principal ]) principals);
-in
-{
-  perSystem = { system, self', pkgs, lib, ... }: {
-    packages.ssh-certs = inputs.wrappers.lib.wrapPackage {
-      inherit pkgs;
-      package = (pkgs.symlinkJoin {
-        name = "ssh-certs";
-        meta.mainProgram = "sign-ssh-user-cert";
-        paths = [
-          (inputs.self.wrappers.signUserWrapper.apply {
-            inherit pkgs;
-            provisioner = "admin";
-            overwrite = true;
-            validUsers = [ "john" "root" "appdaemon" ];
-          }).wrapper
-
-          (inputs.self.wrappers.signHostWrapper.apply {
-            inherit pkgs;
-            provisioner = "admin";
-            overwrite = true;
-            # extraPrincipals = [ "home-pc" ];
-          }).wrapper
-        ];
-      });
-    };
-  };
-
-  flake.wrappers.signHostWrapper = inputs.wrappers.lib.wrapModule ({config, lib, wlib, ... }: {
-    options = {
-      provisioner = lib.mkOption {
-        type = lib.types.nullOr lib.types.str;
-        default = "admin";
-      };
-      extraPrincipals = lib.mkOption {
-        type = lib.types.listOf lib.types.str;
-        default = [ ];
-      };
-      overwrite = lib.mkEnableOption "Overwrite existing cert file?";
-    };
-
-    config = {
-      binName = "sign-ssh-host-cert";
-      package = config.pkgs.step-cli;
-      extraPackages = with config.pkgs; [ hostname iproute2 systemd ];
-      preHook = ''
-        HOSTNAME=$(hostname -s)
-        IP_ADDRESS=$(ip -4 -o addr show scope global | while read -r _ _ _ addr _; do
-          case "$addr" in
-            192.168.1.*/*)
-              printf '%s\n' "''${addr%%/*}"
-              break
-              ;;
-          esac
-        done)
-        echo "Signing SSH host cert for $HOSTNAME at $IP_ADDRESS"
-      '';
-      args =
-        [
-          "ssh" "certificate"
-          "--host" "--sign"
-          "--principal" "$HOSTNAME"
-          "--principal" "$IP_ADDRESS"
-        ]
-        ++ lib.optionals (config.provisioner != null) [ "--provisioner" "${config.provisioner}" ]
-        ++ lib.optionals config.overwrite [ "-f" ]
-        ++ mkPrincipalArgs config.extraPrincipals;
-      postHook = ''
-        systemctl reload-or-restart sshd
-      '';
-    };
-  });
-
-  flake.wrappers.signUserWrapper = inputs.wrappers.lib.wrapModule ({config, lib, wlib, ... }: {
-    options = {
-      provisioner = lib.mkOption {
-        type = lib.types.nullOr lib.types.str;
-        default = "admin";
-      };
-      validUsers = lib.mkOption {
-        description = "A list of the user names that this cert will be valid for";
-        type = lib.types.listOf lib.types.str;
-        default = [ ];
-      };
-      overwrite = lib.mkEnableOption "Overwrite existing cert file?";
-    };
-
-    config = {
-      binName = "sign-ssh-user-cert";
-      package = config.pkgs.step-cli;
-      args = [ "ssh" "certificate" "--sign" ]
-        ++ lib.optionals (config.provisioner != null) [ "--provisioner" "${config.provisioner}" ]
-        ++ lib.optionals config.overwrite [ "-f" ]
-        ++ mkPrincipalArgs config.validUsers;
-    };
-  });
-}
@@ -1,51 +0,0 @@
-{ self, inputs, ... }: {
-  flake.modules.homeManager.step-client = { config, pkgs, lib, ... }: {
-    home.file.".step/config/defaults.json".text = builtins.toJSON {
-      ca-url = "https://janus.john-stream.com/";
-      fingerprint = "2036c44f7b5901566ff7611ea6c927291ecc6d2dd00779c0eead70ec77fa10d6";
-      root = ../hosts/janus/root_ca.crt;
-    };
-    home.packages = [
-      inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.step-bootstrap
-    ];
-    # sops.secrets."step-ca-defaults" = {
-    #   sopsFile = ../hosts/janus/defaults.json;
-    #   format = "json";
-    #   key = ""; # This causes it to decode the whole file
-    #   path = "${config.home.homeDirectory}/defaults.json";
-    #   mode = "0400";
-    # };
-  };
-
-  perSystem = { system, pkgs, lib, ... }: {
-    packages.step-bootstrap = (inputs.self.wrappers.stepBootstrap.apply {
-      inherit pkgs;
-      ca-url = "https://janus.john-stream.com";
-      fingerprint = "2036c44f7b5901566ff7611ea6c927291ecc6d2dd00779c0eead70ec77fa10d6";
-      install = true;
-    }).wrapper;
-  };
-
-  flake.wrappers.stepBootstrap = inputs.wrappers.lib.wrapModule ({config, lib, wlib, ... }: {
-    options = {
-      ca-url = lib.mkOption {
-        type = lib.types.str;
-      };
-      fingerprint = lib.mkOption {
-        type = lib.types.str;
-      };
-      install = lib.mkEnableOption "Install the cert to the system trust store";
-    };
-
-    config = {
-      binName = "step-bootstrap";
-      package = config.pkgs.step-cli;
-      args = [
-        "ca" "bootstrap"
-        "--ca-url" config.ca-url
-        "--fingerprint" config.fingerprint
-      ]
-      ++ lib.optional config.install "--install";
-    };
-  });
-}
@@ -2,59 +2,40 @@
 let
  username = "john";
  hostname = "janus";
+  ca-url = "https://janus.john-stream.com/";
+  fingerprint = "2036c44f7b5901566ff7611ea6c927291ecc6d2dd00779c0eead70ec77fa10d6";
 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"
+        "L+ ${home}/.step/config/defaults.json - - - - /etc/step/config/defaults.json"
+        "L+ ${home}/.step/certs/root_ca.crt - - - - /etc/step/certs/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 {
-            ca-url = "https://janus.john-stream.com/";
-            fingerprint = builtins.readFile ./fingerprint;
-            root = "/etc/${certRootEtcPath}";
-          };
-          "${certRootEtcPath}".source = ./root_ca.crt;
+      environment.etc."step/config/defaults.json".text = builtins.toJSON {
+        inherit ca-url fingerprint;
+        root = "/etc/step-ca/certs/root_ca.crt";
      };
+      environment.etc."step-ca/certs/root_ca.crt".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/";
-      fingerprint = builtins.readFile ./fingerprint;
-      root = ./root_ca.crt;
+      inherit ca-url fingerprint;
+      root = "${config.home.homeDirectory}/.step/certs/root_ca.crt";
    };
+    home.file.".step/certs/root_ca.crt".source = ./root_ca.crt;
  };

  flake.nixosConfigurations."${hostname}" = inputs.nixpkgs.lib.nixosSystem {
@@ -85,6 +66,7 @@ in
        home-manager.users."${username}" = {
          imports = with inputs.self.modules.homeManager; [
            mysops
+            step-ssh-user
          ];
          shell.program = "zsh";
          docker.enable = true;
@@ -92,4 +74,23 @@ in
      }
    ];
  };
+
+  flake-file.inputs = {
+    wrappers = {
+      url = "github:lassulus/wrappers";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+  };
+
+  perSystem = { 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}"
+      ];
+    };
+  };
 }
@@ -1 +0,0 @@
-2036c44f7b5901566ff7611ea6c927291ecc6d2dd00779c0eead70ec77fa10d6
@@ -5,7 +5,7 @@
      hostname = "john-p14s";
      homeDirectory = config.home-manager.users.john.home.homeDirectory;
      flakeDir = "${homeDirectory}/Documents/dendritic";
-      selfPkgs = inputs.self.packages.${pkgs.stdenv.hostPlatform.system};
+      my-neovim = inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.my-neovim;
    in
    {
      imports = [
@@ -36,10 +36,12 @@
      # List packages installed in system profile. To search, run:
      # $ nix search wget
      environment.systemPackages = with pkgs; [
+        wget
+        cacert
+        busybox
+        dig
        samba
-        selfPkgs.my-neovim
-        selfPkgs.wg-platform
-        selfPkgs.jsl-zsh
+        my-neovim
      ];

      security.pam.services.swaylock = {};
@@ -84,11 +86,6 @@
        };
      };

-      fonts.packages = with pkgs; [
-        nerd-fonts.hack
-        nerd-fonts.sauce-code-pro
-      ];
-
      services.libinput.enable = true; # Enable touchpad support (enabled default in most desktopManager).
      services.fprintd.enable = true; # Enables fingerprint sensor

@@ -127,10 +124,8 @@
          home.packages = with pkgs; [
            bash
            discord
-            proton-vpn
-            joplin-desktop
+            my-neovim
          ];
-          ssh.certificates.enable = true;
          ssh.matchSets = {
            appdaemon = true;
            homelab = true;
@@ -1,33 +1,40 @@
-{ withSystem, self, inputs, ... }:
+{ self, inputs, ... }:
 let
  username = "john";
  hostname = "john-pc-ubuntu";

-  # 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";
+  testTarget = "fded:fb16:653e:25da:be24:11ff:fea0:753f"; # test-nix
+  # testTarget = "fded:fb16:653e:25da:be24:11ff:fe89:1cc3"; # soteria

 in
 {
  flake.modules.homeManager."${hostname}" = { config, pkgs, lib, ... }:
  let
-    selfPkgs = inputs.self.packages.${pkgs.stdenv.hostPlatform.system};
-    resticPasswordFile = "${config.xdg.configHome}/restic/password.txt";
    flakeDir = "${config.xdg.configHome}/home-manager/jsl-dendritic";
+    resticPasswordFile = "${config.xdg.configHome}/restic/password.txt";
+
+    testPushCmd = (pkgs.writeShellScriptBin "test-push" ''
+      ${lib.getExe' pkgs.coreutils "echo"} "Pushing ${testHost} to ${testTarget}"
+      ${lib.getExe' pkgs.coreutils "mkdir"} -p /var/tmp/nix-build
+      ${lib.getExe' pkgs.coreutils "chmod"} 1777 /var/tmp/nix-build
+      ${lib.getExe pkgs.nixos-rebuild} switch \
+        --flake ${flakeDir}#${testHost} \
+        --target-host root@${testTarget}
+    '');
  in
  {
    imports = with inputs.self.modules.homeManager; [
      rebuild
      john
+      mysops
+      janus-ca
+      step-ssh-user
      mtls
      restic
      docker
      desktop
-      step-client
-      mysops
-      # myPackage
-      # myStepClient
+      # neovim
    ];
    # TODO: make this more restrictive, rather than allowing all unfree packages
    nixpkgs.config.allowUnfree = true;
@@ -38,22 +45,21 @@ in
    home.username = "${username}";
    home.homeDirectory = "/home/${username}";
    home.packages = with pkgs; [
-      selfPkgs.jsl-zsh
-      selfPkgs.my-neovim
-      selfPkgs.ssh-certs
-      # selfPkgs.step-bootstrap
-      # selfPkgs.wg-platform
-      # self'.packages.myWrappedPackage
-      (inputs.self.wrappers.test-push.apply {
-        inherit pkgs flakeDir;
-        host = testHost;
-        target = testTarget;
-      }).wrapper
+      nixos-rebuild
+      testPushCmd
+      inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.my-neovim
    ];

+    shell.program = "zsh";
+  
    homeManagerFlakeDir = flakeDir;
    docker.enable = true;

+    step-ssh-user = {
+      enable = true;
+      principals = ["root" "${username}" "appdaemon"];
+      provisioner = "admin";
+    };
    ssh = {
      certificates.enable = true;
      knownHosts = [
@@ -64,7 +70,6 @@ in
        appdaemon = true;
        homelab = true;
        dev = true;
-        tailscale = true;
      };
    };

@@ -104,13 +109,10 @@ in
    };
  };

-  flake.homeConfigurations."john@john-pc-ubuntu" = withSystem "x86_64-linux" (ctx@{ system, inputs', ... }:
-    inputs.home-manager.lib.homeManagerConfiguration {
-      # pkgs = import inputs.nixpkgs {
-      #   inherit system;
-      #   overlays = [ inputs.self.overlays.default ];
-      # };
-      pkgs = inputs'.nixpkgs.legacyPackages;
-      modules = [ inputs.self.modules.homeManager."${hostname}" ];
-  });
+  flake.homeConfigurations."${hostname}" = inputs.home-manager.lib.homeManagerConfiguration {
+    pkgs = import inputs.nixpkgs { system = "x86_64-linux"; };
+    modules = with inputs.self.modules; [
+      homeManager."${hostname}"
+    ];
+  };
 }
@@ -1,33 +0,0 @@
-{ self, inputs, ... }: {
-  flake.wrappers.test-push = inputs.wrappers.lib.wrapModule ({config, lib, wlib, ... }: {
-    options = {
-      flakeDir = lib.mkOption {
-        type = lib.types.str;
-      };
-      host = lib.mkOption {
-        type = lib.types.str;
-      };
-      target = lib.mkOption {
-        type = lib.types.str;
-      };
-      sshUser = lib.mkOption {
-        type = lib.types.str;
-        default = "root";
-      };
-      elevationStrategy = lib.mkOption {
-        type = lib.types.str;
-        default = "none";
-      };
-    };
-
-    config = {
-      binName = "test-push";
-      package = config.pkgs.nh;
-      args = [
-        "os" "switch" "${config.flakeDir}#${config.host}"
-        "--target-host" "${config.sshUser}@${config.target}"
-        "--elevation-strategy" "${config.elevationStrategy}"
-      ]; 
-    };
-  });
-}
@@ -1,14 +1,5 @@
 janus:
    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
@@ -38,7 +29,7 @@ sops:
            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]
+    lastmodified: "2026-03-29T22:44:20Z"
+    mac: ENC[AES256_GCM,data:f2QVZsCNZJIxnsWsBXVyD6JFSmsMktZqCXQWAJcLfSaojEld9CMu1rJjDyCbG3GPJStrMS20WZbtQvx7H6gosnkxXL401L8SwIoy/gNNEIx0qVLUneoEsuvjSTIiiUG7B2Y9lBKQ/kO/iKrJMURSke0wWWC1Ng5mUePfZ94FVTg=,iv:xOFeak0pjBt4iTFr9vt4cuA9WzFD/ipVThgulNOp100=,tag:YPLXK4RmQLa+ADl6DohmBQ==,type:str]
    unencrypted_suffix: _unencrypted
-    version: 3.12.2
+    version: 3.12.1
@@ -1,4 +1,4 @@
-{ withSystem, self, inputs, lib, ... }:
+{ self, inputs, lib, ... }:
 let
  username = "john";
  hostname = "soteria";
@@ -17,9 +17,21 @@ in
      nixos.forgejo
      # nixos.restic-server
      # nixos.restic-envoy
-      ({ config, pkgs, ... }: {
+      ({ pkgs, ... }: {
        networking.hostName = hostname;
-        time.timeZone = "America/Chicago";
+        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"
+          ];
+        };

        # Removes password for sudo
        security.sudo-rs.extraRules = lib.mkAfter [
@@ -33,88 +45,52 @@ in
            ];
          }
        ];
-
-        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" ];
+        # nix.settings.build-dir = "/var/tmp/nix-build";
+        # systemd.tmpfiles.rules = [
+        #   "d /var/tmp/nix-build 1777 root root -"
+        # ];
+        step-ssh-host = {
+          hostname = hostname;
        };
-        forgejo = {
-          enable = true;
-          root_url = "https://forgejo.john-stream.com";
-          https = true;
-          port = 443;
-        };
-
-        networking.firewall.allowedTCPPorts = [ 8000 ];
-        services.restic.server = {
-          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 = [ inputs.self.modules.homeManager.soteria ];
+        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
        ];
+
+        forgejo.enable = true;
      })
    ];
  };

-  flake.modules.homeManager.soteria = { config, pkgs, lib, ... }: {
-    imports = [
-      inputs.self.modules.homeManager.rebuild
-      inputs.self.modules.homeManager.mysops
-      ({ config, pkgs, lib, ... }: {
+  flake.modules.homeManager."${hostname}" = { config, pkgs, lib, ... }: {
+    imports = with inputs.self.modules; [
+      homeManager.rebuild
+      homeManager.mysops
+    ];
+
    homeManagerFlakeDir = "${config.xdg.configHome}/home-manager";
+    shell.program = "zsh";
    docker.enable = true;

    # This will provide the edit-secrets script targeting this file
    mysops.hostSecretFile = "${config.homeManagerFlakeDir}/modules/hosts/soteria/secrets.yaml";
-      })
-    ];
  };

-  flake.homeConfigurations.soteria = withSystem "x86_64-linux" (ctx@{ config, inputs', ...}:
-    inputs.home-manager.lib.homeManagerConfiguration {
-      pkgs = inputs'.nixpkgs.legacyPackages;
-      modules = [
-        inputs.self.modules.homeManager."${username}"
-        inputs.self.modules.homeManager.soteria
+  flake.homeConfigurations."${hostname}" = inputs.home-manager.lib.homeManagerConfiguration {
+    pkgs = import inputs.nixpkgs { system = "x86_64-linux"; };
+    modules = with inputs.self.modules; [
+      homeManager."${username}"
+      homeManager."${hostname}"
    ];
-  });
+  };
 }
@@ -6,21 +6,11 @@
      flakeDir = config.rebuild.flakeDir;
      echoCmd = lib.getExe' pkgs.coreutils "echo";
      hostnameCmd = "$(${lib.getExe pkgs.hostname} -s)";
-
-      nfs = with pkgs; writeShellApplication {
-        name = "nfs";
-        runtimeInputs = [ coreutils hostname nh ];
-        text = ''
-          HOSTNAME=$(hostname -s)
-          echo "Switching to the $HOSTNAME nixos profile"
-          nh os switch "$@" "${flakeDir}#$HOSTNAME"
-        '';
-      };
-      nfsu = with pkgs; writeShellApplication {
-        name = "nfsu";
-        runtimeInputs = [ nfs pkgs.git ];
-        text = ''nfs --refresh "$@"'';
-      };
+      nfs = (pkgs.writeShellScriptBin "nfs" ''
+        HOSTNAME=${hostnameCmd}
+        ${echoCmd} "Switching to the $HOSTNAME nixos profile"
+        sudo ${lib.getExe pkgs.nixos-rebuild} switch --impure --flake ${flakeDir}#$HOSTNAME
+      '');
    in
    {
      options.rebuild = {
@@ -32,38 +22,29 @@
      };

      config = {
-        environment.systemPackages = with pkgs; [ nfs nfsu ];
+        environment.systemPackages = with pkgs; [
+          nfs
+          (writeShellScriptBin "nfsu" ''
+            ${lib.getExe nix} flake update --impure --flake ${flakeDir}
+            ${lib.getExe git} -C ${flakeDir} add ${flakeDir}/flake.lock > /dev/null 2>&1
+            ${lib.getExe nfs}
+          '')
+        ];
      };
    };

  flake.modules.homeManager.rebuild =
    { config, pkgs, lib, ... }:
    let
+      nixBin = lib.getExe pkgs.nix;
      flakeDir = config.homeManagerFlakeDir;
-
-      flake-parts-check = with pkgs; writeShellApplication {
-        name = "flake-parts-check";
-        runtimeInputs = [ nix ];
-        text = ''
-          cd ${flakeDir}
-          nix run "${flakeDir}#write-flake"
-          nix flake check
-        '';
-      };
-
-      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"
-        '';
-      };
+      echoCmd = lib.getExe' pkgs.coreutils "echo";
+      hostnameCmd = "$(${lib.getExe pkgs.hostname} -s)";
+      nhms = (pkgs.writeShellScriptBin "nhms" ''
+        HOSTNAME=${hostnameCmd}
+        ${echoCmd} "Switching to the $HOSTNAME home-manager profile"
+        ${lib.getExe pkgs.home-manager} switch --impure --flake ${flakeDir}#$HOSTNAME
+      '');
    in
    {
      options = {
@@ -72,77 +53,54 @@
          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 echo "Home Manager flake directory: ${flakeDir}"
+          run ${echoCmd} "Home Manager flake directory: ${flakeDir}"
        '';

        home.packages = with pkgs; [
          home-manager
-          (symlinkJoin {
-            name = "build-tools";
-            paths = [
-              flake-parts-check
-              test-build
-              (inputs.self.wrappers.home-switch.apply {
-                inherit pkgs flakeDir;
-              }).wrapper
-              (inputs.self.wrappers.home-switch.apply {
-                binName = lib.mkForce "nhmu";
-                inherit pkgs flakeDir;
-                extraOptions = [ "--update" ];
-              }).wrapper
-              (inputs.wrappers.lib.wrapPackage {
-                binName = "cleanup";
-                inherit pkgs;
-                package = nh;
-                args = [ "clean" "user" "--keep-since" "3days" ];
-              })
-            ];
-          })
+          (writeShellScriptBin "flake-parts-check" ''
+            cd ${flakeDir}
+            ${nixBin} run "${flakeDir}#write-flake"
+            ${nixBin} flake check
+          '')
+          nhms
+          (writeShellScriptBin "nhmu" ''
+            ${nixBin} flake update --flake ${flakeDir}
+            ${lib.getExe nhms}
+          '')
+
+          (writeShellScriptBin "test-build" ''
+            if [ -z "$1" ]; then
+              HOSTNAME=${hostnameCmd}
+            else
+              HOSTNAME="$1"
+            fi
+            ${echoCmd} "Testing the evaulation of the nixos config for $HOSTNAME"
+            ${lib.getExe nix} eval ${flakeDir}#nixosConfigurations.$HOSTNAME.config.system.build.toplevel.drvPath
+          '')
+
+          (writeShellScriptBin "cleanup" ''
+            set -e
+            DAYS=$1
+            if [ -z "$DAYS" ]; then
+              ${echoCmd} "usage: cleanup <days>"
+              exit 1
+            fi
+            ${lib.getExe home-manager} expire-generations "-$DAYS days"
+            ${lib.getExe nix} profile wipe-history --older-than "''${DAYS}d"
+            ${lib.getExe nix} store gc
+            ${lib.getExe nix} store optimise
+          '')
        ];
      };
    };
-
-  flake.wrappers.home-switch = inputs.wrappers.lib.wrapModule ({config, lib, wlib, ... }: {
-    options = {
-      flakeDir = lib.mkOption {
-        type = lib.types.str;
-      };
-      user = lib.mkOption {
-        type = lib.types.str;
-        default = "$(whoami)";
-      };
-      hostname = lib.mkOption {
-        type = lib.types.str;
-        default = "$(hostname -s)";
-      };
-      configuration = lib.mkOption {
-        type = lib.types.str;
-        default = "${config.user}@${config.hostname}";
-      };
-      extraOptions = lib.mkOption {
-        type = lib.types.listOf lib.types.str;
-        default = [ ];
-      };
-    };
-
-    config = {
-      binName = "nhms";
-      extraPackages = with config.pkgs; [ coreutils hostname nh ];
-      preHook = ''
-        CONFIG=${config.configuration}
-        echo "Switching to $CONFIG"
-      '';
-      package = config.pkgs.nh;
-      args = [
-        "home" "switch"
-        "--configuration" "${config.configuration}"
-        "$@"
-        "${config.flakeDir}"
-      ] ++ config.extraOptions;
-    };
-  });
 }
@@ -14,18 +14,10 @@
        inputs.home-manager.nixosModules.home-manager
      ];

-      environment.shells = [
-        "${lib.getExe pkgs.zsh}"
-        "${lib.getExe inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.jsl-zsh}"
-      ];
-
-      users.groups."${username}" = {};
-
      users.users."${username}" = {
        isNormalUser = true;
-        group = username;
        home = "/home/${username}";
-        shell = pkgs.zsh;
+        shell = lib.mkIf config.programs.zsh.enable pkgs.zsh;
        extraGroups = [ "input" "networkmanager" ]
        ++ lib.optional isAdmin "wheel"
        ++ lib.optional config.virtualisation.docker.enable "docker"
@@ -33,8 +25,6 @@
        ++ lib.optional (isAdmin && config.services.postgresql.enable) "postgres";
      };

-      programs.zsh.enable = true;
-
      security.sudo-rs.enable = lib.mkIf isAdmin true;

      home-manager.useGlobalPkgs = true;
@@ -43,9 +33,7 @@
        imports = [ self.modules.homeManager."${username}" ];
        home.username = "${username}";
        home.homeDirectory = "/home/${username}";
-        home.packages = with pkgs; [
-          # fzf zoxide starship
-        ];
+        # home.packages = homePackages;
      };
    };
  };
@@ -1,21 +0,0 @@
-{ self, inputs, ... }: {
-  config.flake-file.inputs = {
-    wrapper-modules = {
-      url = "github:BirdeeHub/nix-wrapper-modules";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    wrappers = {
-      url = "github:lassulus/wrappers";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-  };
-
-  options = {
-    # This is what allows wrappers to be defined in flake.wrappers.<wrapper-name> throughout different flake-parts modules
-    flake = inputs.flake-parts.lib.mkSubmoduleOptions {
-      wrappers = inputs.nixpkgs.lib.mkOption {
-        default = {};
-      };
-    };
-  };
-}
@@ -1,18 +1,5 @@
 { inputs, ... }: {
-  flake.modules.nixos.login-text = { config, lib, ... }:
-    let
-      defaultServiceStatus = {
-        SSH = "sshd.socket";
-        "SSH Cert Renewal" = "step-ssh-host-renew.timer";
-      };
-    in {
-    options.loginText.extraServiceStatus = lib.mkOption {
-      type = lib.types.attrsOf lib.types.str;
-      default = { };
-      description = "Additional rust-motd service status entries keyed by display name.";
-    };
-
-    config = {
+  flake.modules.nixos.login-text = { config, ... }: {
    programs.rust-motd = {
      enable = true;
      refreshInterval = "*:0/5";
@@ -34,10 +21,12 @@
          root = 3;
        };

-          service_status = lib.mkMerge [
-            defaultServiceStatus
-            config.loginText.extraServiceStatus
-          ];
+        service_status = {
+          Docker = "docker";
+          SSH = "sshd.socket";
+          "SSH Cert Renewal" = "step-ssh-host-renew.timer";
+          "mTLS Renewal" = "mtls-renew.timer";
+        };

        # This calculation is wrong for LXCs
        # uptime = {
@@ -54,5 +43,4 @@
      };
    };
  };
-  };
 }
@@ -1,9 +1,10 @@
 {
  flake.modules.homeManager.bash = { pkgs, lib, config, ... }:
  {
-    programs.bash = {
+    programs.bash = lib.mkIf (config.shell.program == "bash") {
      enable = true;
      enableCompletion = true;
+      package = pkgs.bash;
    };
  };
 }
@@ -1,32 +1,14 @@
-{ self, inputs, ... }:
+{ inputs, pkgs, lib, ... }:
 {
-  flake.modules.homeManager.eza = { config, pkgs, lib, ... }: {
+  flake.modules.homeManager.eza = { pkgs, lib, ... }: {
    programs.eza = {
      enable = true;
+      package = pkgs.eza;
      enableBashIntegration = true;
      enableZshIntegration = true;
-      package = inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.my-eza;
    };
-  };
-
-  perSystem = { system, pkgs, ... }: {
-    packages.my-eza = inputs.wrappers.lib.wrapPackage {
-      inherit pkgs;
-      package = pkgs.eza;
-      args = [
-        "--all"
-        "--long"
-        "--group-directories-first"
-        "--icons=auto"
-        "--color=auto"
-        "--sort=type"
-        "--dereference"
-        "--octal-permissions"
-        "--smart-group"
-        "--no-time"
-        "--git"
-        "$@"
-      ];
+    home.shellAliases = {
+      ls = "${lib.getExe pkgs.eza} -lgos type --no-time --follow-symlinks";
    };
  };
 }
@@ -1,18 +1,15 @@
 {
-  flake.modules.homeManager.files = { pkgs, lib, ... }:
+  flake.modules.homeManager.files = { pkgs, ... }:
  {
-    programs.lf = {
-      enable = true;
-      cmdKeybindings = {
+    programs.lf.enable = true;
+    programs.lf.cmdKeybindings = {
      "D" = "delete";
    };
-      settings = {
-        preview = true;
-        hidden = true;
-        drawbox = true;
-        icons = true;
-        ignorecase = true;
-      };
-    };
+
+    home.packages = with pkgs; [
+      gdu
+      lf
+      # TODO: find a CLI file editor that's not insane
+    ];
  };
 }
@@ -43,7 +43,6 @@
        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;
@@ -1,4 +1,9 @@
 { 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;
@@ -1,4 +1,4 @@
-{ self, inputs, ... }:
+{ inputs, ... }:
 let
  inputs' = inputs;  # save a reference before it's shadowed
 in
@@ -14,10 +14,18 @@ in
    imports = [ inputs.sops-nix.nixosModules.sops ];
  };

-  flake.modules.homeManager.mysops =
-    { config, pkgs, lib, ... }:
+  # Define the homeModules that are used by flake-parts
+  # https://flake.parts/options/home-manager.html#opt-flake.modules.homeManager
+  flake.modules.homeManager.mysops = { inputs, config, pkgs, lib, ... }:
  let
    cfg = config.mysops;
+    sopsBin = lib.getExe pkgs.sops;
+    sopsConfigPath = ../../.sops.yaml;
+    sopsSecretsPath = ../../keys/secrets.yaml;
+
+    editScript = lib.optional (cfg.hostSecretFile != null) (pkgs.writeShellScriptBin  "edit-secrets" ''
+      ${sopsBin} --config ${sopsConfigPath} ${cfg.hostSecretFile}
+    '');
  in
  {
    imports = [
@@ -26,6 +34,11 @@ in
    ];

    options.mysops = {
+      ageKeyFile = lib.mkOption {
+        description = "Default location for the age key";
+        type = lib.types.str;
+        default = "${config.xdg.configHome}/sops/age/keys.txt";
+      };
      hostSecretFile = lib.mkOption {
        description = "Path to the secrets file for this host. Used to create the edit-secrets script";
        type = lib.types.nullOr lib.types.str;
@@ -35,63 +48,50 @@ in

    config =
    let
-          my-sops = (inputs.self.wrappers.mySops.apply {
-            inherit pkgs;
-            sshKey = config.ssh.identityFile;
-          }).wrapper;
+      echo = lib.getExe' pkgs.coreutils "echo";
+      dirname = lib.getExe' pkgs.coreutils "dirname";
+      mkdir = lib.getExe' pkgs.coreutils "mkdir";
+      show-age-key = (pkgs.writeShellScriptBin "show-age-key" ''
+        ${lib.getExe' pkgs.age "age-keygen"} -y ${cfg.ageKeyFile}
+      '');
    in
    {
+      home.packages = with pkgs; [
+        eza
+        age
+        sops # This is necessary to make the sops binary available
+        ssh-to-age
+        (writeShellScriptBin "gen-age-key" ''
+          set -eu
+
+          if [ ! -f "${config.ssh.identityFile}" ]; then
+            ${echo} "SSH identity file not found: ${config.ssh.identityFile}" >&2
+            exit 1
+          fi
+
+          if [ -e "${cfg.ageKeyFile}" ]; then
+            ${echo} "Refusing to overwrite existing age key file: ${cfg.ageKeyFile}" >&2
+            exit 1
+          fi
+
+          ${mkdir} -p "$(${dirname} "${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})
+        '')
+        show-age-key
+        (writeShellScriptBin "ls-secrets" "${lib.getExe pkgs.eza} -alT --follow-symlinks ~/.config/sops-nix/secrets")
+      ] ++ editScript;
+
+      home.shellAliases.sops = "${sopsBin} --config ${sopsConfigPath}";
+
      # Option definitions for the sops home-manager module:
      # https://github.com/Mic92/sops-nix/blob/master/modules/home-manager/sops.nix
      sops = {
-            defaultSopsFile = ../../keys/secrets.yaml;
+        defaultSopsFile = sopsSecretsPath;
        defaultSopsFormat = "yaml";
        age.sshKeyPaths = [ "${config.ssh.identityFile}" ];
      };
-
-          home.packages = with pkgs; [
-            my-sops
-            (inputs.wrappers.lib.wrapPackage {
-              binName = "ls-secrets";
-              inherit pkgs;
-              package = inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.my-eza;
-              args = [
-                "-T" "--follow-symlinks"
-                "${config.xdg.configHome}/sops-nix/secrets"
-              ];
-            })
-            
-          ]
-          ++ lib.optional (cfg.hostSecretFile != null) (inputs.wrappers.lib.wrapPackage {
-            binName = "edit-secrets";
-            inherit pkgs;
-            package = my-sops;
-            args = [ cfg.hostSecretFile ];
-          });
    };
  };
-
-  flake.wrappers.mySops = inputs.wrappers.lib.wrapModule ({config, lib, wlib, ... }: {
-    options = {
-      sshKey = lib.mkOption {
-        type = lib.types.str;
-        description = "String path to the SSH key to use for creating an AGE key at runtime";
-      };
-    };
-
-    config = {
-      # binName = "my-sops";
-      package = config.pkgs.sops;
-      extraPackages = with config.pkgs; [ coreutils ssh-to-age ];
-      preHook = ''
-        AGE_KEY=$(umask 077; mktemp)
-        ssh-to-age -private-key -i ${config.sshKey} > "$AGE_KEY"
-      '';
-      flags."--config" = "${../../.sops.yaml}";
-      postHook = ''
-        rm "$AGE_KEY"
-        echo "Removed $AGE_KEY"
-      '';
-    };
-  });
 }
@@ -1,54 +0,0 @@
-{ self, inputs, ... }: {
-  perSystem = { system, pkgs, lib, ... }: {
-    packages.starship = (inputs.wrappers.wrapperModules.starship.apply {
-      inherit pkgs;
-      settings = lib.recursiveUpdate (lib.importTOML (pkgs.fetchurl {
-          url = https://starship.rs/presets/toml/catppuccin-powerline.toml;
-          sha256 = "1jzbbzm3nwdlldq43aj3csp0ps23fsa6x2225z85l0s9qbj4cdy2";
-        })) {
-          palette = "catppuccin_mocha";
-          add_newline = true;
-          line_break.disabled = false;
-          git_status.diverged = "⇕⇡\${ahead_count}⇣\${behind_count}";
-          cmd_duration.format = "󰔛 $duration";
-          cmd_duration.show_notifications = false;
-          hostname = {
-            disabled = false;
-            ssh_symbol = "🌐";
-            format = "[$ssh_symbol$hostname]($style)";
-            style = "bg:red fg:crust";
-          };
-          os.symbols.NixOS = " ";
-          format = lib.replaceStrings ["\n"] [""] ''
-            [](red)
-            $os
-            $username
-            $hostname
-            [](bg:peach fg:red)
-            $directory
-            [](bg:yellow fg:peach)
-            $git_branch
-            $git_status
-            [](fg:yellow bg:green)
-            $c
-            $rust
-            $golang
-            $nodejs
-            $php
-            $java
-            $kotlin
-            $haskell
-            $python
-            [](fg:green bg:sapphire)
-            $conda
-            [](fg:sapphire bg:lavender)
-            $time
-            [ ](fg:lavender)
-            $cmd_duration
-            $line_break
-            $character
-          '';
-        };
-    }).wrapper;
-  };
-}
@@ -0,0 +1,37 @@
+{ self, inputs, ... }: {
+  #
+  # Home Manager Module
+  #
+  flake.modules.homeManager.step-ssh-user = { config, pkgs, lib, ... }:
+  let
+    cfg = config.step-ssh-user;
+    firstPrincipal = lib.head cfg.principals;
+    principalArgs = lib.concatMapStringsSep " "
+      (principal: "--principal \"${principal}\"") cfg.principals;
+  in
+  {
+    options.step-ssh-user = {
+      enable = lib.mkEnableOption "opionated step client config for SSH certs";
+      provisioner = lib.mkOption {
+        type = lib.types.str;
+        default = "admin";
+      };
+      principals = lib.mkOption {
+        type = lib.types.listOf lib.types.str;
+      };
+    };
+    config = lib.mkIf cfg.enable {
+      sops.secrets."janus/admin_jwk".mode = "0400";
+      home.packages = with pkgs; [
+        (writeShellScriptBin "sign-ssh-cert" ''
+          ${lib.getExe pkgs.step-cli} ssh certificate \
+          --sign \
+          ${principalArgs} \
+          --provisioner "${cfg.provisioner}" \
+          --provisioner-password-file "${config.sops.secrets."janus/admin_jwk".path}" \
+          "${firstPrincipal}" "${config.ssh.identityFile}.pub"
+        '')
+      ];
+    };
+  };
+}
@@ -2,13 +2,39 @@
  flake.modules.nixos.wireguard = { config, pkgs, lib, ... }:
  let
    wgInterface = "platform";
+    systemctl = lib.getExe' pkgs.systemd "systemctl";
+    journalctl = lib.getExe' pkgs.systemd "journalctl";
+
+    mkConnect = interface:
+      let
+        serviceName = "wg-quick-${interface}";
+        service = "${serviceName}.service";
+      in
+      pkgs.writeShellScriptBin "wg-connect-${interface}" ''
+        ${systemctl} start ${service}
+        start_time=$(${systemctl} show -p ActiveEnterTimestamp ${serviceName} | cut -d= -f2)
+        ${journalctl} -u ${service} --since "$start_time" --no-pager
+      '';
+    mkDisconnect = interface:
+      let
+        serviceName = "wg-quick-${interface}";
+        service = "${serviceName}.service";
+      in
+      pkgs.writeShellScriptBin "wg-disconnect-${interface}" ''
+        STOPTIME=$(${lib.getExe' pkgs.coreutils "date"} '+%Y-%m-%d %H:%M:%S')
+        ${systemctl} stop ${service}
+        start_time=$(${systemctl} show -p ActiveEnterTimestamp ${serviceName} | cut -d= -f2)
+        ${journalctl} -u ${service} --since "$STOPTIME" --no-pager
+      '';
  in
  {
    imports = [ inputs.sops-nix.nixosModules.sops ];

    environment.systemPackages = with pkgs; [
-      wireguard-tools # https://github.com/WireGuard/wireguard-tools
-      # wg-netmanager # https://github.com/gin66/wg_netmanager
+      wireguard-tools
+      wg-netmanager
+      (mkConnect "platform")
+      (mkDisconnect "platform")
    ];

    sops.secrets.wireguard_private_key = { };
@@ -30,39 +56,4 @@
      };
    };
  };
-
-  perSystem = { system, pkgs, lib, ... }:
-  let
-    connect = pkgs.writeShellApplication {
-      name = "wg-platform-connect";
-      text = ''
-        sudo systemctl start wg-quick-platform.service
-        START_TIME=$(sudo systemctl show -p ActiveEnterTimestamp wg-quick-platform | cut -d= -f2)
-        journalctl -u wg-quick-platform --since "$START_TIME" --no-pager
-      '';
-    };
-
-    disconnect = pkgs.writeShellApplication {
-      name = "wg-platform-disconnect";
-      text = ''
-        STOP_TIME=$(date '+%Y-%m-%d %H:%M:%S')
-        systemctl stop wg-quick-platform.service
-        journalctl -u wg-quick-platform.service --since "$STOP_TIME" --no-pager
-      '';
-    };
-  in
-  {
-    packages.wg-platform = inputs.wrappers.lib.wrapPackage {
-      inherit pkgs;
-      runtimeInputs = with pkgs; [ coreutils systemd wireguard-tools ];
-      package = pkgs.symlinkJoin {
-        name = "wg-platform";
-        meta.mainProgram = "wg-platform-connect";
-        paths = [
-          connect
-          disconnect
-        ];
-      };
-    };
-  };
 }
@@ -1,33 +0,0 @@
-{ self, inputs, ... }:
-let
-  packageName = "zed-editor";
-
-  zedWrapper = inputs.wrappers.lib.wrapModule ({ config, lib, wlib, ... }: { 
-    options = { 
-      text-to-say = lib.mkOption {
-        type = lib.types.str;
-        description = "Text for the ascii cow to say.";
-      };
-    };
-
-    config = {
-      binName = "my-pkg"; 
-      package = config.pkgs.cowsay; 
-      args = [ config.text-to-say ]; 
-    };
-  });
-in
-{
-  perSystem = { system, pkgs, lib, ... }: {
-    packages."${packageName}" = (zedWrapper.apply { 
-      inherit pkgs; 
-      text-to-say = "Hello from wrapped module!"; 
-    }).wrapper;
-  };
-
-  flake.modules.homeManager."${packageName}" = { config, pkgs, lib, ... }: { 
-    home.packages = [
-      inputs.self.packages.${pkgs.stdenv.hostPlatform.system}."${packageName}" 
-    ];
-  };
-}
@@ -1,25 +1,6 @@
-{ self, inputs, ... }:
+{ inputs, ... }:
 let
  username = "john";
-  historySize = 10000;
-  homeEndKeyBindings = ''
-    # Normalize common Home/End escape sequences across terminal emulators.
-    bindkey "^[[H" beginning-of-line
-    bindkey "^[[F" end-of-line
-    bindkey "^[[1~" beginning-of-line
-    bindkey "^[[4~" end-of-line
-    bindkey "^[[7~" beginning-of-line
-    bindkey "^[[8~" end-of-line
-    bindkey "^[OH" beginning-of-line
-    bindkey "^[OF" end-of-line
-    bindkey "^[[3~" delete-char
-
-    # Normalize common Ctrl+Arrow sequences for word-wise movement.
-    bindkey "^[[1;5D" backward-word
-    bindkey "^[[1;5C" forward-word
-    bindkey "^[[5D" backward-word
-    bindkey "^[[5C" forward-word
-  '';
 in
 {
  flake.modules = {
@@ -35,14 +16,11 @@ in
    homeManager.zsh = { pkgs, config, ... }: {
      programs.zsh = {
        enable = true;
-        package = inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.jsl-zsh;
+        package = pkgs.zsh;
        enableCompletion = true;
        autosuggestion.enable = true;
        # syntaxHighlighting.enable = true;
-        initContent = ''
-          HOST=$(hostname -s)
-          ${homeEndKeyBindings}
-        '';
+        initContent = "HOST=$(hostname -s)";
        dotDir = "${config.xdg.configHome}/zsh";
        history = {
          append = true;
@@ -53,8 +31,8 @@ in
            "eza"
            "clear"
          ];
-          save = historySize;
-          size = historySize;
+          save = 1000;
+          size = 1000;
          share = true;
        };
        oh-my-zsh = {
@@ -73,71 +51,4 @@ in
    };
  };
  
-  perSystem = { config, self', pkgs, lib, ... }: {
-    packages.jsl-zsh =
-      let
-        ignorePatterns = [
-          "ls" "eza" "history" "clear"
-        ];
-        aliasStr = lib.concatStringsSep "\n" (
-          lib.mapAttrsToList (k: v: "alias -- ${lib.escapeShellArg k}=${lib.escapeShellArg v}") {
-            ls = "eza";
-            ll = "eza -l";
-            la = "eza -a";
-            lt = "eza --tree";
-            lla = "eza -la";
-            ds = "gdu -i /snap /";
-            ld = "lazydocker";
-          });
-      in
-      (inputs.wrappers.wrapperModules.zsh.apply {
-        inherit pkgs;
-        binName = "jsl-zsh";
-        env = {
-          LANG = "en_US.UTF-8";
-          COLORTERM = "truecolor";
-        };
-        settings = {
-          completion = {
-            enable = true;
-            extraCompletions = true;
-            caseInsensitive = true;
-            fuzzySearch = true;
-          };
-          autoSuggestions = {
-            enable = true;
-            strategy = [ "history" "completion" ];
-          };
-          history = {
-            append = true;
-            expanded = true;
-            share = true;
-            ignoreAllDups = true;
-            ignoreSpace = true;
-          };
-          integrations = {
-            fzf.enable = true;
-            starship = {
-              enable = true;
-              package = self'.packages.starship;
-            };
-            zoxide.enable = true;
-          };
-        };
-        extraRC = ''
-          ${homeEndKeyBindings}
-
-          HISTFILE=$HOME/.config/zsh/.zsh_history
-          SAVEHIST=${toString historySize}
-          HISTORY_IGNORE=${lib.escapeShellArg "(${lib.concatStringsSep "|" ignorePatterns})"}
-
-          HOSTNAME=$(hostname -s)
-          ${aliasStr}
-        '';
-        extraPackages = with pkgs; [
-          lazydocker
-          self'.packages.shell-tools
-        ];
-      }).wrapper;
-  };
 }
@@ -102,7 +102,6 @@ in
        certs = mkEnableOption "Enable Janus and Soteria SSH targets";
        homelab = mkEnableOption "Enable various Homelab targets";
        dev = mkEnableOption "Enable development targets";
-        tailscale = mkEnableOption "Enable tailscale targets";
      };
    };

@@ -176,10 +175,6 @@ in
            "docs" = {
              hostname = "192.168.1.110";
              user = "root";
-              extraOptions = {
-                RequestTTY = "force";
-                RemoteCommand = "~/.nix-profile/bin/jsl-zsh";
-              };
            };
            "gitea" = {
              hostname = "192.168.1.104";
@@ -198,20 +193,6 @@ in
            "test-nix" = {
              hostname = "fded:fb16:653e:25da:be24:11ff:fea0:753f";
              user = "john";
-              extraOptions = {
-                RequestTTY = "auto";
-                # RemoteCommand = "/run/current-system/sw/bin/jsl-zsh";
-              };
-            };
-          })
-          (lib.mkIf cfg.matchSets.tailscale {
-            "jdl-docker" = {
-              hostname = "jdl-docker.tailcf205.ts.net";
-              user = "john";
-              extraOptions = {
-                RequestTTY = "auto";
-                # RemoteCommand = "~/.nix-profile/bin/jsl-zsh";
-              };
            };
          })
        ];
@@ -1,10 +1,6 @@
 { self, inputs, lib, ... }:
 let
  username = "john";
-  baseUserModules = self.factory.user {
-    username = username;
-    isAdmin = true;
-  };
 in
 {
  flake.meta.users."${username}" = {
@@ -12,17 +8,23 @@ in
    name = "John Lancaster";
    inherit username;
    key = "";
-    keygrip = [ ];
+    keygrip = [
+    ];
    authorizedKeys = [
      # "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIAUa4dcg1TWc4pW++uodyhX4eOqrX/QYIxFWtEP7HFJ john@john-pc-ubuntu"
      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMOkGLo4N/L3RYvaIZ1FmePlxa1HK0fMciZxKtRhN58F root@janus"
    ];
  };

-  flake.modules = {
-    nixos."${username}" = { ... }: {
+  flake.modules = lib.mkMerge [
+    (self.factory.user {
+      username = username;
+      isAdmin = true;
+    })
+    {
+      nixos."${username}" = {
        imports = [
-        baseUserModules.nixos."${username}"
+          inputs.home-manager.nixosModules.home-manager
        ];
        users.users."${username}" = {
          openssh.authorizedKeys.keys = inputs.self.meta.users."${username}".authorizedKeys;
@@ -30,20 +32,17 @@ in
      };

      # This module will be imported by the user factory
-    homeManager."${username}" = { pkgs, ... }:
-      with inputs.self.meta.users."${username}"; {
+      homeManager."${username}" = with inputs.self.meta.users."${username}"; {
        home.stateVersion = "25.11";
-        imports = [
-          inputs.self.modules.homeManager.shell-tools
-          inputs.self.modules.homeManager.ssh
-          inputs.self.modules.homeManager.git
-        ];
-        # home.packages = [
-        #   inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.shell-tools
-        # ];
        xdg.enable = true;
        programs.git.settings.user.name = name;
        programs.git.settings.user.email = email;
+        imports = with inputs.self.modules.homeManager; [
+          ssh
+          shell-tools
+          git
+        ];
      };
-  };
+    }
+  ];
 }
				`@@ -1 +0,0 @@`
				`2036c44f7b5901566ff7611ea6c927291ecc6d2dd00779c0eead70ec77fa10d6`