moved mtls to feature

added test-build
flake.lock update
2026-03-27 20:04:59 -05:00 · 2026-03-27 19:37:20 -05:00 · 2026-03-27 19:18:00 -05:00 · 2026-03-27 19:16:07 -05:00 · 2026-03-27 19:06:43 -05:00 · 2026-03-27 19:06:37 -05:00
46 changed files with 815 additions and 2063 deletions
@@ -9,7 +9,6 @@ creation_rules:
    - age:
      - *john-pc
      - *soteria
-      - *test-nix
  - path_regex: john-p14s/secrets\.yaml$
    key_groups:
    - age:
@@ -1,28 +1,12 @@
 {
  "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": 1776202746,
-        "narHash": "sha256-RZVtJefKKy3Z2UvKWSbtRF3cUxt/2fHga2adN6MZQ1U=",
+        "lastModified": 1773637821,
+        "narHash": "sha256-Cp1x/5/97iNjXOI5hLCA51BwR6hc1dWJiZp4VPogkTw=",
        "owner": "vic",
        "repo": "flake-file",
-        "rev": "7d16dfaeb912d5efdff0d0eda2aabc0c934168dd",
+        "rev": "bb9fbe00ba6a1945fbdd6973c2585ab770f404b0",
        "type": "github"
      },
      "original": {
@@ -38,32 +22,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1775087534,
-        "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
+        "lastModified": 1772408722,
+        "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "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",
+        "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3",
        "type": "github"
      },
      "original": {
@@ -95,11 +58,11 @@
        "nixpkgs": "nixpkgs"
      },
      "locked": {
-        "lastModified": 1776562531,
-        "narHash": "sha256-Lh5Ns9DI67E+lSMOCGK0S+mFPy0mz0yOGiJTUXiR9JI=",
+        "lastModified": 1774647770,
+        "narHash": "sha256-UNNi14XiqRWWjO8ykbFwA5wRwx7EscsC+GItOVpuGjc=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "5b56ad02dc643808b8af6d5f3ff179e2ce9593f4",
+        "rev": "02371c05a04a2876cf92e2d67a259e8f87399068",
        "type": "github"
      },
      "original": {
@@ -123,43 +86,6 @@
        "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",
@@ -184,11 +110,11 @@
    "nixos-hardware": {
      "flake": false,
      "locked": {
-        "lastModified": 1775490113,
-        "narHash": "sha256-2ZBhDNZZwYkRmefK5XLOusCJHnoeKkoN95hoSGgMxWM=",
+        "lastModified": 1774567711,
+        "narHash": "sha256-uVlOHBvt6Vc/iYNJXLPa4c3cLXwMllOCVfAaLAcphIo=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "c775c2772ba56e906cbeb4e0b2db19079ef11ff7",
+        "rev": "3f6f874dfc34d386d10e434c48ad966c4832243e",
        "type": "github"
      },
      "original": {
@@ -199,11 +125,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1775423009,
-        "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=",
+        "lastModified": 1774106199,
+        "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9",
+        "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655",
        "type": "github"
      },
      "original": {
@@ -215,39 +141,30 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1776329215,
-        "narHash": "sha256-mBqzkn7oJti2hqeO8iTbDxKw+1ifxpP53feQ0CEXies=",
-        "rev": "b86751bc4085f48661017fa226dee99fab6c651b",
+        "lastModified": 1774273680,
+        "narHash": "sha256-WLxi1vfcykjq9Yb2umqBJs6lVM6MpV2tXfcrAjroxUk=",
+        "rev": "fdc7b8f7b30fdbedec91b71ed82f36e1637483ed",
        "type": "tarball",
-        "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre981196.b86751bc4085/nixexprs.tar.xz"
+        "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre968305.fdc7b8f7b30f/nixexprs.tar.xz"
      },
      "original": {
        "type": "tarball",
        "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"
      }
    },
-    "nvf": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "flake-parts": "flake-parts_2",
-        "mnw": "mnw",
-        "ndg": "ndg",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "systems": "systems_2"
-      },
+    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1776608870,
-        "narHash": "sha256-lBKrueFu15TdmtMF6GsiSVCifwdrUBYFoa3+zZjYTFM=",
-        "owner": "notashelf",
-        "repo": "nvf",
-        "rev": "d9ba7f0a9ed6c016dc9e526cc606d1a2f7898cd4",
+        "lastModified": 1773840656,
+        "narHash": "sha256-9tpvMGFteZnd3gRQZFlRCohVpqooygFuy9yjuyRL2C0=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "9cf7092bdd603554bd8b63c216e8943cf9b12512",
        "type": "github"
      },
      "original": {
-        "owner": "notashelf",
-        "repo": "nvf",
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
        "type": "github"
      }
    },
@@ -263,10 +180,8 @@
        "nixpkgs-lib": [
          "nixpkgs"
        ],
-        "nvf": "nvf",
        "sops-nix": "sops-nix",
-        "wrapper-modules": "wrapper-modules",
-        "wrappers": "wrappers"
+        "wrapper-modules": "wrapper-modules"
      }
    },
    "sops-nix": {
@@ -276,11 +191,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1776119890,
-        "narHash": "sha256-Zm6bxLNnEOYuS/SzrAGsYuXSwk3cbkRQZY0fJnk8a5M=",
+        "lastModified": 1774303811,
+        "narHash": "sha256-fhG4JAcLgjKwt+XHbjs8brpWnyKUfU4LikLm3s0Q/ic=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "d4971dd58c6627bfee52a1ad4237637c0a2fb0cd",
+        "rev": "614e256310e0a4f8a9ccae3fa80c11844fba7042",
        "type": "github"
      },
      "original": {
@@ -304,33 +219,16 @@
        "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"
-        ]
+        "nixpkgs": "nixpkgs_3"
      },
      "locked": {
-        "lastModified": 1776464146,
-        "narHash": "sha256-XwLFfJDz71vIF7BAhnbLhrzQjmDC2uXdo7N0oHUrYzA=",
+        "lastModified": 1774622331,
+        "narHash": "sha256-73C9XYuBrgo8unDbmqEFq4pNwQaSGXrTnBckqkOXmBk=",
        "owner": "BirdeeHub",
        "repo": "nix-wrapper-modules",
-        "rev": "75febede14a0845f4ef429da692a0698bf433600",
+        "rev": "364e0007179fc2c910a6588e8826fd3fd7a45c14",
        "type": "github"
      },
      "original": {
@@ -338,26 +236,6 @@
        "repo": "nix-wrapper-modules",
        "type": "github"
      }
-    },
-    "wrappers": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1776505856,
-        "narHash": "sha256-VbnOijrn4EdYYJwiNQFxQNXECKBa60U66UPxUQAGkBE=",
-        "owner": "lassulus",
-        "repo": "wrappers",
-        "rev": "738d4bf81cbf306f6917c540a5b798110e3cf1e8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "lassulus",
-        "repo": "wrappers",
-        "type": "github"
-      }
    }
  },
  "root": "root",
@@ -21,21 +21,10 @@
    };
    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";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    wrappers = {
-      url = "github:lassulus/wrappers";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    wrapper-modules.url = "github:BirdeeHub/nix-wrapper-modules";
  };
 }
