renamed option

.sops.yaml

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

flake.lock

@@ -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,
+        "lastModified": 1773637821,
-        "narHash": "sha256-RZVtJefKKy3Z2UvKWSbtRF3cUxt/2fHga2adN6MZQ1U=",
+        "narHash": "sha256-Cp1x/5/97iNjXOI5hLCA51BwR6hc1dWJiZp4VPogkTw=",
         "owner": "vic",
         "repo": "flake-file",
-        "rev": "7d16dfaeb912d5efdff0d0eda2aabc0c934168dd",
+        "rev": "bb9fbe00ba6a1945fbdd6973c2585ab770f404b0",
         "type": "github"
       },
       "original": {
@@ -38,32 +22,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775087534,
+        "lastModified": 1772408722,
-        "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
+        "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
+        "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "flake-parts_2": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "nvf",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1769996383,
-        "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
         "type": "github"
       },
       "original": {
@@ -95,11 +58,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1776562531,
+        "lastModified": 1774561634,
-        "narHash": "sha256-Lh5Ns9DI67E+lSMOCGK0S+mFPy0mz0yOGiJTUXiR9JI=",
+        "narHash": "sha256-3q1xsREjqdVIIwQQDZQ9y0YdBzP8gAxdwKoKnZSzJtU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "5b56ad02dc643808b8af6d5f3ff179e2ce9593f4",
+        "rev": "7c046c63ac3b467c1d589b99d531da5b6520825a",
         "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,
+        "lastModified": 1774567711,
-        "narHash": "sha256-2ZBhDNZZwYkRmefK5XLOusCJHnoeKkoN95hoSGgMxWM=",
+        "narHash": "sha256-uVlOHBvt6Vc/iYNJXLPa4c3cLXwMllOCVfAaLAcphIo=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "c775c2772ba56e906cbeb4e0b2db19079ef11ff7",
+        "rev": "3f6f874dfc34d386d10e434c48ad966c4832243e",
         "type": "github"
       },
       "original": {
@@ -199,11 +125,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1775423009,
+        "lastModified": 1774106199,
-        "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=",
+        "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9",
+        "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655",
         "type": "github"
       },
       "original": {
@@ -215,39 +141,30 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1776329215,
+        "lastModified": 1774273680,
-        "narHash": "sha256-mBqzkn7oJti2hqeO8iTbDxKw+1ifxpP53feQ0CEXies=",
+        "narHash": "sha256-WLxi1vfcykjq9Yb2umqBJs6lVM6MpV2tXfcrAjroxUk=",
-        "rev": "b86751bc4085f48661017fa226dee99fab6c651b",
+        "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": {
+    "nixpkgs_3": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "flake-parts": "flake-parts_2",
-        "mnw": "mnw",
-        "ndg": "ndg",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "systems": "systems_2"
-      },
       "locked": {
-        "lastModified": 1776608870,
+        "lastModified": 1773840656,
-        "narHash": "sha256-lBKrueFu15TdmtMF6GsiSVCifwdrUBYFoa3+zZjYTFM=",
+        "narHash": "sha256-9tpvMGFteZnd3gRQZFlRCohVpqooygFuy9yjuyRL2C0=",
-        "owner": "notashelf",
+        "owner": "NixOS",
-        "repo": "nvf",
+        "repo": "nixpkgs",
-        "rev": "d9ba7f0a9ed6c016dc9e526cc606d1a2f7898cd4",
+        "rev": "9cf7092bdd603554bd8b63c216e8943cf9b12512",
         "type": "github"
       },
       "original": {
-        "owner": "notashelf",
+        "owner": "NixOS",
-        "repo": "nvf",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
         "type": "github"
       }
     },
@@ -263,10 +180,8 @@
         "nixpkgs-lib": [
           "nixpkgs"
         ],
-        "nvf": "nvf",
         "sops-nix": "sops-nix",
-        "wrapper-modules": "wrapper-modules",
+        "wrapper-modules": "wrapper-modules"
-        "wrappers": "wrappers"
       }
     },
     "sops-nix": {
@@ -276,11 +191,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1776119890,
+        "lastModified": 1774303811,
-        "narHash": "sha256-Zm6bxLNnEOYuS/SzrAGsYuXSwk3cbkRQZY0fJnk8a5M=",
+        "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_3"
-          "nixpkgs"
-        ]
       },
       "locked": {
-        "lastModified": 1776464146,
+        "lastModified": 1774538285,
-        "narHash": "sha256-XwLFfJDz71vIF7BAhnbLhrzQjmDC2uXdo7N0oHUrYzA=",
+        "narHash": "sha256-KRDNQDEWjB2O5SRH/oUTzi34cNxlIT8sab0FK2uqZ2g=",
         "owner": "BirdeeHub",
         "repo": "nix-wrapper-modules",
-        "rev": "75febede14a0845f4ef429da692a0698bf433600",
+        "rev": "15d740b2bfc545189a569147da7718457c12758e",
         "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",

flake.nix

@@ -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 = {
+    wrapper-modules.url = "github:BirdeeHub/nix-wrapper-modules";
-      url = "github:BirdeeHub/nix-wrapper-modules";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    wrappers = {
-      url = "github:lassulus/wrappers";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
   };
 }

modules/default.nix

@@ -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" ];
 }

modules/features/desktop.nix

@@ -10,6 +10,7 @@
     home.packages = with pkgs; [
       mangohud
       sublime4
+      proton-vpn
     ];
   };
 }

modules/features/forgejo.nix

@@ -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
-            '')
-          ];
-      };
-    };
-}

modules/features/gnome.nix

@@ -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, ... }:

modules/features/greetd.nix