@@ -4,6 +4,4 @@
    # https://github.com/vic/flake-file/tree/main/modules/dendritic
    inputs.flake-file.flakeModules.dendritic
  ];
-
-  systems = [ "x86_64-linux" "aarch64-linux" ];
 }
@@ -10,6 +10,7 @@
    home.packages = with pkgs; [
      mangohud
      sublime4
+      proton-vpn
    ];
  };
 }
@@ -1,147 +0,0 @@
-{ 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
-            '')
-          ];
-      };
-    };
-}
@@ -11,6 +11,10 @@
        pkgs.gnome-settings-daemon # For gnome systray icons
      ];
    };
+
+    # Workaround for GNOME autologin: https://github.com/NixOS/nixpkgs/issues/103746#issuecomment-945091229
+    systemd.services."getty@tty1".enable = false;
+    systemd.services."autovt@tty1".enable = false;
  };

  flake.modules.homeManager.gnome = { config, pkgs, ... }:
@@ -1,6 +1,6 @@
 # https://github.com/glabrie/dotfiles/blob/main/modules/system/settings/greetd.nix
 { inputs, ... }: {
-  flake.modules.nixos.greetd = { pkgs, lib, ... }: {
+  flake.module.nixos.greetd = { pkgs, lib, ... }: {
    services.greetd = {
      enable = true;
      settings = {
@@ -1,35 +1,26 @@
-{ self, inputs, lib, ... }:
+{ inputs, lib, ... }:
 let
-  # Options that will be in common between the nixos module and the home-manager module.
-  mkOpts = config: let cfg = config.mtls; in {
+  # Options that will be in common between
+  opts = {
    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.";
      type = lib.types.str;
    };
-    certDir = lib.mkOption {
-      description = "String path to the directory where the certs will be stored";
+    keyFilename = lib.mkOption {
+      description = "String filename for the private key";
      type = lib.types.str;
+      default = "key.pem";
    };
-    caFile = lib.mkOption {
-      description = "String path for the root CA file";
+    certFilename = lib.mkOption {
+      description = "String filename for the public certificate";
      type = lib.types.str;
-      default = "${cfg.certDir}/root_ca.crt";
+      default = "cert.pem";
    };
-    keyFile = lib.mkOption {
-      description = "String path for the private key";
+    bundleFilename = lib.mkOption {
+      description = "String filename for the mTLS key bundle";
      type = lib.types.str;
-      default = "${cfg.certDir}/key.pem";
-    };
-    certFile = lib.mkOption {
-      description = "String path for the public cert";
-      type = lib.types.str;
-      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";
+      default = "mtls.pem";
    };
    san = lib.mkOption {
      description = "List of SAN to give the mTLS cert";
@@ -42,13 +33,13 @@ let
    };
    lifetime = lib.mkOption {
      type = lib.types.str;
-      default = "24h";
+      default = "6h";
    };
    renew = {
      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 +57,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.";
@@ -83,360 +74,230 @@ let
    };
  };

-  mkMtlsGenerateScript = {
+  mkMtlsRenewScript = {
    pkgs,
-    subject,
-    provisioner,
-    san,
-    certFile,
-    keyFile,
-    bundleFile,
-    lifetime,
-    user,
-    group,
+    tlsCert,
+    tlsKey,
+    mtlsBundle,
+    reloadUnits ? [ ],
+    postCommands ? [ ],
+    systemctlArgs ? [ ],
  }:
  let
-    sanArgs = lib.concatMapStringsSep " " (s: "--san \"${s}\"") san;
+    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.writeShellApplication {
-      name = "mtls-generate";
-      runtimeInputs = with pkgs; [ coreutils step-cli ];
-      text = ''
-        set -euo pipefail
-        step ca certificate ${subject} ${certFile} ${keyFile} \
-          --provisioner ${provisioner} \
-          --not-before=-5m --not-after=${lifetime} \
-          ${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}
-      '';
+    pkgs.writeShellScriptBin "mtls-renew" ''
+      set -euo pipefail
+
+      if ${lib.getExe pkgs.step-cli} certificate needs-renewal "${tlsCert}"; then
+        echo "Renewing mTLS certificate"
+      else
+        echo "Skipping renew"
+        exit "$?"
+      fi
+
+      ${lib.getExe pkgs.step-cli} ca renew --force "${tlsCert}" "${tlsKey}"
+
+      umask 077
+      ${lib.getExe' pkgs.coreutils "cat"} "${tlsCert}" "${tlsKey}" > "${mtlsBundle}"
+
+      echo "Reloading units:"
+      ${renewReloadScript}
+
+      echo "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
+  {
+    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,
+    tlsCert,
+    tlsKey,
+    mtlsBundle,
+    reloadUnits ? [ ],
+    postCommands ? [ ],
+  }:
+  let
+    renewScript = mkMtlsRenewScript {
+      inherit pkgs tlsCert tlsKey mtlsBundle 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
 {
  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;
-        };
-      };
+      certDir = "/etc/step/certs";
+      tlsKey = "${certDir}/${cfg.keyFilename}";
+      tlsCert = "${certDir}/${cfg.certFilename}";
+      mtlsBundle = "${certDir}/${cfg.bundleFilename}";
+      sanArgs = lib.concatMapStringsSep " " (san: "--san \"${san}\"") cfg.san;
    in
    {
-      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-ca/certs";
-        };
-        certReaders = lib.mkOption {
-          description = "";
-          type = lib.types.listOf lib.types.str;
-          default = [ ];
-        };
-      };
-
+      options.mtls = opts;
      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
+          (writeShellScriptBin "mtls-generate" ''
+            set -euo pipefail
+            ${lib.getExe pkgs.step-cli} ca certificate \
+              ${cfg.subject} ${tlsCert} ${tlsKey} \
+              --provisioner ${cfg.provisioner} \
+              --not-before=-5m --not-after=${cfg.lifetime} \
+              ${sanArgs} \
+              "$@"
+            cat ${tlsCert} ${tlsKey} > ${mtlsBundle}
+          '')
+          (writeShellScriptBin "mtls-check" ''
+            ${lib.getExe pkgs.openssl} x509 \
+            -noout -subject -issuer \
+            -ext subjectAltName,extendedKeyUsage \
+            -enddate -in ${mtlsBundle}
+          '')
        ];

-        systemd.tmpfiles.rules = [
-          "d ${cfg.certDir} 0750 ${cfg.renew.user} ${cfg.renew.group} -"
-        ];
+        systemd.services.mtls-renew = lib.mkIf cfg.renew.enable (mkNixosMtlsRenewService {
+          inherit pkgs tlsCert tlsKey mtlsBundle;
+          inherit (cfg.renew) reloadUnits postCommands user group;
+        });

-        systemd.packages = lib.mkIf cfg.renew.enable [
-          mtlsRenewWrapper.outputs.systemd-system
-        ];
-
-        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;
-        };
-      };
+      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 = (mkOpts config) // {
+      options.mtls = opts // {
        certDir = lib.mkOption {
          description = "String path to where the mtls certs will be stored.";
          type = lib.types.str;
-          default = "${config.home.homeDirectory}/.step/certs";
+          default ="${config.home.homeDirectory}/.step/certs";
        };
      };

      config = {
        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;
-          })
-          (inputs.self.wrappers.mtlsCheck.apply {
-            inherit pkgs;
-            inherit (cfg) bundleFile;
-          }).wrapper
+          step-cli
+          (writeShellScriptBin "mtls-generate" ''
+            set -euo pipefail
+            ${lib.getExe pkgs.step-cli} ca certificate \
+              ${cfg.subject} ${tlsCert} ${tlsKey} \
+              --not-before=-5m --not-after=${cfg.lifetime} \
+              --provisioner ${cfg.provisioner} \
+              ${sanArgs} \
+              "$@"
+            cat ${tlsCert} ${tlsKey} > ${mtlsBundle}
+          '')
+          (writeShellScriptBin "mtls-check" ''
+            ${lib.getExe pkgs.openssl} x509 \
+            -noout -subject -issuer \
+            -ext subjectAltName,extendedKeyUsage \
+            -enddate -in ${mtlsBundle}
+          '')
+          (mkMtlsRenewScript { inherit pkgs tlsCert tlsKey mtlsBundle; })
        ];

-        systemd.user.tmpfiles.rules = lib.mkIf cfg.enable [
-          "d ${cfg.certDir} 0700 - - -" # Ensure the cert directory exists and is writable by the user
-        ];
+        systemd.user.services.mtls-renew = lib.mkIf cfg.renew.enable (mkHomeManagerMtlsRenewService {
+          inherit pkgs tlsCert tlsKey mtlsBundle;
+          inherit (cfg.renew) reloadUnits postCommands;
+        });

-        # 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
-        '';
+        systemd.user.timers.mtls-renew = lib.mkIf cfg.renew.enable (mkHomeManagerMtlsRenewTimer {
+          inherit (cfg.renew) onCalendar randomizedDelaySec;
+        });
      };
    };
-
-  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"
-        ];
-      };
-    });
-
-    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}" ];
-      };
-    });
-
-    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 +0,0 @@
-# This module provides all the shell options
-{ self, inputs, ... }: {
-  flake.modules.homeManager.shell-tools = { config, pkgs, ... }: {
-    imports = with inputs.self.modules.homeManager; [
-      # bash
-      zsh
-      files
-    ];
-
-    home.packages = with pkgs; [
-      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
-            '';
-          })
-        ];
-      });
-    };
-
-    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";
-    };
-  });
-}
@@ -4,57 +4,13 @@ let
  hostname = "janus";
 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 {
-            ca-url = "https://janus.john-stream.com/";
-            fingerprint = builtins.readFile ./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/";
-      fingerprint = builtins.readFile ./fingerprint;
-      root = ./root_ca.crt;
+      "ca-url" = "https://janus.john-stream.com/";
+      fingerprint = "2036c44f7b5901566ff7611ea6c927291ecc6d2dd00779c0eead70ec77fa10d6";
+      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 {
@@ -62,9 +18,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
@@ -84,7 +40,9 @@ in

        home-manager.users."${username}" = {
          imports = with inputs.self.modules.homeManager; [
-            mysops
+            sops
+            step-ssh-user
+            janus-ca
          ];
          shell.program = "zsh";
          docker.enable = true;
@@ -1 +0,0 @@
-2036c44f7b5901566ff7611ea6c927291ecc6d2dd00779c0eead70ec77fa10d6
@@ -3,9 +3,7 @@
  flake.modules.nixos.p14sConfiguration = { config, pkgs, lib, ... }:
    let
      hostname = "john-p14s";
-      homeDirectory = config.home-manager.users.john.home.homeDirectory;
-      flakeDir = "${homeDirectory}/Documents/dendritic";
-      selfPkgs = inputs.self.packages.${pkgs.stdenv.hostPlatform.system};
+      flakeDir = "${config.home-manager.users.john.home.homeDirectory}/Documents/dendritic";
    in
    {
      imports = [
@@ -18,16 +16,14 @@
        allowUnfree = true;
      };

-      rebuild.flakeDir = flakeDir;
-
      networking = {
        hostName = hostname;
        networkmanager.enable = true;
      };

      # Enable automatic login for the user.
-      # services.displayManager.autoLogin.enable = true;
-      # services.displayManager.autoLogin.user = "john";
+      services.displayManager.autoLogin.enable = true;
+      services.displayManager.autoLogin.user = "john";

      programs.zsh.enable = true;
      services.openssh.enable = true;
@@ -36,10 +32,11 @@
      # 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
      ];

      security.pam.services.swaylock = {};
@@ -69,25 +66,19 @@
      time.timeZone = "America/Chicago";

      # Select internationalisation properties.
-      i18n = {
-        defaultLocale = "en_US.UTF-8";
-        extraLocaleSettings = {
-          LC_ADDRESS = "en_US.UTF-8";
-          LC_IDENTIFICATION = "en_US.UTF-8";
-          LC_MEASUREMENT = "en_US.UTF-8";
-          LC_MONETARY = "en_US.UTF-8";
-          LC_NAME = "en_US.UTF-8";
-          LC_NUMERIC = "en_US.UTF-8";
-          LC_PAPER = "en_US.UTF-8";
-          LC_TELEPHONE = "en_US.UTF-8";
-          LC_TIME = "en_US.UTF-8";
-        };
-      };
+      i18n.defaultLocale = "en_US.UTF-8";

-      fonts.packages = with pkgs; [
-        nerd-fonts.hack
-        nerd-fonts.sauce-code-pro
-      ];
+      i18n.extraLocaleSettings = {
+        LC_ADDRESS = "en_US.UTF-8";
+        LC_IDENTIFICATION = "en_US.UTF-8";
+        LC_MEASUREMENT = "en_US.UTF-8";
+        LC_MONETARY = "en_US.UTF-8";
+        LC_NAME = "en_US.UTF-8";
+        LC_NUMERIC = "en_US.UTF-8";
+        LC_PAPER = "en_US.UTF-8";
+        LC_TELEPHONE = "en_US.UTF-8";
+        LC_TIME = "en_US.UTF-8";
+      };

      services.libinput.enable = true; # Enable touchpad support (enabled default in most desktopManager).
      services.fprintd.enable = true; # Enables fingerprint sensor
@@ -108,12 +99,7 @@
        # media-session.enable = true;
      };

-      home-manager.users.root = {
-        imports = with inputs.self.modules.homeManager; [
-          rebuild
-        ];
-        home.stateVersion = "25.11";
-      };
+      home-manager.useGlobalPkgs = true;
      home-manager.users.john.imports = with inputs.self.modules.homeManager; [
        gnome
        desktop
@@ -123,27 +109,12 @@
          my-vscode.enable = true;
          mysops.hostSecretFile = "${flakeDir}/modules/hosts/john-p14s/secrets.yaml";
          homeManagerFlakeDir = "${flakeDir}";
-          shell.program = "zsh";
-          home.packages = with pkgs; [
-            bash
-            discord
-            proton-vpn
-            joplin-desktop
-          ];
-          ssh.certificates.enable = true;
-          ssh.matchSets = {
-            appdaemon = true;
-            homelab = true;
-            dev = true;
-            certs = true;
-          };
+          programs.bash.enable = lib.mkForce true;
        }
      ];
      sops.defaultSopsFile = ./secrets.yaml;
-      sops.age.sshKeyPaths = [ "${homeDirectory}/.ssh/id_ed25519" ];
-      mtls = {
-        enable = true;
-        subject = hostname;
-      };
+      sops.age.sshKeyPaths = [
+        "${config.home-manager.users.john.home.homeDirectory}/.ssh/id_ed25519"
+      ];
    };
 }