@@ -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 = {

modules/features/mtls.nix

@@ -1,442 +0,0 @@
-{ self, 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 {
-    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";
-      type = lib.types.str;
-    };
-    caFile = lib.mkOption {
-      description = "String path for the root CA file";
-      type = lib.types.str;
-      default = "${cfg.certDir}/root_ca.crt";
-    };
-    keyFile = lib.mkOption {
-      description = "String path for the private key";
-      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";
-    };
-    san = lib.mkOption {
-      description = "List of SAN to give the mTLS cert";
-      type = lib.types.listOf lib.types.str;
-      default = [ ];
-    };
-    provisioner = lib.mkOption {
-      type = lib.types.str;
-      default = "admin";
-    };
-    lifetime = lib.mkOption {
-      type = lib.types.str;
-      default = "24h";
-    };
-    renew = {
-      enable = lib.mkOption {
-        description = "Enable automatic mTLS certificate renewal using a systemd timer.";
-        type = lib.types.bool;
-        default = cfg.enable;
-      };
-      onCalendar = lib.mkOption {
-        description = "systemd OnCalendar schedule for mTLS certificate renewal checks.";
-        type = lib.types.str;
-        default = "*:1/15";
-      };
-      randomizedDelaySec = lib.mkOption {
-        description = "Randomized delay added to renewal timer runs to avoid synchronized renewals.";
-        type = lib.types.str;
-        default = "5m";
-      };
-      user = lib.mkOption {
-        description = "User account to run the mTLS renewal service as.";
-        type = lib.types.str;
-        default = "root";
-      };
-      group = lib.mkOption {
-        description = "Group to run the mTLS renewal service as. Defaults to the configured renewal user.";
-        type = lib.types.nullOr lib.types.str;
-        default = "mtls";
-      };
-      reloadUnits = lib.mkOption {
-        description = "systemd units to try-reload-or-restart after a successful certificate renewal.";
-        type = lib.types.listOf lib.types.str;
-        default = [ ];
-      };
-      postCommands = lib.mkOption {
-        description = "Shell commands to run after a successful certificate renewal.";
-        type = lib.types.listOf lib.types.lines;
-        default = [ ];
-      };
-    };
-  };
-
-  mkMtlsGenerateScript = {
-    pkgs,
-    subject,
-    provisioner,
-    san,
-    certFile,
-    keyFile,
-    bundleFile,
-    lifetime,
-    user,
-    group,
-  }:
-  let
-    sanArgs = lib.concatMapStringsSep " " (s: "--san \"${s}\"") san;
-  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}
-      '';
-    };
-
-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;
-        };
-      };
-    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 = [ ];
-        };
-      };
-
-      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
-        ];
-
-        systemd.tmpfiles.rules = [
-          "d ${cfg.certDir} 0750 ${cfg.renew.user} ${cfg.renew.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;
-          };
-        };
-      };
-    };
-
-  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;
-        };
-      };
-    in
-    {
-      options.mtls = (mkOpts config) // {
-        certDir = lib.mkOption {
-          description = "String path to where the mtls certs will be stored.";
-          type = lib.types.str;
-          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
-        ];
-
-        systemd.user.tmpfiles.rules = lib.mkIf cfg.enable [
-          "d ${cfg.certDir} 0700 - - -" # Ensure the cert directory exists and is writable by the user
-        ];
-
-        # Create the systemd service files for the user.
-        xdg.dataFile = lib.mkIf cfg.renew.enable {
-          "systemd/user/mtls-renew.service".source =
-            "${mtlsRenewWrapper.outputs.systemd-user}/systemd/user/mtls-renew.service";
-          "systemd/user/mtls-renew.timer".source =
-            "${mtlsRenewWrapper.outputs.systemd-user}/systemd/user/mtls-renew.timer";
-          "systemd/user/mtls-renew.timer.d/override.conf".text = ''
-            [Timer]
-            Persistent=true
-            AccuracySec=1us
-            RandomizedDelaySec=${cfg.renew.randomizedDelaySec}
-          '';
-        };
-
-        # Ensure the timer gets started
-        home.activation.mtlsRenewTimer = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
-          if [ -n "$XDG_RUNTIME_DIR" ] && [ -S "$XDG_RUNTIME_DIR/systemd/private" ]; then
-            if [ "${lib.boolToString (cfg.enable && cfg.renew.enable)}" = "true" ]; then
-              run ${pkgs.systemd}/bin/systemctl --user daemon-reload
-              run ${pkgs.systemd}/bin/systemctl --user enable --now mtls-renew.timer
-            else
-              run ${pkgs.systemd}/bin/systemctl --user disable --now mtls-renew.timer || true
-              run ${pkgs.systemd}/bin/systemctl --user daemon-reload || true
-            fi
-          fi
-        '';
-      };
-    };
-
-  flake.wrappers = {
-    mtlsCheck = inputs.wrappers.lib.wrapModule ({ config, lib, wlib, ... }: {
-      options = {
-        bundleFile = lib.mkOption {
-          description = "String path for the mTLS key bundle";
-          type = lib.types.str;
-        };
-      };
-
-      config = {
-        binName = "mtls-check";
-        # This pattern is necessary to wrap packages like openssl that provide more than one binary
-        package = config.pkgs.symlinkJoin {
-          name = "openssl";
-          paths = [ config.pkgs.openssl.bin config.pkgs.openssl.man ];
-          meta.mainProgram = "openssl";
-        };
-        args = [
-          "x509"
-          "-noout"
-          "-in" config.bundleFile
-          "-subject"
-          "-issuer"
-          "-ext" "subjectAltName,extendedKeyUsage"
-          "-enddate"
-        ];
-      };
-    });
-
-    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 = "";
-        };
-      };
-    });
-  };
-}

modules/features/shell-tools.nix

@@ -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" "$@" ];
-    };
-  };
-}

modules/features/ssh-certs.nix

@@ -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;
-    };
-  });
-}

modules/features/step-client.nix

@@ -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";
-    };
-  });
-}

modules/hosts/janus/default.nix

@@ -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/";
+      "ca-url" = "https://janus.john-stream.com/";
-      fingerprint = builtins.readFile ./fingerprint;
+      fingerprint = "2036c44f7b5901566ff7611ea6c927291ecc6d2dd00779c0eead70ec77fa10d6";
-      root = ./root_ca.crt;
+      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;

modules/hosts/janus/fingerprint

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

modules/hosts/john-p14s/configuration.nix