@@ -12,14 +12,11 @@
      "${inputs.nixos-hardware}/lenovo/thinkpad/p14s/amd/gen4"
    ] ++ (with self.modules.nixos; [
      p14sConfiguration
-      janus-ca
-      rebuild
      sudo
      john
      gnome
      steam
      wireguard
-      mtls
      # greetd
      # niri
    ]);
@@ -1,70 +1,67 @@
-{ withSystem, self, inputs, ... }:
+{ 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}" = { config, pkgs, lib, ... }:
+  flake.modules.homeManager."${hostname}" = { pkgs, config, ... }:
  let
-    selfPkgs = inputs.self.packages.${pkgs.stdenv.hostPlatform.system};
-    resticPasswordFile = "${config.xdg.configHome}/restic/password.txt";
    flakeDir = "${config.xdg.configHome}/home-manager/jsl-dendritic";
+    certDir = "${config.mtls.certDir}";
+    mtlsBundle = "${certDir}/${config.mtls.bundleFilename}";
+    resticPasswordFile = "${config.xdg.configHome}/restic/password.txt";
  in
  {
    imports = with inputs.self.modules.homeManager; [
      rebuild
      john
+      mysops
+      janus-ca
+      step-ssh-user
      mtls
      restic
      docker
      desktop
-      step-client
-      mysops
-      # myPackage
-      # myStepClient
    ];
+    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; [
-      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
-    ];
-
    homeManagerFlakeDir = flakeDir;
    docker.enable = true;

+    step-ssh-user = {
+      enable = true;
+      principals = ["root" "${username}" "appdaemon"];
+      provisioner = "admin";
+    };
    ssh = {
      certificates.enable = true;
-      knownHosts = [
-        "fded:fb16:653e:25da:be24:11ff:fea0:753f ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ9ZqiWPrCwHjxFCiu0lT4rlQs7KyMapxKJQQ5PJP1eh"
-      ];
      matchSets = {
        certs = true;
        appdaemon = true;
        homelab = true;
        dev = true;
-        tailscale = true;
      };
    };

@@ -104,13 +101,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,44 +1,26 @@
 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]
+    admin_password: ENC[AES256_GCM,data:4pnSq0f1iTNFWn/Qcw+J7LWIXXd/j5v3WwFSzXfqgKA=,iv:/usSHYST8zv7AMvDNuW/fFLL+40IrderjL6bUWzBNd4=,tag:V/q1+SjIcYsZ0+PC/Q7c1A==,type:str]
 sops:
    age:
        - recipient: age1ykcs39e62pz3xu6cedg8ea685kv5d5qsrhgkndygzm8rx30xd5ys5t3qxt
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA5QThHOFdVQ0F6ZDE3QXdL
-            QVF0WW5yRkNtNXIyRm1LeEhwY2dRRWo0WENZCmZoWmlXZDh4ZGlUR2JYOUxuaVAx
-            WjhXVHBMNWdrdkgvTENJR2RpWldkNTAKLS0tIEF1bS9JSnFTbytBa1U5RjVzWkd3
-            S0pKVVI2RFN5a1BMYXBEY3VOUUM5QTAKNarYZm9DKRQhosSJBn9yryFxDkmFTV/o
-            i8b/tZ1ZybjEXX+X1EsgylM5u8iKkbEyUzqKO0E0gpg4qXSsJaMMYQ==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB0V1JsVDhnMHpaNHRQRCtw
+            V3JMQm1SREZSYUpaYmZNQ1FEVmN0VFZRSlQ0Ck9wQlpqZFBrRUJENWVBbTd5cVVo
+            ZlhYZnhGamk1ZlQ0N001ZWcrQ1Evb3cKLS0tIHpuTWhRTU1QeWFRUytiU21CMW94
+            eFc0ankvcWhqK3Q4MjRCVC9nTlJteU0K1tJvYM2M1XmlsCTpadHyf6EGE2Lg+XBL
+            TGTjMPSWqClWYB9HFZ4nCurEK/JidBanmGkc0Y9eFz9XYKl7rtyXUw==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1h0prahyukq4l564yqwgcpg3g6gdrjflk0suklussjjrjstxd9uesws8633
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBhdEN2M1lkMFoyQzg3bCsz
-            cVB0NUlkV1JPRjQ1TW5RSVFHUjdNMERoRXlzCk9tc25iMG00TkZjWjk2S2cyVE1J
-            cUFITDh2SkZGN0lpeWJVcWM3V3JrTTQKLS0tIENOWVBzTFYrdHRsMERwV0RKS01j
-            QVI5TVl4L0dwOWpoQ1I2THZ6cWovWGMKIo1x1ZbdTyr/dNlPhvuomfk2MoPLsHyU
-            N3CP3Scu3aZ7vqVua7uwtv4xQqyQI/yOnFjwxrVYPJ+N5Y/b4wsC6A==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBNRzFlWTNxSGpaNU85QTFj
+            SnlRZkpZQTZQVjNqWFhLMHhKVm5ZVXB4Rms0CmZQclFzYkpWLzlqT2xNUTJMd2dJ
+            Wm5PQXNabjRwV1hVRXFGVmxteGk2emMKLS0tIG5kcm5KamxNZmpKVGt5bUo1dVg5
+            dFN2RGdqM29mM3hadXpBakY4QThxZnMKI9RbfXJHIHvYHy/2corfwDq+OHRPrmkA
+            tWLH/KWqwGt0hvc5j8bUfRECgjdXmbC9kpAgDs8PhJF+X1ijVFrIYg==
            -----END AGE ENCRYPTED FILE-----
-        - recipient: age1gvplss0ddmyf6vpjy363wu3n057vhm0j6n7tc94cxd8kadapypws5mtaj0
-          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]
+    lastmodified: "2026-03-23T22:27:45Z"
+    mac: ENC[AES256_GCM,data:tQ8EMXWqw7wd/QZqUPn/sAczk0G4jSUR96AF83cmJGYuoZkMkOzsMFt448IkWxNWOJHPmIc0vs+c3ngQxHyx6Uf9jVWzMkvfdzMYj82QuLsmXQ9e4/IAE9h+52uagbwgoOJwPCF+AQetSHez/jWPPIQPN5DLfz0edg4xYReX7DA=,iv:GsvotFkehIz5L4I9j0oQ89oM5XjZQAr6vrVd79tqFes=,tag:wLi4sXz8JqvaoUaYjEj/vA==,type:str]
    unencrypted_suffix: _unencrypted
-    version: 3.12.2
+    version: 3.12.1
@@ -1,4 +1,4 @@
-{ withSystem, self, inputs, lib, ... }:
+{ inputs, ... }:
 let
  username = "john";
  hostname = "soteria";
@@ -7,114 +7,72 @@ 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.docker
-      nixos.mtls
-      nixos.janus-ca
-      nixos.forgejo
+      # nixos.mtls
      # nixos.restic-server
      # nixos.restic-envoy