@@ -1,11 +1,8 @@
 { self, inputs, ... }:
 {
-  flake.modules.nixos.p14sConfiguration = { config, pkgs, lib, ... }:
+  flake.modules.nixos.p14sConfiguration = { 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};
     in
     {
       imports = [
@@ -18,16 +15,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.enable = true;
-      # services.displayManager.autoLogin.user = "john";
+      services.displayManager.autoLogin.user = "john";
 
       programs.zsh.enable = true;
       services.openssh.enable = true;
@@ -36,10 +31,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 = {};
@@ -57,6 +53,24 @@
       # This is needed for VSCode remote support. Read: https://nixos.wiki/wiki/Visual_Studio_Code
       programs.nix-ld.enable = true;
 
+      programs.steam = {
+        enable = true;
+        gamescopeSession.enable = true;
+        remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
+        dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
+        localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers
+      };
+
+      # progams.gamemode.enable = true;
+
+      # Some programs need SUID wrappers, can be configured further or are
+      # started in user sessions.
+      # programs.mtr.enable = true;
+      # programs.gnupg.agent = {
+      #   enable = true;
+      #   enableSSHSupport = true;
+      # };
+
       # This value determines the NixOS release from which the default
       # settings for stateful data, like file locations and database versions
       # on your system were taken. It's perfectly fine and recommended to leave
@@ -69,9 +83,9 @@
       time.timeZone = "America/Chicago";
 
       # Select internationalisation properties.
-      i18n = {
+      i18n.defaultLocale = "en_US.UTF-8";
-        defaultLocale = "en_US.UTF-8";
+
-        extraLocaleSettings = {
+      i18n.extraLocaleSettings = {
         LC_ADDRESS = "en_US.UTF-8";
         LC_IDENTIFICATION = "en_US.UTF-8";
         LC_MEASUREMENT = "en_US.UTF-8";
@@ -82,12 +96,6 @@
         LC_TELEPHONE = "en_US.UTF-8";
         LC_TIME = "en_US.UTF-8";
       };
-      };
-
-      fonts.packages = with pkgs; [
-        nerd-fonts.hack
-        nerd-fonts.sauce-code-pro
-      ];
 
       services.libinput.enable = true; # Enable touchpad support (enabled default in most desktopManager).
       services.fprintd.enable = true; # Enables fingerprint sensor
@@ -107,43 +115,5 @@
         # no need to redefine it in your config for now)
         # media-session.enable = true;
       };
-
-      home-manager.users.root = {
-        imports = with inputs.self.modules.homeManager; [
-          rebuild
-        ];
-        home.stateVersion = "25.11";
-      };
-      home-manager.users.john.imports = with inputs.self.modules.homeManager; [
-        gnome
-        desktop
-        mysops
-        rebuild
-        {
-          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;
-          };
-        }
-      ];
-      sops.defaultSopsFile = ./secrets.yaml;
-      sops.age.sshKeyPaths = [ "${homeDirectory}/.ssh/id_ed25519" ];
-      mtls = {
-        enable = true;
-        subject = hostname;
-      };
     };
 }

modules/hosts/john-p14s/default.nix

@@ -10,16 +10,23 @@
     modules = [
       "${inputs.nixos-hardware}/lenovo/thinkpad/p14s"
       "${inputs.nixos-hardware}/lenovo/thinkpad/p14s/amd/gen4"
+      {
+        home-manager.useGlobalPkgs = true;
+        home-manager.users.john.imports = with inputs.self.modules.homeManager; [
+          gnome
+          desktop
+          {
+            my-vscode.enable = true;
+          }
+        ];
+      }
     ] ++ (with self.modules.nixos; [
       p14sConfiguration
-      janus-ca
-      rebuild
       sudo
       john
       gnome
       steam
-      wireguard
+      # wireguard
-      mtls
       # greetd
       # niri
     ]);

modules/hosts/john-p14s/secrets.yaml