-      ({ config, pkgs, ... }: {
+      {
        networking.hostName = hostname;
-        time.timeZone = "America/Chicago";
-
-        # Removes password for sudo
-        security.sudo-rs.extraRules = lib.mkAfter [
-          {
-            users = [ username ];
-            commands = [
-              {
-                command = "ALL";
-                options = [ "NOPASSWD" ];
-              }
-            ];
-          }
+        nix.settings.build-dir = "/var/tmp/nix-build";
+        systemd.tmpfiles.rules = [
+          "d /var/tmp/nix-build 1777 root root -"
        ];
-
-        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;
+        step-ssh-host = {
+          hostname = hostname;
        };

-        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}"
+        home-manager.users."${username}" = {
+          imports = with inputs.self.modules; [
+            homeManager"${hostname}"
          ];
        };
-
-        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 ];
-
-        environment.systemPackages = [
-          inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.my-neovim
-          inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.jsl-zsh
-        ];
-      })
+      }
    ];
  };

-  flake.modules.homeManager.soteria = { config, pkgs, lib, ... }: {
-    imports = [
-      inputs.self.modules.homeManager.rebuild
-      inputs.self.modules.homeManager.mysops
-      ({ config, pkgs, lib, ... }: {
-        homeManagerFlakeDir = "${config.xdg.configHome}/home-manager";
-        docker.enable = true;
-
-        # This will provide the edit-secrets script targeting this file
-        mysops.hostSecretFile = "${config.homeManagerFlakeDir}/modules/hosts/soteria/secrets.yaml";
-      })
+  flake.modules.homeManager."${hostname}" = { config, lib, pkgs, ... }: {
+    imports = with inputs.self.modules; [
+      homeManager.rebuild
+      homeManager.mysops
+      homeManager.janus-ca
+      homeManager.mtls
+      homeManager.docker
    ];
-  };

-  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
+    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";
+
+    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 {
+    pkgs = import inputs.nixpkgs { system = "x86_64-linux"; };
+    modules = with inputs.self.modules; [
+      homeManager."${username}"
+      homeManager."${hostname}"
+    ];
+  };
 }
@@ -11,11 +11,12 @@ 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; [
-            mysops
+            sops
          ];
          shell.program = "zsh";
          docker.enable = true;
@@ -1,69 +1,22 @@
 { self, inputs, ... }:
 {
-  flake.modules.nixos.rebuild =
-    { config, pkgs, lib, ... }:
+  flake.modules.homeManager.rebuild =
+    { pkgs, lib, config, ... }:
    let
-      flakeDir = config.rebuild.flakeDir;
+      nixBin = lib.getExe pkgs.nix;
+      flakeDir = config.homeManagerFlakeDir;
      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 "$@"'';
-      };
-    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;
-
-      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"
-        '';
-      };
+      nhms = (pkgs.writeShellScriptBin "nhms" ''
+        HOSTNAME=${hostnameCmd}
+        ${echoCmd} "Switching to the $HOSTNAME home-manager profile"
+        ${lib.getExe pkgs.home-manager} switch --impure --flake ${flakeDir}#$HOSTNAME
+      '');
+      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 = {
@@ -72,77 +25,58 @@
          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" ];
-              })
-            ];
-          })
+
+          #
+          # Flake-Parts checks
+          #
+          (writeShellScriptBin "flake-parts-check" ''
+            cd ${flakeDir}
+            ${nixBin} run "${flakeDir}#write-flake"
+            ${nixBin} flake check
+          '')
+
+          #
+          # 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
+          '')
        ];
      };
    };
-
-  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;
-    };
-  });
 }
@@ -1,50 +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, inputs, ... }:
+{ self, ... }:
 {
-  config.flake.factory.user = {
-    username,
-    isAdmin ? false,
-    noPassword ? false,
-    # homeImports ? [ ],
-    # homePackages ? [ ],
-  }: {
-    nixos."${username}" = { config, lib, pkgs, ... }: {
-      imports = [
-        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}" = {};
-
+  config.flake.factory.user = username: isAdmin: {
+    nixos."${username}" = { lib, pkgs, ... }: {
      users.users."${username}" = {
        isNormalUser = true;
-        group = username;
        home = "/home/${username}";
-        shell = pkgs.zsh;
-        extraGroups = [ "input" "networkmanager" ]
-          ++ lib.optional isAdmin "wheel"
-          ++ lib.optional config.virtualisation.docker.enable "docker"
-          ++ lib.optional (isAdmin && config.services.forgejo.enable) config.services.forgejo.group
-          ++ lib.optional (isAdmin && config.services.postgresql.enable) "postgres";
+        extraGroups = [
+          "input"
+          "networkmanager"
+        ] ++ lib.optionals isAdmin [
+          "docker"
+          "wheel"
+        ];
      };

-      programs.zsh.enable = true;
+      # Removes password for sudo
+      security.sudo-rs = lib.mkIf isAdmin {
+        enable = true;
+        extraRules = [{
+          users = [ "${username}" ];
+          commands = [{
+            command = "ALL";
+            options = [ "NOPASSWD" ];
+          }];
+        }];
+      };

-      security.sudo-rs.enable = lib.mkIf isAdmin true;
-
-      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}";
-        home.packages = with pkgs; [
-          # fzf zoxide starship
+        imports = [
+          self.modules.homeManager."${username}"
        ];
      };
    };
@@ -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,56 +1,44 @@
 { 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.";
-    };
+  flake.modules.nixos.login-text = { config, ... }: {
+    programs.rust-motd = {
+      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";
+        };

-    config = {
-      programs.rust-motd = {
-        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";
-          };
+        last_login = {
+          john = 3;
+          root = 3;
+        };

-          last_login = {
-            john = 3;
-            root = 3;
-          };
+        service_status = {
+          Docker = "docker";
+          SSH = "sshd.socket";
+          "SSH Cert Renewal" = "step-ssh-host-renew.timer";
+          "mTLS Renewal" = "mtls-renew.timer";
+        };

-          service_status = lib.mkMerge [
-            defaultServiceStatus
-            config.loginText.extraServiceStatus
-          ];
+        # This calculation is wrong for LXCs
+        # uptime = {
+        #   prefix = "Uptime";
+        # };

-          # This calculation is wrong for LXCs
-          # uptime = {
-          #   prefix = "Uptime";
-          # };
+        memory = {
+          swap_pos = "beside";
+        };

-          memory = {
-            swap_pos = "beside";
-          };
-
-          filesystems = {
-            root = "/";
-          };
+        filesystems = {
+          root = "/";
        };
      };
    };
@@ -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 = {
-        "D" = "delete";
-      };
-      settings = {
-        preview = true;
-        hidden = true;
-        drawbox = true;
-        icons = true;
-        ignorecase = true;
-      };
+    programs.lf.enable = true;
+    programs.lf.cmdKeybindings = {
+      "D" = "delete";
    };
+
+    home.packages = with pkgs; [
+      gdu
+      lf
+      # TODO: find a CLI file editor that's not insane
+    ];
  };
 }
@@ -8,17 +8,6 @@
  };

  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";