@@ -1,5 +1,4 @@
-restic_password: ENC[AES256_GCM,data:8KeL7kOMTHkK+ZpY3aq0/S4UYbkZh72FxJAolcVes79NPfdHiNi77fmAZuXb8Gxasu16vk4y6ksWFmrZquvcbg+cLt8Yze+qvuCiUW62IOppzRIBLk6w2f8uPhU41gsVuj6u4Jz/Su7miNBvJYmF8vulIwDKS7qg43dzIKXY4q1HaRHCD12PkU9EfGpIgivdNCOO0lCE6m/O3IB8Ed4R51scBnVrIj89K5OuTepvIrGElmXiWqBdsTzCIaJCZJ8fDnzJPorLhsTAzKCnQhNoIrW/aYArzj9+WmglmGuqeaoemBoNTrYC9bssUwuWAOqsf1HC7gWST/dP9FmKl7UHlgkslblRcRedFPAQjDhy/RgZCj8hs/XrVYOzwW8WJ0XeB9UPK03QPJc8EZdz9r2Q0+U3LQxMV6Jne5JZGsMpII4b+7b/WbRZTooX3G09MES/gzwD+hyBr++6EpP9QTYs+4XsNLNN+S6y5+YS/7XmRvR7xb93eZ4EfUUKiQYejVKQBl9b8QTJa3q26RPa/82O5zQlzd1w/EjA4G6Vv8H6wvK0fHNwpU3hl9V8EL7Ca7JKfJr11Vw0fNHx2nXjOLURt27wbDeWUaSrzI+z2h/0TSiKWas/Eu5+4L9n7E3H5u5Hg2uaCQkDpy6RJkW9UL6lCC1YEJw5yHTugrPNoMcRlAKRoSIeSZSPfGl0CKYAC39s422xX2f46GpJu0bO8GG/XN9Qk+SxqPHGuzx7nWghFQctZb1ssGKuvHKqaNYZvWeWqqkxyPWb6xjaBaSGxcp5MsET+RAu2F1XgX9Is11mIJETlHhRE3OpMSHh7toIiuNs8YzsgkedVFWhx+Xu27DWvOFvg/01Rh6s5RGJKMgL7WQMLTtY2KI/ko648WXVoCtVymG8d30qWnSt8319jkILX/wdB8Vqp5ceRqHwDE89jhEh0GOg07eLcREnh+gjXij1/bS66/+hHk4jhkzGtbdfEji9sro4Nm+kVRA+6fgJjCvt1sAvjuj10Scx4uH3AdDTW+y0KaniK8EHTZzaGDuaV+tk3hZEfpwpdan5mquoQvFdZWsWlDefX7gRq38szmi9LtULEai0WKOtqnnDIOnWk/3NYeNdzJ28YzrUDbkxtghkRgr7fNGEtyCGRuWRRMc5mVp2FPzAwRKk29ShILpWbvfUzwAWUOEpyAS4bstzlMybf9L8sp20+Ier8gOMGJ81eXXXmhtgMn6aWZ6EDGe1Shl0gDM0JUEAkA2+kf3oIZAvcWiFxj7vyd4Aacw3RetUSJcy8JwbV3I/isxKyy/xs8zE2PUY0z3Cwh9MpVP9G8N6Mef6v2DNDNg+2iJ/eslQdbZRQzdJwnBMhpOopzRwuUaC7jJKyGBkcNbbmNjceJWEue0XVjIcZHJ7BFe3jKluezNIJIf268V35+HIpXJA7BUJn8NPCIQXze5Frm46U2aRTQ53LU4HBGLXYPzx8QLsn0jLVy518w/TztawdT3/SmSWNwYTuZG18TmXs9v3oB6PrUr4M7kJbNRLpRb0ZelbMDwpR074FPwwud6fkjR2lLQBbufmPUBdpVJZ2xFjijle8h1h29zoFsydFNq5wSXUO/nm/S09KdKi5F2S1uKP+NL80OVEeC+QXcBdTry07meVIhsBOh+9ajy1ExaMaPs2xjB5QvTgJA9kfJOAoUygjMC33FwdRw10eGP//IsiRm9EukF1o++MfZnAtcjhoOoy79TjlO8p8YVNwEhZ14Ik/kIizyQtr0gR+pVEIc6+1W29UOWNRXb+ZavXRDq0wvxigMagfcL+zIr4gctufTfubiOmVa85qVJB,iv:VogP+OQvlsYCSqlmffO+o99C0hJm63ZqLXVd2B0oom0=,tag:+se1QHW6xLMj/dZrbY0MKQ==,type:str]
+placeholder: ENC[AES256_GCM,data:DhQdWw==,iv:YX/4WoBuIs4NidhaXfv1mO7Ax9uSthwepdZelAZLrSI=,tag:fEgyeohQrZkXUmn7++zKGg==,type:str]
-wireguard_private_key: ENC[AES256_GCM,data:sCskwDhemU1y4M4A4R9KxwiL8q+FtxnUqg1omU7yS81H1bbSM804hNzmq+A=,iv:7wNMAG+7wYYXYgKEohIAYisMN5lbz+M5RhCEaHL4yWE=,tag:FENdJTEEGD9cEJVwIIUQDA==,type:str]
 sops:
     age:
         - recipient: age1f6drjusg866yscj8029tk4yfpgecklrvezldm02ankm6h8nnwu5s2u6ahy
@@ -20,7 +19,7 @@ sops:
             WHpOY280S2hpVU1mNnozODRoMnB4bGMKK5RrDK2kAZlWf2igqyzWgshxLPj+f74A
             mCmMLDHo5drNieFYp+guqHaHnZkf9IzpAglj7x6wCITjk+l6go5KvA==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2026-03-27T03:59:09Z"
+    lastmodified: "2026-03-27T02:26:35Z"
-    mac: ENC[AES256_GCM,data:MsPAxssWUSvsJQP0Ogrl3r/GoVqeL1L95YTJQbAJZ4FVxhRXP7KfbUnKSclzU6G8CP5WxV18TXZfB4JITKG3Lz5rtVpD/WFMdhDmve0f6BPMAimle2ajWUaWYNePvEynClX3nydLk3h31DjHGa8YvJZqW2ieDb/JDMdBXiLTrWc=,iv:82ul5CV3XXllFCDJfF6beIcAIFj71ycJJF4iEQvovMA=,tag:108L7VkAoPUTLtV74qgrrA==,type:str]
+    mac: ENC[AES256_GCM,data:fVG4d8dUAGVgZ1IFZW0mFCDd1GYmh6dWvntNnESPBCC9EEnKBSjIEksjWt2EshSHphwr0ad70F7ixdpb9388UXUqSkAHj2y2CYZMoLKR0Wh75F6I/aZjFWFM4Mi9fAEC8OKrD0L7Bw+SvfYrAcS2Dd0trwYA+Johu0gts4GrjLI=,iv:jOFNHOV9Fbs5GK8PXKt4198QW0Y1kZ05yF9Fyszq2bk=,tag:4TYd1dY2ZoqJFaC8ZKye4g==,type:str]
     unencrypted_suffix: _unencrypted
-    version: 3.12.2
+    version: 3.12.1

modules/hosts/john-pc/default.nix

@@ -1,70 +1,67 @@
-{ withSystem, self, inputs, ... }:
+{ inputs, ... }:
 let
   username = "john";
   hostname = "john-pc-ubuntu";
-
-  # testTarget = "fded:fb16:653e:25da:be24:11ff:fe89:1cc3"; # soteria
   # testTarget = "fded:fb16:653e:25da:be24:11ff:fea0:753f"; # test-nix
-  testHost = "soteria"; # which host to test build
+  testTarget = "fded:fb16:653e:25da:be24:11ff:fe89:1cc3"; # soteria
-  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}#john-pc-ubuntu \
+          --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', ... }:
+  flake.homeConfigurations."${hostname}" = inputs.home-manager.lib.homeManagerConfiguration {
-    inputs.home-manager.lib.homeManagerConfiguration {
+    pkgs = import inputs.nixpkgs { system = "x86_64-linux"; };
-      # pkgs = import inputs.nixpkgs {
+    modules = with inputs.self.modules; [
-      #   inherit system;
+      homeManager."${hostname}"
-      #   overlays = [ inputs.self.overlays.default ];
+    ];
-      # };
+  };
-      pkgs = inputs'.nixpkgs.legacyPackages;
-      modules = [ inputs.self.modules.homeManager."${hostname}" ];
-  });
 }

modules/hosts/john-pc/dev.nix

@@ -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}"
-      ]; 
-    };
-  });
-}

modules/hosts/soteria/secrets.yaml

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

modules/hosts/soteria/soteria.nix

@@ -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.mtls
-      nixos.janus-ca
-      nixos.forgejo
       # nixos.restic-server
       # nixos.restic-envoy
-      ({ config, pkgs, ... }: {
+      {
         networking.hostName = hostname;
-        time.timeZone = "America/Chicago";
+        nix.settings.build-dir = "/var/tmp/nix-build";
+        systemd.tmpfiles.rules = [
+          "d /var/tmp/nix-build 1777 root root -"
+        ];
+        step-ssh-host = {
+          hostname = hostname;
+        };
 
-        # Removes password for sudo
+        home-manager.users."${username}" = {
-        security.sudo-rs.extraRules = lib.mkAfter [
+          imports = with inputs.self.modules; [
-          {
+            homeManager"${hostname}"
-            users = [ username ];
+          ];
-            commands = [
+        };
-              {
-                command = "ALL";
-                options = [ "NOPASSWD" ];
       }
     ];
-          }
-        ];
-
-        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;
   };
 
-        networking.firewall.allowedTCPPorts = [ 8000 ];
+  flake.modules.homeManager."${hostname}" = { config, lib, pkgs, ... }: {
-        services.restic.server = {
+    imports = with inputs.self.modules; [
-          enable = true;
+      homeManager.rebuild
-          privateRepos = true;
+      homeManager.mysops
-          listenAddress = "0.0.0.0:8000";
+      homeManager.janus-ca
-          extraFlags = [
+      homeManager.mtls
-            "--no-auth"
+      homeManager.docker
-            "--tls"
-            "--tls-cert=${config.mtls.certFile}"
-            "--tls-key=${config.mtls.keyFile}"
     ];
-        };
 
-        loginText.extraServiceStatus = {
-          Docker = "docker";
-          "mTLS Renewal" = "mtls-renew.timer";
-          Forgejo = "forgejo.service";
-          "Forgejo Backup" = "forgejo-dump.timer";
-          "Restic REST Server" = "restic-rest-server.service";
-        };
-
-        step-ssh-host.hostname = hostname;
-
-        # This provides the secrets at install time
-        sops.defaultSopsFile = ./secrets.yaml;
-
-        programs.zsh.enable = true;
-
-        home-manager.users."${username}".imports = [ inputs.self.modules.homeManager.soteria ];
-
-        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";
+    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.homeManagerFlakeDir}/modules/hosts/soteria/secrets.yaml";
+    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.soteria = withSystem "x86_64-linux" (ctx@{ config, inputs', ...}:
+  flake.homeConfigurations."${hostname}" = inputs.home-manager.lib.homeManagerConfiguration {
-    inputs.home-manager.lib.homeManagerConfiguration {
+    pkgs = import inputs.nixpkgs { system = "x86_64-linux"; };
-      pkgs = inputs'.nixpkgs.legacyPackages;
+    modules = with inputs.self.modules; [
-      modules = [
+      homeManager."${username}"
-        inputs.self.modules.homeManager."${username}"
+      homeManager."${hostname}"
-        inputs.self.modules.homeManager.soteria
     ];
-  });
+  };
 }

modules/hosts/test-nix.nix

@@ -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;

modules/nix-tools/rebuild.nix

@@ -1,148 +1,45 @@
-{ self, inputs, ... }:
+{ inputs, ... }:
 {
-  flake.modules.nixos.rebuild =
-    { config, pkgs, lib, ... }:
-    let
-      flakeDir = config.rebuild.flakeDir;
-      echoCmd = lib.getExe' pkgs.coreutils "echo";
-      hostnameCmd = "$(${lib.getExe pkgs.hostname} -s)";
-
-      nfs = with pkgs; writeShellApplication {
-        name = "nfs";
-        runtimeInputs = [ coreutils hostname nh ];
-        text = ''
-          HOSTNAME=$(hostname -s)
-          echo "Switching to the $HOSTNAME nixos profile"
-          nh os switch "$@" "${flakeDir}#$HOSTNAME"
-        '';
-      };
-      nfsu = with pkgs; writeShellApplication {
-        name = "nfsu";
-        runtimeInputs = [ nfs pkgs.git ];
-        text = ''nfs --refresh "$@"'';
-      };
-    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, ... }:
+    { pkgs, lib, config, ... }:
-    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"
-        '';
-      };
-    in
     {
       options = {
         homeManagerFlakeDir = lib.mkOption {
-          description = "Path to the home-manager flake directory.";
           type = lib.types.str;
           default = "${config.xdg.configHome}/home-manager";
+          description = "Path to the home-manager flake directory.";
         };
       };
 
-      config = {
+      config = let
+        nixBin = lib.getExe pkgs.nix;
+        flakeDir = config.homeManagerFlakeDir;
+      in
+      {
         home.activation.printFlakeDir = lib.hm.dag.entryAfter ["writeBoundary"] ''
           run echo "Home Manager flake directory: ${flakeDir}"
         '';
 
         home.packages = with pkgs; [
           home-manager
-          (symlinkJoin {
+          (writeShellScriptBin "flake-parts-test" ''
-            name = "build-tools";
+            echo "Test ${flakeDir}"
-            paths = [
+          '')
-              flake-parts-check
+          (writeShellScriptBin "flake-parts-check" ''
-              test-build
+            cd ${flakeDir}
-              (inputs.self.wrappers.home-switch.apply {
+            ${nixBin} run ".#write-flake"
-                inherit pkgs flakeDir;
+            ${nixBin} flake check
-              }).wrapper
+          '')
-              (inputs.self.wrappers.home-switch.apply {
+          (writeShellScriptBin "nhms" ''
-                binName = lib.mkForce "nhmu";
+            HOSTNAME=$(hostname -s)
-                inherit pkgs flakeDir;
+            echo "Switching to the $HOSTNAME profile"
-                extraOptions = [ "--update" ];
+            ${lib.getExe home-manager} switch --impure --flake ${flakeDir}#$HOSTNAME
-              }).wrapper
+          '')
-              (inputs.wrappers.lib.wrapPackage {
+          (writeShellScriptBin "nhmu" ''
-                binName = "cleanup";
+            ${nixBin} flake update --flake ${flakeDir}
-                inherit pkgs;
+            nhms
-                package = nh;
+          '')
-                args = [ "clean" "user" "--keep-since" "3days" ];
-              })
-            ];
-          })
         ];
       };
     };
-
-  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;
-    };
-  });
 }

modules/nix-tools/user.nix

@@ -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 = {
+  config.flake.factory.user = username: isAdmin: {
-    username,
+    nixos."${username}" = { lib, pkgs, ... }: {
-    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}" = {};
-
       users.users."${username}" = {
         isNormalUser = true;
-        group = username;
         home = "/home/${username}";
-        shell = pkgs.zsh;
+        extraGroups = [
-        extraGroups = [ "input" "networkmanager" ]
+          "input"
-          ++ lib.optional isAdmin "wheel"
+          "networkmanager"
-          ++ lib.optional config.virtualisation.docker.enable "docker"
+        ] ++ lib.optionals isAdmin [
-          ++ lib.optional (isAdmin && config.services.forgejo.enable) config.services.forgejo.group
+          "docker"
-          ++ lib.optional (isAdmin && config.services.postgresql.enable) "postgres";
+          "wheel"
+        ];
       };
 
-      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; [
+        imports = [
-          # fzf zoxide starship
+          self.modules.homeManager."${username}"
         ];
       };
     };

modules/nix-tools/wrappers.nix

@@ -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 = {};
-      };
-    };
-  };
-}

modules/nixos/login-text.nix