@@ -33,7 +22,7 @@
    programs.ghostty = {
      enable = true;
      enableZshIntegration = true;
-      package = ghosttyPackage;
+      package = config.lib.nixGL.wrap pkgs.ghostty;
      settings = {
        command = "TERM=xterm-256color ${lib.getExe pkgs.zsh}";
        font-size = 12;
@@ -43,7 +32,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;
@@ -70,15 +58,11 @@
    };

    # https://github.com/ghostty-org/ghostty/discussions/3763#discussioncomment-11699970
-    xdg.desktopEntries."com.mitchellh.ghostty" =
-    let
-      ghosttyCmd = lib.getExe ghosttyPackage;
-    in
-    {
+    xdg.desktopEntries."com.mitchellh.ghostty" = {
      name = "Ghostty";
      type = "Application";
      comment = "A terminal emulator";
-      exec = ghosttyCmd;
+      exec = "nixGLMesa ghostty";
      icon = "com.mitchellh.ghostty";
      terminal = false;
      startupNotify = true;
@@ -95,7 +79,7 @@
      actions = {
        new-window = {
          name = "New Window";
-          exec = ghosttyCmd;
+          exec = "nixGLMesa ghostty";
        };
      };
    };
@@ -1,158 +0,0 @@
-{ 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";
-    });
-  };
-}
@@ -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,10 +1,16 @@
 { self, inputs, ... }: {
-  flake.modules.homeManager.onepassword = { config, ... }: {
+  flake.modules.homeManager.onepassword = { config, pkgs, lib, ... }: {
    home.file.".config/1Password/ssh/agent.toml".text = ''
      # https://developer.1password.com/docs/ssh/agent/config
      [[ssh-keys]]
      vault = "Private"
    '';
-    programs.ssh.matchBlocks."*".identityAgent = "${config.home.homeDirectory}/.1password/agent.sock";
+    programs.ssh = {
+      enable = true;
+      extraConfig = ''
+        Host *
+            IdentityAgent ${config.home.homeDirectory}/.1password/agent.sock
+      '';
+    };
  };
 }
@@ -0,0 +1,37 @@
+# This module provides all the shell options
+{ 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
+      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
+        jq
+        ripgrep
+      ];
+    };
+  };
+}
@@ -1,4 +1,4 @@
-{ self, inputs, ... }:
+{ inputs, ... }:
 let
  inputs' = inputs;  # save a reference before it's shadowed
 in
@@ -14,84 +14,84 @@ 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 = [
+      # This import makes the sops config attribute available below
+      inputs'.sops-nix.homeManagerModules.sops
+    ];
+
+    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;
+        default = null;
+      };
+    };
+
+    config =
    let
-      cfg = config.mysops;
+      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
    {
-      imports = [
-        # This import makes the sops config attribute available below
-        inputs'.sops-nix.homeManagerModules.sops
-      ];
+      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

-      options.mysops = {
-        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;
-          default = null;
-        };
-      };
+          if [ ! -f "${config.ssh.IdentityFile}" ]; then
+            ${echo} "SSH identity file not found: ${config.ssh.IdentityFile}" >&2
+            exit 1
+          fi

-      config =
-        let
-          my-sops = (inputs.self.wrappers.mySops.apply {
-            inherit pkgs;
-            sshKey = config.ssh.identityFile;
-          }).wrapper;
-        in
-        {
-          # 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;
-            defaultSopsFormat = "yaml";
-            age.sshKeyPaths = [ "${config.ssh.identityFile}" ];
-          };
+          if [ -e "${cfg.ageKeyFile}" ]; then
+            ${echo} "Refusing to overwrite existing age key file: ${cfg.ageKeyFile}" >&2
+            exit 1
+          fi

-          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"
-              ];
-            })
+          ${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;

-          ]
-          ++ lib.optional (cfg.hostSecretFile != null) (inputs.wrappers.lib.wrapPackage {
-            binName = "edit-secrets";
-            inherit pkgs;
-            package = my-sops;
-            args = [ cfg.hostSecretFile ];
-          });
-        };
-    };
+      home.shellAliases.sops = "${sopsBin} --config ${sopsConfigPath}";

-  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";
+      # Option definitions for the sops home-manager module:
+      # https://github.com/Mic92/sops-nix/blob/master/modules/home-manager/sops.nix
+      sops = {
+        defaultSopsFile = sopsSecretsPath;
+        defaultSopsFormat = "yaml";
+        age.sshKeyPaths = [ "${config.ssh.IdentityFile}" ];
      };
    };
-
-    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;
-  };
 }