@@ -1,18 +1,5 @@
 { inputs, ... }: {
-  flake.modules.nixos.login-text = { config, lib, ... }:
+  flake.modules.nixos.login-text = { config, ... }: {
-    let
-      defaultServiceStatus = {
-        SSH = "sshd.socket";
-        "SSH Cert Renewal" = "step-ssh-host-renew.timer";
-      };
-    in {
-    options.loginText.extraServiceStatus = lib.mkOption {
-      type = lib.types.attrsOf lib.types.str;
-      default = { };
-      description = "Additional rust-motd service status entries keyed by display name.";
-    };
-
-    config = {
     programs.rust-motd = {
       enable = true;
       refreshInterval = "*:0/5";
@@ -34,10 +21,12 @@
           root = 3;
         };
 
-          service_status = lib.mkMerge [
+        service_status = {
-            defaultServiceStatus
+          Docker = "docker";
-            config.loginText.extraServiceStatus
+          SSH = "sshd.socket";
-          ];
+          "SSH Cert Renewal" = "step-ssh-host-renew.timer";
+          "mTLS Renewal" = "mtls-renew.timer";
+        };
 
         # This calculation is wrong for LXCs
         # uptime = {
@@ -54,5 +43,4 @@
       };
     };
   };
-  };
 }

modules/programs/bash.nix

@@ -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;
     };
   };
 }

modules/programs/eza.nix

@@ -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;
     };
-  };
+    home.shellAliases = {
-
+      ls = "${lib.getExe pkgs.eza} -lgos type --no-time --follow-symlinks";
-  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"
-        "$@"
-      ];
     };
   };
 }

modules/programs/files.nix

@@ -1,18 +1,15 @@
 {
-  flake.modules.homeManager.files = { pkgs, lib, ... }:
+  flake.modules.homeManager.files = { pkgs, ... }:
   {
-    programs.lf = {
+    programs.lf.enable = true;
-      enable = true;
+    programs.lf.cmdKeybindings = {
-      cmdKeybindings = {
       "D" = "delete";
     };
-      settings = {
+
-        preview = true;
+    home.packages = with pkgs; [
-        hidden = true;
+      gdu
-        drawbox = true;
+      lf
-        icons = true;
+      # TODO: find a CLI file editor that's not insane
-        ignorecase = true;
+    ];
-      };
-    };
   };
 }

modules/programs/ghostty.nix

@@ -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" =
+    xdg.desktopEntries."com.mitchellh.ghostty" = {
-    let
-      ghosttyCmd = lib.getExe ghosttyPackage;
-    in
-    {
       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";
         };
       };
     };

modules/programs/neovim.nix

@@ -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";
-    });
-  };
-}

modules/programs/niri.nix

@@ -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;

modules/programs/onepassword.nix

@@ -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
+      '';
+    };
   };
 }

modules/programs/shell-tools.nix

@@ -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
+      ];
+    };
+  };
+}

modules/programs/sops.nix

@@ -1,4 +1,4 @@
-{ self, inputs, ... }:
+{ inputs, ... }:
 let
   inputs' = inputs;  # save a reference before it's shadowed
 in
@@ -14,10 +14,18 @@ in
     imports = [ inputs.sops-nix.nixosModules.sops ];
   };
 
-  flake.modules.homeManager.mysops =
+  # Define the homeModules that are used by flake-parts
-    { config, pkgs, lib, ... }:
+  # https://flake.parts/options/home-manager.html#opt-flake.modules.homeManager
+  flake.modules.homeManager.mysops = { inputs, config, pkgs, lib, ... }:
   let
     cfg = config.mysops;
+    sopsBin = lib.getExe pkgs.sops;
+    sopsConfigPath = ../../.sops.yaml;
+    sopsSecretsPath = ../../keys/secrets.yaml;
+
+    editScript = lib.optional (cfg.hostSecretFile != null) (pkgs.writeShellScriptBin  "edit-secrets" ''
+      ${sopsBin} --config ${sopsConfigPath} ${cfg.hostSecretFile}
+    '');
   in
   {
     imports = [
@@ -26,72 +34,55 @@ in
     ];
 
     options.mysops = {
+      ageKeyFile = lib.mkOption {
+        description = "Default location for the age key";
+        type = lib.types.str;
+        default = "${config.xdg.configHome}/sops/age/keys.txt";
+      };
       hostSecretFile = lib.mkOption {
-          description = "Path to the secrets file for this host. Used to create the edit-secrets script";
+        description = "Path to the secrets file for this host";
         type = lib.types.nullOr lib.types.str;
         default = null;
       };
     };
 
-      config =
+    config = {
-        let
+      home.packages = with pkgs; [
-          my-sops = (inputs.self.wrappers.mySops.apply {
+        eza
-            inherit pkgs;
+        age
-            sshKey = config.ssh.identityFile;
+        sops # This is necessary to make the sops binary available
-          }).wrapper;
+        ssh-to-age
-        in
+        (writeShellScriptBin "gen-age-key" ''
-        {
+          set -eu
+
+          if [ ! -f "${config.ssh.IdentityFile}" ]; then
+            echo "SSH identity file not found: ${config.ssh.IdentityFile}" >&2
+            exit 1
+          fi
+
+          if [ -e "${cfg.ageKeyFile}" ]; then
+            echo "Refusing to overwrite existing age key file: ${cfg.ageKeyFile}" >&2
+            exit 1
+          fi
+
+          mkdir -p "$(dirname "${cfg.ageKeyFile}")"
+          ${lib.getExe pkgs.ssh-to-age} -i ${config.ssh.IdentityFile} -private-key > ${cfg.ageKeyFile}
+          echo -n "Created ${cfg.ageKeyFile}: "
+          echo $(show-age-key)
+        '')
+        (writeShellScriptBin "show-age-key" "${lib.getExe' pkgs.age "age-keygen"} -y ${cfg.ageKeyFile}")
+        (writeShellScriptBin "ls-secrets" "${lib.getExe pkgs.eza} -alT --follow-symlinks ~/.config/sops-nix/secrets")
+      ] ++ editScript;
+
+      home.shellAliases.sops = "${sopsBin} --config ${sopsConfigPath}";
+
       # Option definitions for the sops home-manager module:
       # https://github.com/Mic92/sops-nix/blob/master/modules/home-manager/sops.nix
       sops = {
-            defaultSopsFile = ../../keys/secrets.yaml;
+        defaultSopsFile = sopsSecretsPath;
         defaultSopsFormat = "yaml";
-            age.sshKeyPaths = [ "${config.ssh.identityFile}" ];
+        age.sshKeyPaths = [ "${config.ssh.IdentityFile}" ];
-          };
-
-          home.packages = with pkgs; [
-            my-sops
-            (inputs.wrappers.lib.wrapPackage {
-              binName = "ls-secrets";
-              inherit pkgs;
-              package = inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.my-eza;
-              args = [
-                "-T" "--follow-symlinks"
-                "${config.xdg.configHome}/sops-nix/secrets"
-              ];
-            })
-            
-          ]
-          ++ lib.optional (cfg.hostSecretFile != null) (inputs.wrappers.lib.wrapPackage {
-            binName = "edit-secrets";
-            inherit pkgs;
-            package = my-sops;
-            args = [ cfg.hostSecretFile ];
-          });
       };
     };
-
-  flake.wrappers.mySops = inputs.wrappers.lib.wrapModule ({config, lib, wlib, ... }: {
-    options = {
-      sshKey = lib.mkOption {
-        type = lib.types.str;
-        description = "String path to the SSH key to use for creating an AGE key at runtime";
   };
-    };
-
-    config = {
-      # binName = "my-sops";
-      package = config.pkgs.sops;
-      extraPackages = with config.pkgs; [ coreutils ssh-to-age ];
-      preHook = ''
-        AGE_KEY=$(umask 077; mktemp)
-        ssh-to-age -private-key -i ${config.sshKey} > "$AGE_KEY"
-      '';
-      flags."--config" = "${../../.sops.yaml}";
-      postHook = ''
-        rm "$AGE_KEY"
-        echo "Removed $AGE_KEY"
-      '';
-    };
-  });
 }

modules/programs/starship.nix

@@ -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;
-  };
-}

modules/programs/step-client.nix

@@ -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"
+        '')
+      ];
+    };
+  };
+}

modules/programs/wireguard.nix

@@ -2,13 +2,38 @@
   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}" ''
+        ${systemctl} stop ${service}
+        start_time=$(${systemctl} show -p ActiveEnterTimestamp ${serviceName} | cut -d= -f2)
+        ${journalctl} -u ${service} --since "$start_time" --no-pager
+      '';
   in
   {
     imports = [ inputs.sops-nix.nixosModules.sops ];
 
     environment.systemPackages = with pkgs; [
-      wireguard-tools # https://github.com/WireGuard/wireguard-tools
+      wireguard-tools
-      # wg-netmanager # https://github.com/gin66/wg_netmanager
+      wg-netmanager
+      (mkConnect "platform")
+      (mkDisconnect "platform")
     ];
 
     sops.secrets.wireguard_private_key = { };
@@ -30,39 +55,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
-        ];
-      };
-    };
-  };
 }

modules/programs/zed-editor.nix

@@ -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}" 
-    ];
-  };
-}

modules/programs/zsh.nix

@@ -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 = ''
+        initContent = "HOST=$(hostname -s)";
-          HOST=$(hostname -s)
-          ${homeEndKeyBindings}
-        '';
         dotDir = "${config.xdg.configHome}/zsh";
         history = {
           append = true;
@@ -53,8 +31,8 @@ in
             "eza"
             "clear"
           ];
-          save = historySize;
+          save = 1000;
-          size = historySize;
+          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;
-  };
 }

modules/services/docker.nix