@@ -1,13 +1,20 @@
-{ self, inputs, ... }:
+{ inputs, ... }:
 {
  flake.modules.nixos.docker = {
-    virtualisation.docker.enable = true;
-    home-manager.sharedModules = [ inputs.self.modules.homeManager.docker ];
+    virtualisation.docker = {
+      enable = true;
+    };
+    home-manager.sharedModules = with inputs.self.modules.homeManager; [
+      docker
+    ];
  };

  flake.modules.homeManager.docker = { config, lib, pkgs, ... }:
  {
-    options.docker.enable = lib.mkEnableOption "Docker tools and utilities";
+    options.docker = {
+      enable = lib.mkEnableOption "Docker tools and utilities";
+    };
+
    config = lib.mkIf config.docker.enable {
      programs.lazydocker.enable = true;
      programs.docker-cli.enable = true;
@@ -1,4 +1,4 @@
-{ self, inputs, ... }: {
+{ inputs, ... }: {
  flake.modules.nixos.restic-server = { config, pkgs, lib, ... }: {
    services.restic.server = {
      enable = true;
@@ -19,11 +19,6 @@
          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;
@@ -49,24 +44,29 @@
        };
      };

-      config = {
+      config = let
+        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 = cfg.repoUrl;
+          RESTIC_REPOSITORY = resticRepository;
          RESTIC_PASSWORD_FILE = cfg.passwordFile;
-          RESTIC_CACERT = config.mtls.caFile;
-          RESTIC_TLS_CLIENT_CERT = config.mtls.bundleFile;
+          RESTIC_CACERT = caCert;
+          RESTIC_TLS_CLIENT_CERT = mtlsClientCert;
        };
        
        # 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=${config.mtls.caFile}"
-          "RESTIC_TLS_CLIENT_CERT=${config.mtls.bundleFile}"
+          "RESTIC_CACERT=${caCert}"
+          "RESTIC_TLS_CLIENT_CERT=${mtlsClientCert}"
        ];

        services.restic = {
          enable = true;
          backups.${cfg.repoName} = {
-            repository = cfg.repoUrl;
+            repository = resticRepository;
            passwordFile = cfg.passwordFile;
            paths = cfg.paths;
            timerConfig = {
@@ -1,32 +1,22 @@
-{ inputs, ... }:
+{inputs, ... }:
 let
  userName = "john";
  sshHostCAPubKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBNug18oLH0vZxnibXJzMJvTWFPZTnSlhCDDVi+rHhgnIum6ZXQ4SF+VHOOAM5BbzZmMKitNJ5lcrGP15Eur7DzQ=";
 in
 {
-  flake.modules.nixos.ssh = { config, pkgs, lib, ... }:
+  flake.modules.nixos.ssh = { pkgs, config, lib, ... }:
  let
    cfg = config.ssh;
-    configDir = "/etc/ssh";
+    userCAPath = "ssh/ssh_user_ca.pub";
+    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 = ../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";
+          default = ../../keys/ssh_user_ca.pub;
        };
      };
    };
@@ -39,16 +29,16 @@ in
          {
            PasswordAuthentication = false;
            KbdInteractiveAuthentication = false;
-            HostKey = "${configDir}/${cfg.hostKey}";
+            HostKey = "/etc/${hostKeyFile}";
          }
          (lib.mkIf cfg.certificates.enable {
-            TrustedUserCAKeys = "${configDir}/${cfg.certificates.userCAFile}";
-            HostCertificate = "${configDir}/${cfg.hostKey}-cert.pub";
+            TrustedUserCAKeys = "/etc/${userCAPath}";
+            HostCertificate = "/etc/${hostKeyFile}-cert.pub";
          })
        ];
      };

-      environment.etc."ssh/${cfg.certificates.userCAFile}" = lib.mkIf cfg.certificates.enable {
+      environment.etc."${userCAPath}" = lib.mkIf cfg.certificates.enable {
        source = cfg.certificates.userCA;
      };

@@ -65,57 +55,52 @@ in
    };
  };

-  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
+  flake.modules.homeManager.ssh = { pkgs, config, lib, ... }:
  {
-    options.ssh = with lib; {
-      identityFile = mkOption {
+    options.ssh = {
+      IdentityFile = lib.mkOption {
        # Intentionally not using a path type here because that will end up with the private key getting copied into the store
-        type = types.str;
+        type = lib.types.str;
        default = "${config.home.homeDirectory}/.ssh/id_ed25519";
        description = "Path to the SSH identity file.";
      };

      certificates = {
-        enable = mkEnableOption "Enable SSH client certificates";
+        enable = lib.mkEnableOption "Enable SSH user certificates";
+        # sshCertProvisioner = lib.mkOption {
+        #   type = lib.types.str;
+        #   default = "admin";
+        # };
      };

-      knownHostsFile = mkOption {
-        type = types.str;
-        default = "${configDir}/known_hosts";
-      };
-
-      knownHosts = mkOption {
-        description = "";
-        type = types.listOf types.str;
-        default = [ ];
+      knownHostsFile = lib.mkOption {
+        type = lib.types.str;
+        default = "${config.home.homeDirectory}/.ssh/known_hosts";
      };

      matchSets = {
-        appdaemon = mkEnableOption "Enable AppDaemon SSH targets";
-        certs = mkEnableOption "Enable Janus and Soteria SSH targets";
-        homelab = mkEnableOption "Enable various Homelab targets";
-        dev = mkEnableOption "Enable development targets";
-        tailscale = mkEnableOption "Enable tailscale targets";
+        appdaemon = lib.mkEnableOption "Enable AppDaemon SSH targets";
+        certs = lib.mkEnableOption "Enable Janus and Soteria SSH targets";
+        homelab = lib.mkEnableOption "Enable various Homelab targets";
+        dev = lib.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 [
-            "@cert-authority 192.168.1.* ${sshHostCAPubKey}"
-            "@cert-authority *.john-stream.com ${sshHostCAPubKey}"
+          [
+            "fded:fb16:653e:25da:be24:11ff:fea0:753f ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ9ZqiWPrCwHjxFCiu0lT4rlQs7KyMapxKJQQ5PJP1eh"
          ]
+          ++ (lib.optional cfg.certificates.enable "@cert-authority 192.168.1.* ${sshHostCAPubKey}")
+          ++ (lib.optional cfg.certificates.enable "@cert-authority *.john-stream.com ${sshHostCAPubKey}")
        );
      };

@@ -124,33 +109,27 @@ in
        enableDefaultConfig = false;
        extraConfig = ''
          SetEnv TERM="xterm-256color"
+          IdentityAgent ~/.1password/agent.sock
        '';

        matchBlocks = lib.mkMerge [
          {
-            "john-pc-ubuntu" = {
-              hostname = "192.168.1.85";
+            "*" = {
+              user = "john";
+
+              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" = {
@@ -176,10 +155,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 +173,7 @@ 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";
-              };
+              identityFile = identityFile;
            };
          })
        ];
@@ -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 = with pkgs; [ coreutils systemd step-cli openssh  ];
+        path = [ pkgs.step-cli pkgs.openssh pkgs.coreutils pkgs.systemd ];
        serviceConfig = {
          Type = "oneshot";
          User = "root";
@@ -17,9 +17,6 @@ in
        crt = "";
      };
    };
-    environment.systemPackages = with pkgs; [
-      step-ca
-      step-cli
-    ];
+    environment.systemPackages = with pkgs; [ step-ca step-cli ];
  };
 }
@@ -1,10 +1,6 @@
-{ self, inputs, lib, ... }:
+{ inputs, ... }:
 let
  username = "john";
-  baseUserModules = self.factory.user {
-    username = username;
-    isAdmin = true;
-  };
 in
 {
  flake.meta.users."${username}" = {
@@ -12,38 +8,36 @@ 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}" = { ... }: {
-      imports = [
-        baseUserModules.nixos."${username}"
-      ];
-      users.users."${username}" = {
-        openssh.authorizedKeys.keys = inputs.self.meta.users."${username}".authorizedKeys;
-      };
+  flake.modules.nixos."${username}" = {
+    imports = [
+      inputs.home-manager.nixosModules.home-manager
+      (inputs.self.factory.user username true).nixos."${username}"
+    ];
+    users.users."${username}" = {
+      openssh.authorizedKeys.keys = inputs.self.meta.users."${username}".authorizedKeys;
+      extraGroups = [ "docker" ];
    };
+  };

-    # This module will be imported by the user factory
-    homeManager."${username}" = { pkgs, ... }:
-      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;
-      };
+  flake.modules.homeManager."${username}" = with inputs.self.meta.users."${username}"; {
+    home.stateVersion = "25.11";
+    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
+    ];
  };
 }
Author	SHA1	Message	Date
John Lancaster	8c099196b3	moved mtls to feature	2026-03-27 20:04:59 -05:00
John Lancaster	ad7ef430e6	added test-build	2026-03-27 19:37:20 -05:00
John Lancaster	00c4cf5289	flake.lock update	2026-03-27 19:18:00 -05:00
John Lancaster	fa787740e9	nixify	2026-03-27 19:16:07 -05:00
John Lancaster	8298443438	prune	2026-03-27 19:06:43 -05:00
John Lancaster	5eb26af6e5	comments	2026-03-27 19:06:37 -05:00
John Lancaster	cc323a520a	setting flake dir	2026-03-27 19:01:06 -05:00
John Lancaster	c3a6a0bbdc	more nix-y	2026-03-27 18:55:48 -05:00
John Lancaster	b1424a2e2f	reformatted	2026-03-27 18:45:51 -05:00
John Lancaster	755846e9aa	disconnect cleanup	2026-03-27 18:40:15 -05:00
John Lancaster	c946a9fdf7	fixed config var	2026-03-27 18:28:36 -05:00
John Lancaster	ece89bfb43	config pass thru	2026-03-27 18:26:23 -05:00
John Lancaster	f9546b7448	moved key def	2026-03-27 18:26:00 -05:00
John Lancaster	13e2045070	setting age key paths	2026-03-27 18:21:43 -05:00
John Lancaster	5925c733d6	sudo fixes	2026-03-27 18:11:21 -05:00
John Lancaster	1609777cfa	added sudo to nfs	2026-03-27 18:08:55 -05:00
John Lancaster	2d7e608319	fix	2026-03-27 18:06:48 -05:00
John Lancaster	af87f88856	rebuild scripts in john-p14s	2026-03-27 18:05:48 -05:00
John Lancaster	40b58d2c82	nixos rebuild scripts	2026-03-27 17:59:29 -05:00
John Lancaster	9a05384ae5	variables	2026-03-27 09:00:35 -05:00
John Lancaster	316f5f59a6	variable	2026-03-27 08:43:06 -05:00
John Lancaster	5eda449dde	formatting	2026-03-26 23:34:25 -05:00
John Lancaster	819d339b65	lockfile update	2026-03-26 23:31:39 -05:00
John Lancaster	7eae99186d	re-enabled wireguard	2026-03-26 23:31:22 -05:00
John Lancaster	aa7fded02e	more description	2026-03-26 23:28:34 -05:00
John Lancaster	7be1397489	moved inline module	2026-03-26 23:28:25 -05:00
John Lancaster	589170c4e8	prune	2026-03-26 23:21:42 -05:00
John Lancaster	d3fcf013b6	pruning	2026-03-26 23:07:29 -05:00
John Lancaster	409fe16b9f	secrets update	2026-03-26 22:59:25 -05:00
John Lancaster	13c7ab8d6a	secrets update	2026-03-26 22:47:21 -05:00
John Lancaster	16a39dc46e	renamed option	2026-03-26 22:43:19 -05:00
John Lancaster	51103ec4a1	flake.lock update	2026-03-26 22:32:51 -05:00
John Lancaster	450be7531d	optional vscode in desktop	2026-03-26 22:32:43 -05:00
John Lancaster	d008fa5814	rename	2026-03-26 22:32:34 -05:00
John Lancaster	9aadd03d66	lzg alias	2026-03-26 22:24:34 -05:00
John Lancaster	cb0c671f47	added git credential oauth	2026-03-26 21:53:16 -05:00
John Lancaster	608a261807	reworked gnome extensions	2026-03-26 21:50:07 -05:00
John Lancaster	1b2698e629	added gnome key bindings	2026-03-26 21:39:20 -05:00
John Lancaster	3a416e716d	added vscode module to john-p14s	2026-03-26 21:36:12 -05:00
John Lancaster	52eda301e8	started p14s secrets	2026-03-26 21:26:51 -05:00
John Lancaster	7f69fc6dce	disabling wireguard until I can add the key to a sops file	2026-03-26 19:09:38 -05:00
John Lancaster	5ce7ace964	silencing warning about gtk stuff	2026-03-26 19:04:52 -05:00
John Lancaster	f0cab4ad1f	updated and moved wireguard	2026-03-26 18:57:28 -05:00
John Lancaster	061d5a6f47	added wireguard nixos module	2026-03-26 18:42:31 -05:00
John Lancaster	6ef67a575a	added steam nixos module	2026-03-26 18:39:34 -05:00
John Lancaster	ea7e53f04d	added gnome home module to john-p14s	2026-03-26 18:36:13 -05:00
John Lancaster	4c7da4abfa	nixpkgs follows issue	2026-03-26 18:30:28 -05:00
John Lancaster	238e64437c	desktop imports	2026-03-26 18:23:59 -05:00
John Lancaster	5dcac56860	removed 1password shell plugin	2026-03-26 18:17:03 -05:00
John Lancaster	73950c72ed	home-manager to inputs in john	2026-03-26 18:04:18 -05:00
John Lancaster	bdf187b4f9	amd hardware updates	2026-03-26 18:03:56 -05:00
John Lancaster	336166d22d	fix	2026-03-26 17:56:54 -05:00
John Lancaster	ac525dda78	typo	2026-03-26 17:56:15 -05:00
John Lancaster	4cd6972302	added sudo and john nixos modules to p14s	2026-03-26 17:55:09 -05:00
John Lancaster	76be519c0f	added graphics options to p14s hardware	2026-03-26 17:52:41 -05:00
John Lancaster	c578bf00a1	formatting	2026-03-26 17:50:19 -05:00
John Lancaster	429d1b7f11	config	2026-03-26 17:39:03 -05:00
John Lancaster	942cc13cf0	displayManager settings	2026-03-26 17:38:12 -05:00
John Lancaster	f1e395fd30	enabled touchpad support	2026-03-26 17:37:59 -05:00
John Lancaster	0ebd91234e	enabled gnome desktopmanager	2026-03-26 17:31:42 -05:00
John Lancaster	4a235fe1e1	formatting	2026-03-26 17:31:22 -05:00
John Lancaster	4465fd0f90	insecure openssl-1.1.1w	2026-03-26 17:25:03 -05:00
John Lancaster	9c733a135a	onepassword	2026-03-26 17:22:18 -05:00
John Lancaster	193e5ee40d	pkgs	2026-03-26 17:12:51 -05:00
John Lancaster	71a04c627a	desktop fixes	2026-03-26 17:11:33 -05:00
John Lancaster	338ef34212	typo	2026-03-26 16:58:22 -05:00
John Lancaster	1f5319252e	lib	2026-03-26 16:57:51 -05:00
John Lancaster	29853f4a35	passing thru pkgs	2026-03-26 16:56:52 -05:00
John Lancaster	9f2a55cfd6	fixes	2026-03-26 16:56:17 -05:00
John Lancaster	1d8e721171	gnome on p14s	2026-03-26 16:53:32 -05:00
John Lancaster	731277aad8	gnome consolidation	2026-03-26 16:49:14 -05:00
John Lancaster	bab4dfa131	added ripgrep to shell-tools	2026-03-25 22:32:01 -05:00
John Lancaster	2c8e7e3b63	added niri/noctalia	2026-03-25 22:09:25 -05:00
John Lancaster	2ca7dcc464	reformat	2026-03-25 21:56:59 -05:00
John Lancaster	8b4a2a36b6	pruning	2026-03-25 18:59:17 -05:00
John Lancaster	fae745af5a	prune	2026-03-25 18:46:02 -05:00
John Lancaster	0d39ac7ca2	prune	2026-03-25 18:44:45 -05:00
John Lancaster	5bbf20aabd	prune	2026-03-25 18:44:37 -05:00
John Lancaster	3da3cc2dc6	cleanup	2026-03-25 18:33:54 -05:00
John Lancaster	18b6cc16ad	more pruning	2026-03-25 18:17:07 -05:00
John Lancaster	d8ced840ca	pruning	2026-03-25 18:07:19 -05:00
John Lancaster	2fad88f8a0	added root_ca content	2026-03-25 18:07:08 -05:00
John Lancaster	7b0f419454	WIP CA bootstrap rework	2026-03-25 17:55:31 -05:00
John Lancaster	f8c09878a1	started p14s transition	2026-03-25 17:29:37 -05:00
				`@@ -1 +0,0 @@`
				`2036c44f7b5901566ff7611ea6c927291ecc6d2dd00779c0eead70ec77fa10d6`