@@ -1,13 +1,20 @@
-{ self, inputs, ... }:
+{ inputs, ... }:
 {
   flake.modules.nixos.docker = {
-    virtualisation.docker.enable = true;
+    virtualisation.docker = {
-    home-manager.sharedModules = [ inputs.self.modules.homeManager.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;

modules/services/restic/default.nix

@@ -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_CACERT = caCert;
-          RESTIC_TLS_CLIENT_CERT = config.mtls.bundleFile;
+          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_CACERT=${caCert}"
-          "RESTIC_TLS_CLIENT_CERT=${config.mtls.bundleFile}"
+          "RESTIC_TLS_CLIENT_CERT=${mtlsClientCert}"
         ];
 
         services.restic = {
           enable = true;
           backups.${cfg.repoName} = {
-            repository = cfg.repoUrl;
+            repository = resticRepository;
             passwordFile = cfg.passwordFile;
             paths = cfg.paths;
             timerConfig = {

modules/services/ssh.nix

@@ -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;
+          default = ../../keys/ssh_user_ca.pub;
-        };
-        userCAFile = lib.mkOption {
-          description = "String path to the SSh user CA";
-          type = lib.types.str;
-          default = "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}";
+            TrustedUserCAKeys = "/etc/${userCAPath}";
-            HostCertificate = "${configDir}/${cfg.hostKey}-cert.pub";
+            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, ... }:
+  flake.modules.homeManager.ssh = { pkgs, config, lib, ... }:
-  let
-    cfg = config.ssh;
-    configDir = "${config.home.homeDirectory}/.ssh";
-    identityFile = cfg.identityFile;
-    publicKeyFile = "${identityFile}.pub";
-    certificateFile = "${identityFile}-cert.pub";
-  in
   {
-    options.ssh = with lib; {
+    options.ssh = {
-      identityFile = mkOption {
+      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 {
+      knownHostsFile = lib.mkOption {
-        type = types.str;
+        type = lib.types.str;
-        default = "${configDir}/known_hosts";
+        default = "${config.home.homeDirectory}/.ssh/known_hosts";
-      };
-
-      knownHosts = mkOption {
-        description = "";
-        type = types.listOf types.str;
-        default = [ ];
       };
 
       matchSets = {
-        appdaemon = mkEnableOption "Enable AppDaemon SSH targets";
+        appdaemon = lib.mkEnableOption "Enable AppDaemon SSH targets";
-        certs = mkEnableOption "Enable Janus and Soteria SSH targets";
+        certs = lib.mkEnableOption "Enable Janus and Soteria SSH targets";
-        homelab = mkEnableOption "Enable various Homelab targets";
+        homelab = lib.mkEnableOption "Enable various Homelab targets";
-        dev = mkEnableOption "Enable development targets";
+        dev = lib.mkEnableOption "Enable development targets";
-        tailscale = mkEnableOption "Enable tailscale 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}"
+            "fded:fb16:653e:25da:be24:11ff:fea0:753f ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ9ZqiWPrCwHjxFCiu0lT4rlQs7KyMapxKJQQ5PJP1eh"
-            "@cert-authority *.john-stream.com ${sshHostCAPubKey}"
           ]
+          ++ (lib.optional cfg.certificates.enable "@cert-authority 192.168.1.* ${sshHostCAPubKey}")
+          ++ (lib.optional cfg.certificates.enable "@cert-authority *.john-stream.com ${sshHostCAPubKey}")
         );
       };
 
@@ -124,16 +109,12 @@ in
         enableDefaultConfig = false;
         extraConfig = ''
           SetEnv TERM="xterm-256color"
+          IdentityAgent ~/.1password/agent.sock
         '';
 
         matchBlocks = lib.mkMerge [
           {
-            "john-pc-ubuntu" = {
+            "*" = {
-              hostname = "192.168.1.85";
-            };
-
-            "*" = lib.mkMerge [
-              {
               user = "john";
 
               compression = false;
@@ -141,16 +122,14 @@ in
               serverAliveCountMax = 3;
 
               identitiesOnly = true;
-                inherit identityFile;
+              inherit identityFile certificateFile;
 
               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 = {
+              identityFile = identityFile;
-                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";
-              };
             };
           })
         ];

modules/services/step-ca/mtls.nix

@@ -0,0 +1,303 @@
+{ inputs, lib, ... }:
+let
+  # 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;
+    };
+    keyFilename = lib.mkOption {
+      description = "String filename for the private key";
+      type = lib.types.str;
+      default = "key.pem";
+    };
+    certFilename = lib.mkOption {
+      description = "String filename for the public certificate";
+      type = lib.types.str;
+      default = "cert.pem";
+    };
+    bundleFilename = lib.mkOption {
+      description = "String filename for the mTLS key bundle";
+      type = lib.types.str;
+      default = "mtls.pem";
+    };
+    san = lib.mkOption {
+      description = "List of SAN to give the mTLS cert";
+      type = lib.types.listOf lib.types.str;
+      default = [ ];
+    };
+    provisioner = lib.mkOption {
+      type = lib.types.str;
+      default = "admin";
+    };
+    lifetime = lib.mkOption {
+      type = lib.types.str;
+      default = "6h";
+    };
+    renew = {
+      enable = lib.mkOption {
+        description = "Enable automatic mTLS certificate renewal using a systemd timer.";
+        type = lib.types.bool;
+        default = true;
+      };
+      onCalendar = lib.mkOption {
+        description = "systemd OnCalendar schedule for mTLS certificate renewal checks.";
+        type = lib.types.str;
+        default = "*:1/15";
+      };
+      randomizedDelaySec = lib.mkOption {
+        description = "Randomized delay added to renewal timer runs to avoid synchronized renewals.";
+        type = lib.types.str;
+        default = "5m";
+      };
+      user = lib.mkOption {
+        description = "User account to run the mTLS renewal service as.";
+        type = lib.types.str;
+        default = "root";
+      };
+      group = lib.mkOption {
+        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 = null;
+      };
+      reloadUnits = lib.mkOption {
+        description = "systemd units to try-reload-or-restart after a successful certificate renewal.";
+        type = lib.types.listOf lib.types.str;
+        default = [ ];
+      };
+      postCommands = lib.mkOption {
+        description = "Shell commands to run after a successful certificate renewal.";
+        type = lib.types.listOf lib.types.lines;
+        default = [ ];
+      };
+    };
+  };
+
+  mkMtlsRenewScript = {
+    pkgs,
+    tlsCert,
+    tlsKey,
+    mtlsBundle,
+    reloadUnits ? [ ],
+    postCommands ? [ ],
+    systemctlArgs ? [ ],
+  }:
+  let
+    systemctl = lib.getExe' pkgs.systemd "systemctl";
+    escapedArgs = lib.escapeShellArgs systemctlArgs;
+    systemctlCommand = "${systemctl} ${escapedArgs}";
+    renewReloadScript = lib.concatMapStringsSep "\n" (unit: ''
+      if ${systemctlCommand} --quiet is-active "${unit}"; then
+        ${systemctlCommand} try-reload-or-restart "${unit}"
+      fi
+    '') reloadUnits;
+    renewPostCommands = lib.concatStringsSep "\n" postCommands;
+  in
+    pkgs.writeShellScriptBin "mtls-renew" ''
+      set -euo pipefail
+
+      if ${lib.getExe pkgs.step-cli} certificate needs-renewal "${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;
+      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 = opts;
+      config = lib.mkIf cfg.enable {
+        environment.systemPackages = with pkgs; lib.optionals cfg.enable [
+          (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.services.mtls-renew = lib.mkIf cfg.renew.enable (mkNixosMtlsRenewService {
+          inherit pkgs tlsCert tlsKey mtlsBundle;
+          inherit (cfg.renew) reloadUnits postCommands user group;
+        });
+
+        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;
+      tlsKey = "${cfg.certDir}/${cfg.keyFilename}";
+      tlsCert = "${cfg.certDir}/${cfg.certFilename}";
+      mtlsBundle = "${cfg.certDir}/${cfg.bundleFilename}";
+      sanArgs = lib.concatMapStringsSep " " (san: "--san \"${san}\"") cfg.san;
+    in
+    {
+      options.mtls = opts // {
+        certDir = lib.mkOption {
+          description = "String path to where the mtls certs will be stored.";
+          type = lib.types.str;
+          default ="${config.home.homeDirectory}/.step/certs";
+        };
+      };
+
+      config = {
+        home.packages = with pkgs; lib.optionals cfg.enable [
+          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.services.mtls-renew = lib.mkIf cfg.renew.enable (mkHomeManagerMtlsRenewService {
+          inherit pkgs tlsCert tlsKey mtlsBundle;
+          inherit (cfg.renew) reloadUnits postCommands;
+        });
+
+        systemd.user.timers.mtls-renew = lib.mkIf cfg.renew.enable (mkHomeManagerMtlsRenewTimer {
+          inherit (cfg.renew) onCalendar randomizedDelaySec;
+        });
+      };
+    };
+}

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

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

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

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

modules/users/john.nix

@@ -1,49 +1,47 @@
-{ self, inputs, lib, ... }:
+{ inputs, ... }:
 let
   username = "john";
-  baseUserModules = self.factory.user {
-    username = username;
-    isAdmin = true;
-  };
 in
 {
-  flake.meta.users."${username}" = {
+  flake = {
+    meta.users."${username}" = {
       email = "32917998+jsl12@users.noreply.github.com";
       name = "John Lancaster";
-    inherit username;
+      username = "${username}";
       key = "";
-    keygrip = [ ];
+      keygrip = [
+      ];
       authorizedKeys = [
         # "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIAUa4dcg1TWc4pW++uodyhX4eOqrX/QYIxFWtEP7HFJ john@john-pc-ubuntu"
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMOkGLo4N/L3RYvaIZ1FmePlxa1HK0fMciZxKtRhN58F root@janus"
       ];
     };
 
-  flake.modules = {
+    modules = {
-    nixos."${username}" = { ... }: {
+      nixos."${username}" = {
         imports = [
-        baseUserModules.nixos."${username}"
+          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}" = with inputs.self.meta.users."${username}"; {
-    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;
+
+        imports = with inputs.self.modules.homeManager; [
+          ssh
+          shell-tools
+          git
+        ];
+      };
     };
   };
 }