rest server

added quotes to fix error
added joplin desktop to john-p14s
2026-04-16 17:31:57 -05:00 · 2026-04-15 23:20:08 -05:00 · 2026-04-15 23:20:08 -05:00 · 2026-04-14 17:30:22 -05:00 · 2026-04-14 17:30:11 -05:00 · 2026-04-14 17:29:56 -05:00
45 changed files with 1872 additions and 778 deletions
@@ -9,6 +9,12 @@ creation_rules:
    - age:
      - *john-pc
      - *soteria
+      - *test-nix
+  - path_regex: john-p14s/secrets\.yaml$
+    key_groups:
+    - age:
+      - *john-p14s
+      - *john-pc
  - path_regex: john-pc/secrets\.yaml$
    key_groups:
    - age:
@@ -1,12 +1,28 @@
 {
  "nodes": {
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1751685974,
+        "narHash": "sha256-NKw96t+BgHIYzHUjkTK95FqYRVKB8DHpVhefWSz/kTw=",
+        "ref": "refs/heads/main",
+        "rev": "549f2762aebeff29a2e5ece7a7dc0f955281a1d1",
+        "revCount": 92,
+        "type": "git",
+        "url": "https://git.lix.systems/lix-project/flake-compat.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.lix.systems/lix-project/flake-compat.git"
+      }
+    },
    "flake-file": {
      "locked": {
-        "lastModified": 1773554778,
-        "narHash": "sha256-keH0VNsci9e0Uwt3Msp/N+pltaP8Lb6lt09Q3WvDPw4=",
+        "lastModified": 1775848911,
+        "narHash": "sha256-dqva/tlWxsXj32wYPdt06UrrR4l2QdK9JWyvPooWRi4=",
        "owner": "vic",
        "repo": "flake-file",
-        "rev": "f4780a86bd4c756475d839b286f8a40aabdbc802",
+        "rev": "b36cbd5fc01e9794a001ccb0c58b314efaabae08",
        "type": "github"
      },
      "original": {
@@ -22,11 +38,32 @@
        ]
      },
      "locked": {
-        "lastModified": 1772408722,
-        "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
+        "lastModified": 1775087534,
+        "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3",
+        "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-parts_2": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "nvf",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1769996383,
+        "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
        "type": "github"
      },
      "original": {
@@ -58,11 +95,11 @@
        "nixpkgs": "nixpkgs"
      },
      "locked": {
-        "lastModified": 1773608492,
-        "narHash": "sha256-QZteyExJYSQzgxqdsesDPbQgjctGG7iKV/6ooyQPITk=",
+        "lastModified": 1776046499,
+        "narHash": "sha256-Wzc4nn07/0RL21ypPHRzNDQZcjhIC8LaYo7QJQjM5T4=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "9a40ec3b78fc688d0908485887d355caa5666d18",
+        "rev": "287f84846c1eb3b72c986f5f6bebcff0bd67440d",
        "type": "github"
      },
      "original": {
@@ -73,11 +110,11 @@
    },
    "import-tree": {
      "locked": {
-        "lastModified": 1773554199,
-        "narHash": "sha256-6apV5N1F5tTD8JY9AUGnkWmy56HqDPn4MNFRsq4Rg+s=",
+        "lastModified": 1773693634,
+        "narHash": "sha256-BtZ2dtkBdSUnFPPFc+n0kcMbgaTxzFNPv2iaO326Ffg=",
        "owner": "vic",
        "repo": "import-tree",
-        "rev": "c6ebc59c85ee54cfb68163d06d1a3149ce0fe431",
+        "rev": "c41e7d58045f9057880b0d85e1152d6a4430dbf1",
        "type": "github"
      },
      "original": {
@@ -86,6 +123,43 @@
        "type": "github"
      }
    },
+    "mnw": {
+      "locked": {
+        "lastModified": 1770419553,
+        "narHash": "sha256-b1XqsH7AtVf2dXmq2iyRr2NC1yG7skY7Z6N2MpWHlK4=",
+        "owner": "Gerg-L",
+        "repo": "mnw",
+        "rev": "2aaffa8030d0b262176146adbb6b0e6374ce2957",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Gerg-L",
+        "repo": "mnw",
+        "type": "github"
+      }
+    },
+    "ndg": {
+      "inputs": {
+        "nixpkgs": [
+          "nvf",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1768214250,
+        "narHash": "sha256-hnBZDQWUxJV3KbtvyGW5BKLO/fAwydrxm5WHCWMQTbw=",
+        "owner": "feel-co",
+        "repo": "ndg",
+        "rev": "a6bd3c1ce2668d096e4fdaaa03ad7f03ba1fbca8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "feel-co",
+        "ref": "refs/tags/v2.6.0",
+        "repo": "ndg",
+        "type": "github"
+      }
+    },
    "nixgl": {
      "inputs": {
        "flake-utils": "flake-utils",
@@ -110,11 +184,11 @@
    "nixos-hardware": {
      "flake": false,
      "locked": {
-        "lastModified": 1774465523,
-        "narHash": "sha256-4v7HPm63Q90nNn4fgkgKsjW1AH2Klw7XzPtHJr562nM=",
+        "lastModified": 1775490113,
+        "narHash": "sha256-2ZBhDNZZwYkRmefK5XLOusCJHnoeKkoN95hoSGgMxWM=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "de895be946ad1d8aafa0bb6dfc7e7e0e9e466a29",
+        "rev": "c775c2772ba56e906cbeb4e0b2db19079ef11ff7",
        "type": "github"
      },
      "original": {
@@ -125,11 +199,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1773389992,
-        "narHash": "sha256-wvfdLLWJ2I9oEpDd9PfMA8osfIZicoQ5MT1jIwNs9Tk=",
+        "lastModified": 1775423009,
+        "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "c06b4ae3d6599a672a6210b7021d699c351eebda",
+        "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9",
        "type": "github"
      },
      "original": {
@@ -141,11 +215,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1773507054,
-        "narHash": "sha256-yzDBkI1CpeZrAt4l1nGvTOs3OFtXCS7a7Gi5Y1h878w=",
-        "rev": "e80236013dc8b77aa49ca90e7a12d86f5d8d64c9",
+        "lastModified": 1775888245,
+        "narHash": "sha256-qTVvODr6edFBLD2lncXPF8yTQeCafZUuKVtpV3Xb3yM=",
+        "rev": "13043924aaa7375ce482ebe2494338e058282925",
        "type": "tarball",
-        "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre963414.e80236013dc8/nixexprs.tar.xz"
+        "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre978638.13043924aaa7/nixexprs.tar.xz"
      },
      "original": {
        "type": "tarball",
@@ -154,11 +228,11 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1773840656,
-        "narHash": "sha256-9tpvMGFteZnd3gRQZFlRCohVpqooygFuy9yjuyRL2C0=",
+        "lastModified": 1775579569,
+        "narHash": "sha256-/m3yyS/EnXqoPGBJYVy4jTOsirdgsEZ3JdN2gGkBr14=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "9cf7092bdd603554bd8b63c216e8943cf9b12512",
+        "rev": "dfd9566f82a6e1d55c30f861879186440614696e",
        "type": "github"
      },
      "original": {
@@ -168,6 +242,31 @@
        "type": "github"
      }
    },
+    "nvf": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "flake-parts": "flake-parts_2",
+        "mnw": "mnw",
+        "ndg": "ndg",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1775892726,
+        "narHash": "sha256-1TK1pe33cEHNvGW41TP5xAzrbG1Gp7LfyFL6c3+xf+I=",
+        "owner": "notashelf",
+        "repo": "nvf",
+        "rev": "5ab359ee7dfd3fa09a5c6f863efaf810bb9a9436",
+        "type": "github"
+      },
+      "original": {
+        "owner": "notashelf",
+        "repo": "nvf",
+        "type": "github"
+      }
+    },
    "root": {
      "inputs": {
        "flake-file": "flake-file",
@@ -180,8 +279,10 @@
        "nixpkgs-lib": [
          "nixpkgs"
        ],
+        "nvf": "nvf",
        "sops-nix": "sops-nix",
-        "wrapper-modules": "wrapper-modules"
+        "wrapper-modules": "wrapper-modules",
+        "wrappers": "wrappers"
      }
    },
    "sops-nix": {
@@ -191,11 +292,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1773550941,
-        "narHash": "sha256-wa/++bL2QeMUreNFBZEWluQfOYB0MnQIeGNMuaX9sfs=",
+        "lastModified": 1775971308,
+        "narHash": "sha256-VKp9bhVSm0bT6JWctFy06ocqxGGnWHi1NfoE90IgIcY=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "c469b6885f0dcd5c7c56bd935a0f08dbcd9e79e1",
+        "rev": "31ac5fe5d015f76b54058c69fcaebb66a55871a4",
        "type": "github"
      },
      "original": {
@@ -219,16 +320,31 @@
        "type": "github"
      }
    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
    "wrapper-modules": {
      "inputs": {
        "nixpkgs": "nixpkgs_3"
      },
      "locked": {
-        "lastModified": 1774400689,
-        "narHash": "sha256-hHABVYL0rxhVIzc7hZEpvE0eiCKPnevte73Tn6FRolo=",
+        "lastModified": 1775940860,
+        "narHash": "sha256-8Jxnn2uoFhm2H579ycVxFWDtrywJ6Mc8RmqWbZwk5So=",
        "owner": "BirdeeHub",
        "repo": "nix-wrapper-modules",
-        "rev": "54645978682ff99594a1d1666dde6fac6a8134f2",
+        "rev": "fb62851ffc5f6a4d53ebc00b93743e29b41e6224",
        "type": "github"
      },
      "original": {
@@ -236,6 +352,26 @@
        "repo": "nix-wrapper-modules",
        "type": "github"
      }
+    },
+    "wrappers": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1775600302,
+        "narHash": "sha256-2fgKImv78CXIcfo1RsY7EI4uMZ84x/MggA5rrusYc7c=",
+        "owner": "lassulus",
+        "repo": "wrappers",
+        "rev": "9d8397d8ef1ac35763085f3338589f558128f7db",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lassulus",
+        "repo": "wrappers",
+        "type": "github"
+      }
    }
  },
  "root": "root",
@@ -21,10 +21,18 @@
    };
    nixpkgs.url = "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz";
    nixpkgs-lib.follows = "nixpkgs";
+    nvf = {
+      url = "github:notashelf/nvf";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
    sops-nix = {
      url = "github:Mic92/sops-nix";
      inputs.nixpkgs.follows = "nixpkgs";
    };
    wrapper-modules.url = "github:BirdeeHub/nix-wrapper-modules";
+    wrappers = {
+      url = "github:lassulus/wrappers";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
  };
 }
@@ -4,4 +4,6 @@
    # https://github.com/vic/flake-file/tree/main/modules/dendritic
    inputs.flake-file.flakeModules.dendritic
  ];
+
+  systems = [ "x86_64-linux" "aarch64-linux" ];
 }
@@ -1,11 +1,11 @@
 # This module is for programs with GUIs that run in a desktop environment
-{ inputs, ... }:
-{
-  flake.modules.homeManager.desktop = { pkgs, ... }: {
+{ self, inputs, ... }: {
+  flake.modules.homeManager.desktop = { config, pkgs, lib, ... }: {
    imports = with inputs.self.modules.homeManager; [
      brave
      ghostty
      onepassword
+      vscode
    ];
    home.packages = with pkgs; [
      mangohud
@@ -0,0 +1,147 @@
+{ self, inputs, ... }: {
+  flake.modules.nixos.forgejo = {config, pkgs, lib, ... }:
+    let
+      cfg = config.forgejo;
+      needsPrivilegedPort = cfg.port < 1024;
+    in
+    {
+      options.forgejo = {
+        enable = lib.mkEnableOption "Enable Forgejo backed with PostgreSQL";
+        root_url = lib.mkOption {
+          type = lib.types.str;
+        };
+
+        port = lib.mkOption {
+          type = lib.types.port;
+          default = 3000;
+          description = "TCP port for the Forgejo web interface.";
+        };
+
+        openFirewall = lib.mkOption {
+          type = lib.types.bool;
+          default = true;
+          description = "Open the Forgejo web interface port in the firewall.";
+        };
+
+        https = lib.mkEnableOption "Open the Forgejo web interface port in the firewall.";
+      };
+
+      config = lib.mkIf cfg.enable {
+        networking.firewall.allowedTCPPorts = lib.optionals cfg.openFirewall [ cfg.port ];
+
+        systemd.services.forgejo.serviceConfig = lib.mkIf needsPrivilegedPort {
+          AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];
+          CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ];
+          PrivateUsers = lib.mkForce false;
+        };
+
+        sops.secrets = {
+          "forgejo/secret_key".owner = config.services.forgejo.user;
+          "forgejo/internal_token".owner = config.services.forgejo.user;
+          "forgejo/jwt_secret".owner = config.services.forgejo.user;
+          "forgejo/lfs_jwt_secret".owner = config.services.forgejo.user;
+        };
+
+        services = {
+          forgejo = {
+            enable = true;
+            lfs.enable = true;
+            database.type = "postgres";
+            settings = {
+              DEFAULT = {
+                RUN_MODE = "dev";
+              };
+              server = lib.mkMerge [
+                {
+                  HTTP_PORT = cfg.port;
+                  DISABLE_SSH = true;
+                  ROOT_URL = cfg.root_url;
+                }
+                (lib.mkIf cfg.https {
+                  PROTOCOL = "https";
+                  COOKIE_SECURE = true;
+                  KEY_FILE = config.mtls.keyFile;
+                  CERT_FILE = config.mtls.certFile;
+                })
+              ];
+              oauth2_client = {
+                ENABLE_AUTO_REGISTRATION = true;
+                USERNAME = "nickname";
+                UPDATE_AVATAR = true;
+                ACCOUNT_LINKING = "login";
+                REGISTER_EMAIL_CONFIRM = false;
+              };
+              repository = {
+                ENABLE_PUSH_CREATE_USER = true;
+              };
+              ui.SHOW_USER_EMAIL = false;
+              markup = {
+                ENABLED = true;
+              };
+            };
+
+            secrets = {
+              security = {
+                SECRET_KEY = lib.mkForce config.sops.secrets."forgejo/secret_key".path;
+                INTERNAL_TOKEN = lib.mkForce config.sops.secrets."forgejo/internal_token".path;
+              };
+              oauth2.JWT_SECRET = lib.mkForce config.sops.secrets."forgejo/jwt_secret".path;
+              server.LFS_JWT_SECRET = lib.mkForce config.sops.secrets."forgejo/lfs_jwt_secret".path;
+            };
+            dump = {
+              enable = true;
+              type = "tar";
+              interval = "*-*-* 00/12:00:00";
+            };
+          };
+
+          postgresql = {
+            enable = true;
+            enableTCPIP = false;
+          };
+        };
+
+        # https://forgejo.org/docs/latest/admin/command-line/#dump
+        systemd.services.forgejo-dump.serviceConfig.ExecStart = lib.mkForce ''
+          ${lib.getExe config.services.forgejo.package} dump --verbose \
+          --type ${config.services.forgejo.dump.type} \
+          --database postgres \
+          --work-path ${config.services.forgejo.dump.backupDir}
+        '';
+
+        environment.systemPackages =
+          let
+            systemctl = lib.getExe' pkgs.systemd "systemctl";
+            clean-forgejo = (pkgs.writeShellScriptBin "clean-forgejo" ''
+              set -euo pipefail
+              sudo ${systemctl} stop forgejo.service
+              ${lib.getExe' pkgs.coreutils "echo"} "Stopped Forgejo"
+              sudo ${lib.getExe' pkgs.coreutils "rm"} -rf ${config.services.forgejo.stateDir}
+              ${lib.getExe' pkgs.coreutils "echo"} "Removed ${config.services.forgejo.stateDir}"
+            '');
+            clean-postgres = (pkgs.writeShellScriptBin "clean-postgres" ''
+              set -euo pipefail
+              sudo ${systemctl} stop postgresql.service
+              ${lib.getExe' pkgs.coreutils "echo"} "Stopped PostgreSQL"
+              sudo ${lib.getExe' pkgs.coreutils "rm"} -rf ${config.services.postgresql.dataDir}
+              ${lib.getExe' pkgs.coreutils "echo"} "Removed ${config.services.postgresql.dataDir}"
+            '');
+          in [
+            clean-forgejo
+            clean-postgres
+            (pkgs.writeShellScriptBin "clean-all" ''
+              set -euo pipefail
+              GREEN_CHECK="\e[32m✔\e[0m"
+              YELLOW_BANG="\e[33m!\e[0m"
+              ${lib.getExe' pkgs.coreutils "echo"} -n -e "$YELLOW_BANG Remove everything related to Forgejo and the PostgreSQL database behind it?"
+              read -p " (y/n) " -n 1 -r
+              if [[ $REPLY =~ ^[Yy]$ ]]; then
+                ${lib.getExe clean-forgejo}
+                ${lib.getExe clean-postgres}
+                ${lib.getExe' pkgs.coreutils "echo"} -e "$GREEN_CHECK Removed everything related to forgejo"
+              fi
+            '')
+          ];
+      };
+    };
+}
@@ -11,53 +11,97 @@
        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 = { pkgs, ... }: {
-    dconf.settings = {
-      "org/gnome/desktop/interface" = {
-        color-scheme = "prefer-dark";
-      };
-      "org/gnome/shell" = {
-        disable-user-extensions = false;
-
+  flake.modules.homeManager.gnome = { config, pkgs, ... }:
+  let
    # `gnome-extensions list` for a list
-        enabled-extensions = with pkgs.gnomeExtensions; [
-          appindicator.extensionUuid
-          gtile.extensionUuid
-          space-bar.extensionUuid
-          switcher.extensionUuid
-          tactile.extensionUuid
-          vitals.extensionUuid
-          dash-to-panel.extensionUuid
+    extensions = with pkgs.gnomeExtensions; [
+      appindicator # For gnome systray icons
+      dash-to-panel
+      gtile
+      space-bar
+      switcher
+      tactile
+      vitals
    ];
-      };
-      "org/gnome/desktop/wm/preferences" = {
-        button-layout = ":minimize,close";
-      };
-    };
-
+    enabledExtensions = map (ext: ext.extensionUuid) extensions;
+  in
+  {
    gtk = {
      enable = true;
      theme = {
        name = "Orchis-Dark";
        package = pkgs.orchis-theme;
      };
+      gtk4.theme = config.gtk.theme;
    };

-    home.packages = with pkgs; [
-      gnome-tweaks
-      gnomeExtensions.appindicator # For gnome systray icons
-      gnomeExtensions.dash-to-panel
-      gnomeExtensions.gtile
-      gnomeExtensions.space-bar
-      gnomeExtensions.switcher
-      gnomeExtensions.tactile
-      gnomeExtensions.vitals
+    home.packages = [ pkgs.gnome-tweaks ] ++ extensions;
+
+    dconf.settings = {
+      "org/gnome/desktop/interface" = {
+        color-scheme = "prefer-dark";
+      };
+
+      "org/gnome/shell" = {
+        disable-user-extensions = false;
+        enabled-extensions = enabledExtensions;
+      };
+
+      "org/gnome/desktop/wm/preferences" = {
+        button-layout = ":minimize,close";
+      };
+
+      "org/gnome/desktop/wm/keybindings" = {
+        "switch-to-workspace-1" = ["<Super>1"];
+        "switch-to-workspace-2" = ["<Super>2"];
+        "switch-to-workspace-3" = ["<Super>3"];
+        "switch-to-workspace-4" = ["<Super>4"];
+        "move-to-workspace-1" = ["<Shift><Super>1"];
+        "move-to-workspace-2" = ["<Shift><Super>2"];
+        "move-to-workspace-3" = ["<Shift><Super>3"];
+        "move-to-workspace-4" = ["<Shift><Super>4"];
+      };
+
+      "org/gnome/settings-daemon/plugins/media-keys" = {
+        custom-keybindings = [
+          "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/edit-nix/"
+          "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/launch-browser/"
+          "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/ad-dev/"
+          "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/shutdown/"
        ];
      };
+
+      "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/edit-nix" = {
+        binding = "<Primary><Alt>n";
+        command = "code /etc/nixos";
+        name = "Edit Nix config";
+      };
+
+      "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/launch-browser" = {
+        binding = "<Primary><Alt>b";
+        command = "brave";
+        name = "Launch Brave browser";
+      };
+
+      "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/ad-dev" = {
+        binding = "<Primary><Alt>d";
+        command = ''code --file-uri "vscode-remote://ssh-remote+ad-nix/etc/nixos/ad-nix.code-workspace"'';
+        name = "Launch AppDaemon Development over Tailscale";
+      };
+
+      "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/ws1" = {
+        binding = "<Super>1";
+        command = "wmctrl -s 0";
+        name = "Switch to workspace 1";
+      };
+
+      "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/shutdown" = {
+        binding = "<Primary><Alt>p";
+        command = "gnome-session-quit --power-off --force";
+        name = "Shutdown immediately";
+      };
+    };
+  };
 }
@@ -1,6 +1,6 @@
 # https://github.com/glabrie/dotfiles/blob/main/modules/system/settings/greetd.nix
 { inputs, ... }: {
-  flake.module.nixos.greetd = { pkgs, lib, ... }: {
+  flake.modules.nixos.greetd = { pkgs, lib, ... }: {
    services.greetd = {
      enable = true;
      settings = {
@@ -0,0 +1,352 @@
+{ 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 = 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.";
+        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}
+      '';
+    };
+  
+  mkMtlsCheckScript = { pkgs, bundleFile }: pkgs.writeShellApplication {
+    name = "mtls-check";
+    runtimeInputs = with pkgs; [ openssl ];
+    text = ''
+      openssl x509 -noout -in ${bundleFile} \
+        -subject -issuer \
+        -ext subjectAltName,extendedKeyUsage \
+        -enddate
+    '';
+  };
+
+  mkMtlsRenewScript = {
+    pkgs,
+    cfg,
+    systemctlArgs ? [ ],
+  }:
+  let
+    systemctlCmd = "systemctl ${lib.escapeShellArgs systemctlArgs}";
+
+    hasReloadUnits = cfg.renew.reloadUnits != [ ];
+    renewReloadScript = lib.concatMapStringsSep "\n" (unit: ''
+      if ${systemctlCmd} --quiet is-active "${unit}"; then
+        ${systemctlCmd} try-reload-or-restart "${unit}"
+      fi
+    '') cfg.renew.reloadUnits;
+
+    hasPostCommands = cfg.renew.postCommands != [ ];
+    renewPostCommands = lib.concatStringsSep "\n" cfg.renew.postCommands;
+
+    fileOwner = "${cfg.renew.user}:${cfg.renew.group}";
+  in
+    pkgs.writeShellApplication {
+      name = "mtls-renew";
+      runtimeInputs = with 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 "${cfg.certFile}"; then
+        echo "Skipping renew"
+        exit 0
+      fi
+
+      echo "Renewing mTLS certificate"
+      step ca renew --force "${cfg.certFile}" "${cfg.keyFile}"
+      (umask 077; cat "${cfg.certFile}" "${cfg.keyFile}" > "${cfg.bundleFile}")
+      chown ${fileOwner} ${cfg.certFile} ${cfg.keyFile} ${cfg.bundleFile}
+      chmod 640 ${cfg.certFile} ${cfg.keyFile} ${cfg.bundleFile}
+
+      ${lib.optionalString hasReloadUnits ''
+        echo "Reloading units: ${lib.concatStringsSep ", " cfg.renew.reloadUnits}"
+        ${renewReloadScript}
+      ''}
+
+      ${lib.optionalString hasPostCommands ''echo "Post commands:" ${renewPostCommands}''}
+      '';
+    };
+
+  mkNixosMtlsRenewService = { pkgs, cfg, ... }:
+    {
+      description = "Renew the mTLS certificate when Smallstep marks it ready";
+      wantedBy = [ ];
+      after = [ "network-online.target" ];
+      wants = [ "network-online.target" ];
+      serviceConfig = {
+        Type = "oneshot";
+        User = cfg.renew.user;
+        Group = cfg.renew.group;
+        ExecStart = lib.getExe (mkMtlsRenewScript { inherit pkgs cfg; });
+      };
+    };
+
+  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, cfg, ... }:
+  let
+    renewScript = mkMtlsRenewScript {
+      inherit pkgs cfg;
+      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;
+      sanArgs = lib.concatMapStringsSep " " (san: "--san \"${san}\"") cfg.san;
+    in
+    {
+      options.mtls = (mkOpts config) // {
+        certDir = lib.mkOption {
+          description = "String path to where the mtls certs will be stored.";
+          type = lib.types.str;
+          default = "/etc/step-ca/certs";
+        };
+        certReaders = lib.mkOption {
+          description = "";
+          type = lib.types.listOf lib.types.str;
+          default = [ ];
+        };
+      };
+
+      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;
+          })
+          (mkMtlsCheckScript { inherit pkgs; inherit (cfg) bundleFile; })
+          (mkMtlsRenewScript { inherit pkgs cfg; })
+        ];
+
+        systemd.tmpfiles.rules = [
+          "d ${cfg.certDir} 0750 ${cfg.renew.user} ${cfg.renew.group} -"
+        ];
+
+        systemd.services.mtls-renew = lib.mkIf cfg.renew.enable
+          (mkNixosMtlsRenewService { inherit pkgs cfg; });
+
+        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;
+      keyFile = cfg.keyFile;
+      certFile = cfg.certFile;
+      bundleFile = cfg.bundleFile;
+      sanArgs = lib.concatMapStringsSep " " (san: "--san \"${san}\"") cfg.san;
+    in
+    {
+      options.mtls = (mkOpts config) // {
+        certDir = lib.mkOption {
+          description = "String path to where the mtls certs will be stored.";
+          type = lib.types.str;
+          default = "${config.home.homeDirectory}/.step/certs";
+        };
+      };
+
+      config = {
+        home.packages = with pkgs; lib.optionals cfg.enable [
+          # step-cli
+          (mkMtlsGenerateScript {
+            inherit (cfg) subject provisioner san lifetime;
+            inherit (cfg.renew) user group;
+            inherit pkgs certFile keyFile bundleFile;
+          })
+          (mkMtlsCheckScript { inherit pkgs bundleFile; })
+          (mkMtlsRenewScript { inherit pkgs cfg; systemctlArgs = [ "--user" ]; })
+        ];
+
+        systemd.user.tmpfiles.rules = lib.mkIf cfg.enable [
+          "d ${cfg.certDir} 0700 - - -"
+        ];
+
+        systemd.user.services.mtls-renew = lib.mkIf cfg.renew.enable
+          (mkHomeManagerMtlsRenewService { inherit pkgs cfg; });
+
+        systemd.user.timers.mtls-renew = lib.mkIf cfg.renew.enable (mkHomeManagerMtlsRenewTimer {
+          inherit (cfg.renew) onCalendar randomizedDelaySec;
+        });
+      };
+    };
+}
@@ -1,4 +1,4 @@
-{ inputs, ... }: {
+{ self, inputs, ... }: {
  flake.modules.nixos.restic-server = { config, pkgs, lib, ... }: {
    services.restic.server = {
      enable = true;
@@ -19,6 +19,11 @@
          type = lib.types.str;
          default = "john-ubuntu";
        };
+        repoUrl = lib.mkOption {
+          description = "URL to the REST endpoint";
+          type = lib.types.str;
+          default = "rest:https://soteria.john-stream.com/${cfg.repoName}";
+        };
        passwordFile = lib.mkOption {
          description = "String path to the restic password file";
          type = lib.types.str;
@@ -44,29 +49,24 @@
        };
      };

-      config = let
-        resticRepository = "rest:https://soteria.john-stream.com/${cfg.repoName}";
-        caCert = "${config.mtls.certDir}/root_ca.crt";
-        mtlsClientCert = "${config.mtls.certDir}/${config.mtls.bundleFilename}";
-      in
-      {
+      config = {
        home.sessionVariables = {
-          RESTIC_REPOSITORY = resticRepository;
+          RESTIC_REPOSITORY = cfg.repoUrl;
          RESTIC_PASSWORD_FILE = cfg.passwordFile;
-          RESTIC_CACERT = caCert;
-          RESTIC_TLS_CLIENT_CERT = mtlsClientCert;
+          RESTIC_CACERT = config.mtls.caFile;
+          RESTIC_TLS_CLIENT_CERT = config.mtls.bundleFile;
        };
        
        # This is necessary because the restic service in home manager doesn't otherwise expose these options.
        systemd.user.services."restic-backups-${cfg.repoName}".Service.Environment = [
-          "RESTIC_CACERT=${caCert}"
-          "RESTIC_TLS_CLIENT_CERT=${mtlsClientCert}"
+          "RESTIC_CACERT=${config.mtls.caFile}"
+          "RESTIC_TLS_CLIENT_CERT=${config.mtls.bundleFile}"
        ];

        services.restic = {
          enable = true;
          backups.${cfg.repoName} = {
-            repository = resticRepository;
+            repository = cfg.repoUrl;
            passwordFile = cfg.passwordFile;
            paths = cfg.paths;
            timerConfig = {
@@ -21,6 +21,9 @@
      home.shell.enableShellIntegration = true;
      programs.zsh.enable  = lib.mkForce (config.shell.program == "zsh");
      home.packages = with pkgs; [
+        nh
+        nvd
+        nix-output-monitor
        wget
        curl
        busybox
@@ -31,6 +34,7 @@
        xclip
        jq
        ripgrep
+        (writeShellScriptBin "ds" ''${lib.getExe pkgs.gdu} -x -I /snap /'')
      ];
    };
  };
@@ -2,12 +2,57 @@
 let
  username = "john";
  hostname = "janus";
+  ca-url = "https://janus.john-stream.com/";
+  fingerprint = builtins.readFile ./fingerprint;
 in
 {
+  flake.modules.nixos.janus-ca =
+    { config, lib, ... }:
+    let
+      cfg = config.janus-ca;
+      johnHome = lib.attrByPath [ "users" "users" username "home" ] "/home/${username}" config;
+      johnGroup = lib.attrByPath [ "users" "users" username "group" ] username config;
+      cfgInEtc = lib.hasPrefix "/etc/" cfg.certDir;
+      certDirEtcPath =
+        if cfgInEtc then
+          lib.removePrefix "/etc/" cfg.certDir
+        else
+          cfg.certDir;
+      certRootEtcPath = "${certDirEtcPath}/root_ca.crt";
+      mkStepRules = home: user: group: [
+        "d ${home}/.step 0700 ${user} ${group} -"
+        "d ${home}/.step/config 0700 ${user} ${group} -"
+        "d ${home}/.step/certs 0700 ${user} ${group} -"
+        "L+ ${home}/.step/config/defaults.json - - - - /etc/step-ca/defaults.json"
+        "L+ ${home}/.step/certs/root_ca.crt - - - - ${cfg.certDir}/root_ca.crt"
+      ];
+    in
+    {
+      options.janus-ca = {
+        certDir = lib.mkOption {
+          description = "String path to where the mtls certs will be stored.";
+          type = lib.types.str;
+          default = "/etc/step-ca/certs";
+        };
+      };
+
+      config = {
+        environment.etc = lib.mkIf cfgInEtc {
+          "step-ca/defaults.json".text = builtins.toJSON {
+            inherit ca-url fingerprint;
+            root = "/etc/${certRootEtcPath}";
+          };
+          "${certRootEtcPath}".source = ./root_ca.crt;
+        };
+        systemd.tmpfiles.rules =
+          mkStepRules johnHome username johnGroup
+          ++ mkStepRules "/root" "root" "root";
+      };
+    };
+
  flake.modules.homeManager.janus-ca = { config, ... }: {
    home.file.".step/config/defaults.json".text = builtins.toJSON {
-      "ca-url" = "https://janus.john-stream.com/";
-      fingerprint = "2036c44f7b5901566ff7611ea6c927291ecc6d2dd00779c0eead70ec77fa10d6";
+      inherit ca-url fingerprint;
      root = "${config.home.homeDirectory}/.step/certs/root_ca.crt";
    };
    home.file.".step/certs/root_ca.crt".source = ./root_ca.crt;
@@ -18,9 +63,9 @@ in
      nixos.lxc
      nixos.mysops
      nixos.step-ssh-host
+      nixos.janus-ca
      inputs.home-manager.nixosModules.home-manager
      nixos."${username}"
-      nixos.zsh
      nixos.docker
      nixos.login-text
      nixos.mtls
@@ -40,9 +85,8 @@ in

        home-manager.users."${username}" = {
          imports = with inputs.self.modules.homeManager; [
-            sops
+            mysops
            step-ssh-user
-            janus-ca
          ];
          shell.program = "zsh";
          docker.enable = true;
@@ -50,4 +94,16 @@ in
      }
    ];
  };
+
+  perSystem = { system, pkgs, lib, ... }: {
+    packages.janus-ca = inputs.wrappers.lib.wrapPackage {
+      inherit pkgs;
+      package = pkgs.step-cli;
+      binName = "janus-cert";
+      args = [
+        "ca" "certificate"
+        "--ca-url=${ca-url}"
+      ];
+    };
+  };
 }
@@ -0,0 +1 @@
+2036c44f7b5901566ff7611ea6c927291ecc6d2dd00779c0eead70ec77fa10d6
@@ -1,8 +1,11 @@
 { self, inputs, ... }:
 {
-  flake.modules.nixos.p14sConfiguration = { pkgs, lib, ... }:
+  flake.modules.nixos.p14sConfiguration = { config, pkgs, lib, ... }:
    let
      hostname = "john-p14s";
+      homeDirectory = config.home-manager.users.john.home.homeDirectory;
+      flakeDir = "${homeDirectory}/Documents/dendritic";
+      my-neovim = inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.my-neovim;
    in
    {
      imports = [
@@ -11,29 +14,20 @@

      nix.settings.experimental-features = [ "nix-command" "flakes" ];
      nixpkgs.config = {
-        allowUnfree = true;
        permittedInsecurePackages = [ "openssl-1.1.1w" ];
+        allowUnfree = true;
      };

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

      # Enable automatic login for the user.
-      services.displayManager.autoLogin.enable = true;
-      services.displayManager.autoLogin.user = "john";
-
-      # Define a user account. Don't forget to set a password with 'passwd'.
-      users.users.john = {
-        isNormalUser = true;
-        description = "John Lancaster";
-        extraGroups = [
-          "networkmanager"
-          "wheel"
-        ];
-        shell = pkgs.zsh;
-      };
+      # services.displayManager.autoLogin.enable = true;
+      # services.displayManager.autoLogin.user = "john";

      programs.zsh.enable = true;
      services.openssh.enable = true;
@@ -47,6 +41,7 @@
        busybox
        dig
        samba
+        my-neovim
      ];

      security.pam.services.swaylock = {};
@@ -64,24 +59,6 @@
      # 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
@@ -94,9 +71,9 @@
      time.timeZone = "America/Chicago";

      # Select internationalisation properties.
-      i18n.defaultLocale = "en_US.UTF-8";
-
-      i18n.extraLocaleSettings = {
+      i18n = {
+        defaultLocale = "en_US.UTF-8";
+        extraLocaleSettings = {
          LC_ADDRESS = "en_US.UTF-8";
          LC_IDENTIFICATION = "en_US.UTF-8";
          LC_MEASUREMENT = "en_US.UTF-8";
@@ -107,6 +84,7 @@
          LC_TELEPHONE = "en_US.UTF-8";
          LC_TIME = "en_US.UTF-8";
        };
+      };

      services.libinput.enable = true; # Enable touchpad support (enabled default in most desktopManager).
      services.fprintd.enable = true; # Enables fingerprint sensor
@@ -126,5 +104,44 @@
        # 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
+            my-neovim
+            proton-vpn
+            joplin-desktop
+          ];
+          ssh.certificates.enable = true;
+          ssh.matchSets = {
+            appdaemon = true;
+            homelab = true;
+            dev = true;
+            certs = true;
+          };
+        }
+      ];
+      sops.defaultSopsFile = ./secrets.yaml;
+      sops.age.sshKeyPaths = [ "${homeDirectory}/.ssh/id_ed25519" ];
+      mtls = {
+        enable = true;
+        subject = hostname;
+      };
    };
 }
@@ -12,9 +12,14 @@
      "${inputs.nixos-hardware}/lenovo/thinkpad/p14s/amd/gen4"
    ] ++ (with self.modules.nixos; [
      p14sConfiguration
+      janus-ca
+      rebuild
      sudo
-      gnome
      john
+      gnome
+      steam
+      wireguard
+      mtls
      # greetd
      # niri
    ]);
@@ -49,14 +49,11 @@
    nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
    hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

-    hardware.graphics = with pkgs; {
-      ## amdvlk: an open-source Vulkan driver from AMD
-      extraPackages = [
-        amdvlk
-        rocmPackages.clr.icd
-      ];
-      extraPackages32 = [ driversi686Linux.amdvlk ];
+    hardware.graphics = {
+      enable = true;
      enable32Bit = true;
+      extraPackages = [ pkgs.rocmPackages.clr.icd ];
    };
+    environment.variables.AMD_VULKAN_ICD = "RADV";
  };
 }
@@ -0,0 +1,26 @@
+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]
+wireguard_private_key: ENC[AES256_GCM,data:sCskwDhemU1y4M4A4R9KxwiL8q+FtxnUqg1omU7yS81H1bbSM804hNzmq+A=,iv:7wNMAG+7wYYXYgKEohIAYisMN5lbz+M5RhCEaHL4yWE=,tag:FENdJTEEGD9cEJVwIIUQDA==,type:str]
+sops:
+    age:
+        - recipient: age1f6drjusg866yscj8029tk4yfpgecklrvezldm02ankm6h8nnwu5s2u6ahy
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHS0F1R0NnV0gyNFlkUEhZ
+            UkxvN1ZLQTFsV0tnR0pLNFJycmduU1VXUlFVCjBkRGxQd1B1c3cweTRsZm9OUCt0
+            anU3RTFUUkxoaXlhdlR0RkxPclVUdVkKLS0tIG9kTEVNK2piRWI5ZWFSejFFUGtD
+            emtTUGk0cVZWR3F5R05WTTFJUFUwNTAKrRYQAJen6QVSgaOyqPxSIniHiMLUfXuv
+            /O1Ebz5xLWn99EhloqW7rHhUxXlhxP2CmwfYXizyKFa6nAu6R+BCgg==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1ykcs39e62pz3xu6cedg8ea685kv5d5qsrhgkndygzm8rx30xd5ys5t3qxt
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBXNWRXZTFWREIzRVhRaWRB
+            anNDb3hsZzFOMFMrclhmeldaOWY4b3BJekFBCkJhbjRvRUwva3lFbzNTKzJqK2p2
+            WVlMaXpvczlhdGduZHIrb2xPaEg3OUUKLS0tIHFtM09mN0FEUWdjWEVEL3VXL00w
+            WHpOY280S2hpVU1mNnozODRoMnB4bGMKK5RrDK2kAZlWf2igqyzWgshxLPj+f74A
+            mCmMLDHo5drNieFYp+guqHaHnZkf9IzpAglj7x6wCITjk+l6go5KvA==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2026-03-27T03:59:09Z"
+    mac: ENC[AES256_GCM,data:MsPAxssWUSvsJQP0Ogrl3r/GoVqeL1L95YTJQbAJZ4FVxhRXP7KfbUnKSclzU6G8CP5WxV18TXZfB4JITKG3Lz5rtVpD/WFMdhDmve0f6BPMAimle2ajWUaWYNePvEynClX3nydLk3h31DjHGa8YvJZqW2ieDb/JDMdBXiLTrWc=,iv:82ul5CV3XXllFCDJfF6beIcAIFj71ycJJF4iEQvovMA=,tag:108L7VkAoPUTLtV74qgrrA==,type:str]
+    unencrypted_suffix: _unencrypted
+    version: 3.12.2
@@ -1,17 +1,25 @@
-{ inputs, ... }:
+{ withSystem, self, inputs, ... }:
 let
  username = "john";
  hostname = "john-pc-ubuntu";
+
+  # testTarget = "fded:fb16:653e:25da:be24:11ff:fe89:1cc3"; # soteria
  # testTarget = "fded:fb16:653e:25da:be24:11ff:fea0:753f"; # test-nix
-  testTarget = "fded:fb16:653e:25da:be24:11ff:fe89:1cc3"; # soteria
+  testHost = "soteria"; # which host to test build
+  testTarget = "test-nix";
+
 in
 {
-  flake.modules.homeManager."${hostname}" = { pkgs, config, ... }:
+  flake.modules.homeManager."${hostname}" = { config, pkgs, lib, ... }:
  let
-    flakeDir = "${config.xdg.configHome}/home-manager/jsl-dendritic";
-    certDir = "${config.mtls.certDir}";
-    mtlsBundle = "${certDir}/${config.mtls.bundleFilename}";
+    selfPkgs = inputs.self.packages.${pkgs.stdenv.hostPlatform.system};
    resticPasswordFile = "${config.xdg.configHome}/restic/password.txt";
+    flakeDir = "${config.xdg.configHome}/home-manager/jsl-dendritic";
+    test-push = with pkgs; writeShellApplication {
+      name = "test-push";
+      runtimeInputs = [ nh ];
+      text = ''nh os switch ${flakeDir}#${testHost} --target-host root@${testTarget} -e none'';
+    };
  in
  {
    imports = with inputs.self.modules.homeManager; [
@@ -25,28 +33,25 @@ in
      docker
      desktop
    ];
-    targets.genericLinux.enable = true;
-
-    shell.program = "zsh";
-
-    home.username = "${username}";
-    home.homeDirectory = "/home/${username}";
-
-    home.packages = with pkgs; [
-      nixos-rebuild
-      (writeShellScriptBin "test-push" ''
-        mkdir -p /var/tmp/nix-build
-        chmod 1777 /var/tmp/nix-build
-        nixos-rebuild switch \
-          --flake ${flakeDir}#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; [
+      nixos-rebuild
+      test-push
+      selfPkgs.neovim-min
+      # ${selfPkgs}.my-neovim
+      # selfPkgs.richPrinter
+      selfPkgs.janus-ca
+    ];
+
+    shell.program = "zsh";
+  
    homeManagerFlakeDir = flakeDir;
    docker.enable = true;

@@ -57,6 +62,9 @@ in
    };
    ssh = {
      certificates.enable = true;
+      knownHosts = [
+        "fded:fb16:653e:25da:be24:11ff:fea0:753f ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ9ZqiWPrCwHjxFCiu0lT4rlQs7KyMapxKJQQ5PJP1eh"
+      ];
      matchSets = {
        certs = true;
        appdaemon = true;
@@ -101,10 +109,9 @@ in
    };
  };

-  flake.homeConfigurations."${hostname}" = inputs.home-manager.lib.homeManagerConfiguration {
-    pkgs = import inputs.nixpkgs { system = "x86_64-linux"; };
-    modules = with inputs.self.modules; [
-      homeManager."${hostname}"
-    ];
-  };
+  flake.homeConfigurations."john@john-pc-ubuntu" = withSystem "x86_64-linux" (ctx@{ config, inputs', ...}:
+    inputs.home-manager.lib.homeManagerConfiguration {
+      pkgs = inputs'.nixpkgs.legacyPackages;
+      modules = [ inputs.self.modules.homeManager."${hostname}" ];
+  });
 }
@@ -1,26 +1,44 @@
 janus:
-    admin_password: ENC[AES256_GCM,data:4pnSq0f1iTNFWn/Qcw+J7LWIXXd/j5v3WwFSzXfqgKA=,iv:/usSHYST8zv7AMvDNuW/fFLL+40IrderjL6bUWzBNd4=,tag:V/q1+SjIcYsZ0+PC/Q7c1A==,type:str]
+    admin_jwk: ENC[AES256_GCM,data:2XcN5X77wTQ+OUXa4C9xAErGvrwJKseHjCcgoj6jt+c=,iv:9x+M1wM0dYND1JYkJjM4N8pSOok2OF+P9vmm9NCumTI=,tag:dTCfh+KB1iRJBVoNsGqvuw==,type:str]
+forgejo:
+    #ENC[AES256_GCM,data:/wtm0uXbiWFoGNWtlTzVuNxBR7CPm2FMB98t3AxSj5V5rltLvzF9BjgWoJCiX3ltzmU=,iv:xaZXbUIGJHxPrLRQzEQI7hgRgc0y061jIhoE3zlcMaA=,tag:fQGheCIdBKm6wE+vtj7g6A==,type:comment]
+    secret_key: ENC[AES256_GCM,data:/jcyeDcsryLqu9Q3VnNaENb71/Tl5JUr0zDzxt8L5UCtnJ/YHA6MKItrQ9ZHFv1XROtnSfZl9D5kKomeM8EVqA==,iv:HxMKAMVQ08gkq6SWENj0/d8i9PhcgPCp5eqbztj9bSg=,tag:nO2dFWT/vfgGc/9JIDZrGw==,type:str]
+    #ENC[AES256_GCM,data:TADqVsZwXpH/zfrXNclavH8Sv++jX081UjK/Mkys5x52gU5fU0ikk478EmwzeergsHpmxxon,iv:v9HsIsud+eiko7F0u622MBrTVDsIxlpqru0Viifvqow=,tag:FLgNTW0EcGhHT6iI9I6Bsg==,type:comment]
+    internal_token: ENC[AES256_GCM,data:7eZM+misgHZz1p6HH9VzCAPIIFjp2vT0kyc9B1KllE+x2URyrgs5IR9SZ+T5vNdMdnlNzF25pUhKzjbak8tVN554rYWp06SczzqhLyaoHKs8iGBohMqfJkoZxxIVSB7g7GC+/SAsb719,iv:XbBXqXh/PqjEcAj0qsajR7Ij56KGT/9Spdp5T549p9I=,tag:o4ONucOkIE2VJ6VjOlPb6w==,type:str]
+    #ENC[AES256_GCM,data:ZqwgnKjaolJtjcy287fnDOkb/oSLnBpfWfsTeVPwbIE8YLRSoPP4gbCnHJBLq+TJNNI=,iv:zTvw4ZS6C1ifUwOijNLuTfUQ3JM+5gj1X2f/s8MwWXc=,tag:Y1yKlL+jIRHVBulGlSErog==,type:comment]
+    jwt_secret: ENC[AES256_GCM,data:e59MlATOorsTIQjtTUKfX5Yo3CVsbbfuKczp1gh1m2D1kkZK3ORFztYpjg==,iv:JH3PVUmXToiThEKDkDJ8MGVMAPlIEgPSWhru+9WgNjk=,tag:FfDpaCPejpw6kGDkxJwDWw==,type:str]
+    lfs_jwt_secret: ENC[AES256_GCM,data:xi9PEKFUGRyc3YOg3JM3KrrENi9xsbeBjiz4R16SK5WDafoGFLazN6KRJQ==,iv:1IhPyQDwA8tZ22pfZJiU8TRTCLCHC/HAnKdmSGDfvcM=,tag:rLdREVSKBm67rt8ayN16Vw==,type:str]
+restic_password: ENC[AES256_GCM,data:u7QOZXJkxVG4J75K5nphb2uJGdz6jbWuVSsKKu+41fshp7cVoRijtr/Cs02LjVse,iv:bt1W2FeBTG6ypBFYzMPXPIkYTSn0uHURY2ui6MRgYY8=,tag:DObAMws/zQcM+UKUe9EECA==,type:str]
 sops:
    age:
        - recipient: age1ykcs39e62pz3xu6cedg8ea685kv5d5qsrhgkndygzm8rx30xd5ys5t3qxt
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB0V1JsVDhnMHpaNHRQRCtw
-            V3JMQm1SREZSYUpaYmZNQ1FEVmN0VFZRSlQ0Ck9wQlpqZFBrRUJENWVBbTd5cVVo
-            ZlhYZnhGamk1ZlQ0N001ZWcrQ1Evb3cKLS0tIHpuTWhRTU1QeWFRUytiU21CMW94
-            eFc0ankvcWhqK3Q4MjRCVC9nTlJteU0K1tJvYM2M1XmlsCTpadHyf6EGE2Lg+XBL
-            TGTjMPSWqClWYB9HFZ4nCurEK/JidBanmGkc0Y9eFz9XYKl7rtyXUw==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA5QThHOFdVQ0F6ZDE3QXdL
+            QVF0WW5yRkNtNXIyRm1LeEhwY2dRRWo0WENZCmZoWmlXZDh4ZGlUR2JYOUxuaVAx
+            WjhXVHBMNWdrdkgvTENJR2RpWldkNTAKLS0tIEF1bS9JSnFTbytBa1U5RjVzWkd3
+            S0pKVVI2RFN5a1BMYXBEY3VOUUM5QTAKNarYZm9DKRQhosSJBn9yryFxDkmFTV/o
+            i8b/tZ1ZybjEXX+X1EsgylM5u8iKkbEyUzqKO0E0gpg4qXSsJaMMYQ==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1h0prahyukq4l564yqwgcpg3g6gdrjflk0suklussjjrjstxd9uesws8633
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBNRzFlWTNxSGpaNU85QTFj
-            SnlRZkpZQTZQVjNqWFhLMHhKVm5ZVXB4Rms0CmZQclFzYkpWLzlqT2xNUTJMd2dJ
-            Wm5PQXNabjRwV1hVRXFGVmxteGk2emMKLS0tIG5kcm5KamxNZmpKVGt5bUo1dVg5
-            dFN2RGdqM29mM3hadXpBakY4QThxZnMKI9RbfXJHIHvYHy/2corfwDq+OHRPrmkA
-            tWLH/KWqwGt0hvc5j8bUfRECgjdXmbC9kpAgDs8PhJF+X1ijVFrIYg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBhdEN2M1lkMFoyQzg3bCsz
+            cVB0NUlkV1JPRjQ1TW5RSVFHUjdNMERoRXlzCk9tc25iMG00TkZjWjk2S2cyVE1J
+            cUFITDh2SkZGN0lpeWJVcWM3V3JrTTQKLS0tIENOWVBzTFYrdHRsMERwV0RKS01j
+            QVI5TVl4L0dwOWpoQ1I2THZ6cWovWGMKIo1x1ZbdTyr/dNlPhvuomfk2MoPLsHyU
+            N3CP3Scu3aZ7vqVua7uwtv4xQqyQI/yOnFjwxrVYPJ+N5Y/b4wsC6A==
            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2026-03-23T22:27:45Z"
-    mac: ENC[AES256_GCM,data:tQ8EMXWqw7wd/QZqUPn/sAczk0G4jSUR96AF83cmJGYuoZkMkOzsMFt448IkWxNWOJHPmIc0vs+c3ngQxHyx6Uf9jVWzMkvfdzMYj82QuLsmXQ9e4/IAE9h+52uagbwgoOJwPCF+AQetSHez/jWPPIQPN5DLfz0edg4xYReX7DA=,iv:GsvotFkehIz5L4I9j0oQ89oM5XjZQAr6vrVd79tqFes=,tag:wLi4sXz8JqvaoUaYjEj/vA==,type:str]
+        - recipient: age1gvplss0ddmyf6vpjy363wu3n057vhm0j6n7tc94cxd8kadapypws5mtaj0
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGSGQvL2ZYM2dtV1JWaDR1
+            RjJnN0YwWFM4d1IwTElqUnZQQkVDTmdydUJjCjdCUWxCVDNXUHVLd2ZHcDA5L0Mw
+            cEVxVE84L2xmQnRoYmsxVEdMSEZjdGcKLS0tIHViRVJyTWt4Q3JrMWtYaS9QdHlS
+            Yjd0MUcxcExvWVpCOUR3MkdZdGQyWUkKnru0Y2A98+0Mps7EtVK7ct3vPqIGveUt
+            E5fzpcKvdefzObrx7BPTwJ19t2fZg/dSi7HKwx3vmKZSzyQaqJOzsg==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2026-04-04T23:18:43Z"
+    mac: ENC[AES256_GCM,data:qBgeli5lHb4pyA8nAADBuRBAaq8VbAIsFI37OZtgnbnoHW2crxo3YC+EknaIYnZpZ48kwVhQS5lGRjI6JsWWhTH3+LVAhTmS2Qj/pZTD/JDLK6XJGXS4U9nB7m9aGYyW8gFCy9/DfoJWGsS//+ZmUikKPfd5kMZgh1zGoYCIGug=,iv:h+2fA+bO2SMCNrEslP36x3BPRaIy25cU/DNX8CYSC6A=,tag:RvVyUZ4ONRaKaqGiT31eUQ==,type:str]
    unencrypted_suffix: _unencrypted
-    version: 3.12.1
+    version: 3.12.2
@@ -1,4 +1,4 @@
-{ inputs, ... }:
+{ self, inputs, lib, ... }:
 let
  username = "john";
  hostname = "soteria";
@@ -7,65 +7,110 @@ in
  flake.nixosConfigurations."${hostname}" = inputs.nixpkgs.lib.nixosSystem {
    modules = with inputs.self.modules; [
      nixos.lxc
+      nixos."${username}"
      nixos.mysops
      nixos.step-ssh-host
-      inputs.home-manager.nixosModules.home-manager
-      nixos."${username}"
-      nixos.zsh
      nixos.login-text
-      # nixos.mtls
+      nixos.docker
+      nixos.mtls
+      nixos.janus-ca
+      nixos.forgejo
      # nixos.restic-server
      # nixos.restic-envoy
-      {
+      ({ config, pkgs, ... }: {
        networking.hostName = hostname;
-        nix.settings.build-dir = "/var/tmp/nix-build";
-        systemd.tmpfiles.rules = [
-          "d /var/tmp/nix-build 1777 root root -"
-        ];
-        step-ssh-host = {
-          hostname = hostname;
-        };
+        time.timeZone = "America/Chicago";

-        home-manager.users."${username}" = {
-          imports = with inputs.self.modules; [
-            homeManager"${hostname}"
-          ];
-        };
+        # Removes password for sudo
+        security.sudo-rs.extraRules = lib.mkAfter [
+          {
+            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;
        };

-  flake.modules.homeManager."${hostname}" = { config, lib, pkgs, ... }: {
+        networking.firewall.allowedTCPPorts = [ 8000 ];
+        services.restic.server = {
+          enable = true;
+          privateRepos = true;
+          listenAddress = "0.0.0.0:8000";
+          extraFlags = [
+            "--no-auth"
+            "--tls"
+            "--tls-cert=${config.mtls.certFile}"
+            "--tls-key=${config.mtls.keyFile}"
+          ];
+        };
+
+        loginText.extraServiceStatus = {
+          Docker = "docker";
+          "mTLS Renewal" = "mtls-renew.timer";
+          Forgejo = "forgejo.service";
+          "Forgejo Backup" = "forgejo-dump.timer";
+          "Restic REST Server" = "restic-rest-server.service";
+        };
+
+        step-ssh-host.hostname = hostname;
+
+        # This provides the secrets at install time
+        sops.defaultSopsFile = ./secrets.yaml;
+
+        programs.zsh.enable = true;
+        home-manager.users."${username}" = {
+          imports = with inputs.self.modules; [
+            homeManager."${hostname}"
+          ];
+        };
+
+        environment.systemPackages = [
+          inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.janus-ca
+          inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.my-neovim
+          inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.jsl-zsh
+        ];
+      })
+    ];
+  };
+
+  flake.modules.homeManager."${hostname}" = { config, pkgs, lib, ... }: {
    imports = with inputs.self.modules; [
      homeManager.rebuild
      homeManager.mysops
-      homeManager.janus-ca
-      homeManager.mtls
-      homeManager.docker
    ];

    homeManagerFlakeDir = "${config.xdg.configHome}/home-manager";
-    home.username = "${username}";
-    home.homeDirectory = "/home/${username}";
    shell.program = "zsh";
    docker.enable = true;

    # This will provide the edit-secrets script targeting this file
-    mysops.hostSecretFile = "${config.xdg.configHome}/home-manager/modules/hosts/soteria/secrets.yaml";
-
-    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"
-      ];
-    };
+    mysops.hostSecretFile = "${config.homeManagerFlakeDir}/modules/hosts/soteria/secrets.yaml";
  };

  flake.homeConfigurations."${hostname}" = inputs.home-manager.lib.homeManagerConfiguration {
@@ -11,12 +11,11 @@ in
      nixos.step-ssh-host
      inputs.home-manager.nixosModules.home-manager
      nixos."${username}"
-      nixos.zsh
      nixos.docker
      {
        home-manager.users."${username}" = {
          imports = with inputs.self.modules.homeManager; [
-            sops
+            mysops
          ];
          shell.program = "zsh";
          docker.enable = true;
@@ -1,44 +1,131 @@
-{ inputs, ... }:
+{ self, inputs, ... }:
 {
-  flake.modules.homeManager.rebuild =
-    { pkgs, lib, config, ... }:
+  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 = {
-        homeManagerFlakeDir = lib.mkOption {
+      options.rebuild = {
+        flakeDir = lib.mkOption {
+          description = "Path to the flake directory.";
          type = lib.types.str;
-          default = "${config.xdg.configHome}/home-manager";
-          description = "Path to the home-manager flake directory.";
+          default = "/etc/nixos";
        };
      };

-      config = let
-        nixBin = lib.getExe pkgs.nix;
+      config = {
+        environment.systemPackages = with pkgs; [ nfs nfsu ];
+      };
+    };
+
+  flake.modules.homeManager.rebuild =
+    { config, pkgs, lib, ... }:
+    let
      flakeDir = config.homeManagerFlakeDir;
+      hostnameCmd = "$(${lib.getExe pkgs.hostname} -s)";
+
+      flake-parts-check = with pkgs; writeShellApplication {
+        name = "flake-parts-check";
+        runtimeInputs = [ nix ];
+        text = ''
+          cd ${flakeDir}
+          nix run "${flakeDir}#write-flake"
+          nix flake check
+        '';
+      };
+
+      nhms = with pkgs; writeShellApplication {
+        name = "nhms";
+        runtimeInputs = [ coreutils hostname nh ];
+        text = ''
+          HOSTNAME=$(hostname -s)
+          echo "Switching to the $HOSTNAME home-manager profile"
+          nh home switch ${flakeDir} -c "$HOSTNAME" "$@"
+        '';
+      };
+
+      nhmu = with pkgs; writeShellApplication {
+        name = "nhmu";
+        runtimeInputs = [ nhms ];
+        text = ''nhms --update'';
+      };
+
+      test-build = with pkgs; writeShellApplication {
+        name = "test-build";
+        runtimeInputs = [ coreutils nix hostname ];
+        text = ''
+          if [ -z "$1" ]; then
+            HOSTNAME=$(hostname -s)
+          else
+            HOSTNAME="$1"
+          fi
+          echo "Testing the evaulation of the nixos config for $HOSTNAME"
+          nix eval "${flakeDir}#nixosConfigurations.$HOSTNAME.config.system.build.toplevel.drvPath"
+        '';
+      };
+
+      cleanup = with pkgs; writeShellApplication {
+        name = "cleanup";
+        runtimeInputs = [ coreutils home-manager nix ];
+        text = ''
+          set -e
+          DAYS=$1
+          if [ -z "$DAYS" ]; then
+            echo "usage: cleanup <days>"
+            exit 1
+          fi
+          home-manager expire-generations "-$DAYS days"
+          nix profile wipe-history --older-than "''${DAYS}d"
+          nix store gc
+          nix store optimise
+        '';
+      };
+
    in
    {
+      options = {
+        homeManagerFlakeDir = lib.mkOption {
+          description = "Path to the home-manager flake directory.";
+          type = lib.types.str;
+          default = "${config.xdg.configHome}/home-manager";
+        };
+      };
+
+      config = {
        home.activation.printFlakeDir = lib.hm.dag.entryAfter ["writeBoundary"] ''
          run echo "Home Manager flake directory: ${flakeDir}"
        '';

        home.packages = with pkgs; [
          home-manager
-          (writeShellScriptBin "flake-parts-test" ''
-            echo "Test ${flakeDir}"
-          '')
-          (writeShellScriptBin "flake-parts-check" ''
-            cd ${flakeDir}
-            ${nixBin} run ".#write-flake"
-            ${nixBin} flake check
-          '')
-          (writeShellScriptBin "nhms" ''
-            HOSTNAME=$(hostname -s)
-            echo "Switching to the $HOSTNAME profile"
-            ${lib.getExe home-manager} switch --impure --flake ${flakeDir}#$HOSTNAME
-          '')
-          (writeShellScriptBin "nhmu" ''
-            ${nixBin} flake update --flake ${flakeDir}
+          (symlinkJoin {
+            name = "build-tools";
+            paths = [
+              flake-parts-check
              nhms
-          '')
+              nhmu
+              test-build
+              cleanup
+            ];
+          })
        ];
      };
    };
@@ -1,40 +1,39 @@
 # Lifted from:
 # https://github.com/Doc-Steve/dendritic-design-with-flake-parts/blob/69edacdb5a4a6ca71d649bb8eb62cf8c630c8627/modules/users/bob%20%5BNDn%5D/bob.nix#L8
-{ self, ... }:
+{ self, inputs, ... }:
 {
-  config.flake.factory.user = username: isAdmin: {
-    nixos."${username}" = { lib, pkgs, ... }: {
+  config.flake.factory.user = {
+    username,
+    isAdmin ? false,
+    noPassword ? false,
+    # homeImports ? [ ],
+    # homePackages ? [ ],
+  }: {
+    nixos."${username}" = { config, lib, pkgs, ... }: {
+      imports = [
+        inputs.home-manager.nixosModules.home-manager
+      ];
+
      users.users."${username}" = {
        isNormalUser = true;
        home = "/home/${username}";
-        extraGroups = [
-          "input"
-          "networkmanager"
-        ] ++ lib.optionals isAdmin [
-          "docker"
-          "wheel"
-        ];
+        shell = lib.mkIf config.programs.zsh.enable pkgs.zsh;
+        extraGroups = [ "input" "networkmanager" ]
+        ++ lib.optional isAdmin "wheel"
+        ++ lib.optional config.virtualisation.docker.enable "docker"
+        ++ lib.optional (isAdmin && config.services.forgejo.enable) config.services.forgejo.group
+        ++ lib.optional (isAdmin && config.services.postgresql.enable) "postgres";
      };

-      # 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}";
-        imports = [
-          self.modules.homeManager."${username}"
-        ];
+        # home.packages = homePackages;
      };
    };
  };
@@ -0,0 +1,12 @@
+{ self, inputs, ... }: {
+  flake-file.inputs = {
+    wrapper-modules = {
+      url = "github:BirdeeHub/nix-wrapper-modules";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    wrappers = {
+      url = "github:lassulus/wrappers";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+  };
+}
@@ -1,5 +1,18 @@
 { inputs, ... }: {
-  flake.modules.nixos.login-text = { config, ... }: {
+  flake.modules.nixos.login-text = { config, lib, ... }:
+    let
+      defaultServiceStatus = {
+        SSH = "sshd.socket";
+        "SSH Cert Renewal" = "step-ssh-host-renew.timer";
+      };
+    in {
+    options.loginText.extraServiceStatus = lib.mkOption {
+      type = lib.types.attrsOf lib.types.str;
+      default = { };
+      description = "Additional rust-motd service status entries keyed by display name.";
+    };
+
+    config = {
      programs.rust-motd = {
        enable = true;
        refreshInterval = "*:0/5";
@@ -21,12 +34,10 @@
            root = 3;
          };

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

          # This calculation is wrong for LXCs
          # uptime = {
@@ -43,4 +54,5 @@
        };
      };
    };
+  };
 }
@@ -1,14 +1,24 @@
-{ inputs, pkgs, lib, ... }:
+{ self, inputs, ... }:
 {
-  flake.modules.homeManager.eza = { pkgs, lib, ... }: {
+  flake.modules.homeManager.eza = { config, pkgs, lib, ... }: {
    programs.eza = {
      enable = true;
-      package = pkgs.eza;
      enableBashIntegration = true;
      enableZshIntegration = true;
-    };
-    home.shellAliases = {
-      ls = "${lib.getExe pkgs.eza} -lgos type --no-time --follow-symlinks";
+      git = true;
+      icons = "auto";
+      colors = "auto";
+      extraOptions = [
+        "--all"
+        "--long"
+        "--group-directories-first"
+        "--sort=type"
+        "--dereference"
+        "--octal-permissions"
+        "--smart-group"
+        "--no-time"
+        "--git"
+      ];
    };
  };
 }
@@ -1,15 +1,25 @@
 {
-  flake.modules.homeManager.files = { pkgs, ... }:
+  flake.modules.homeManager.files = { pkgs, lib, ... }:
  {
-    programs.lf.enable = true;
-    programs.lf.cmdKeybindings = {
+    programs.lf = {
+      enable = true;
+      cmdKeybindings = {
        "D" = "delete";
      };
+      settings = {
+        preview = true;
+        hidden = true;
+        drawbox = true;
+        icons = true;
+        ignorecase = true;
+      };
+    };

    home.packages = with pkgs; [
      gdu
-      lf
-      # TODO: find a CLI file editor that's not insane
+      # (writeShellScriptBin "lfcd" ''
+      #   . <(${lib.getExe pkgs.lf} -print-last-dir | sed 's/^/cd /')
+      # '')
    ];
  };
 }
@@ -8,6 +8,17 @@
  };

  flake.modules.homeManager.ghostty = { config, pkgs, lib, ... }:
+  let
+    ghosttyPackage = pkgs.symlinkJoin {
+      name = "ghostty-x11";
+      paths = [ (config.lib.nixGL.wrap pkgs.ghostty) ];
+      nativeBuildInputs = [ pkgs.makeWrapper ];
+      meta.mainProgram = "ghostty";
+      postBuild = ''
+        wrapProgram $out/bin/ghostty --set GDK_BACKEND x11
+      '';
+    };
+  in
  {
    home.sessionVariables = {
      TERMINAL = "ghostty";
@@ -22,7 +33,7 @@
    programs.ghostty = {
      enable = true;
      enableZshIntegration = true;
-      package = config.lib.nixGL.wrap pkgs.ghostty;
+      package = ghosttyPackage;
      settings = {
        command = "TERM=xterm-256color ${lib.getExe pkgs.zsh}";
        font-size = 12;
@@ -32,6 +43,7 @@
        shell-integration = "zsh";
        shell-integration-features = [ "no-title" "sudo" ];
        gtk-single-instance = true;
+        mouse-scroll-multiplier = 0.375;

        window-position-x = 25;
        window-position-y = 25;
@@ -58,11 +70,15 @@
    };

    # 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 = "nixGLMesa ghostty";
+      exec = ghosttyCmd;
      icon = "com.mitchellh.ghostty";
      terminal = false;
      startupNotify = true;
@@ -79,7 +95,7 @@
      actions = {
        new-window = {
          name = "New Window";
-          exec = "nixGLMesa ghostty";
+          exec = ghosttyCmd;
        };
      };
    };
@@ -1,6 +1,8 @@
-{
-  flake.modules.homeManager.git = { config, lib, ... }:
-  {
+{ self, inputs, ... }: {
+  flake.modules.homeManager.git = { config, pkgs, lib, ... }: {
+    home.packages = with pkgs; [
+      git-credential-oauth
+    ];
    programs.git = {
        enable = true;
        settings = {
@@ -14,5 +16,8 @@
      enableBashIntegration = true;
      enableZshIntegration = true;
    };
+    home.shellAliases = {
+      "lzg" = "lazygit";
+    };
  };
 }
@@ -0,0 +1,158 @@
+{ self, inputs, ... }: {
+  flake-file.inputs = {
+    nvf = {
+      url = "github:notashelf/nvf";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+  };
+
+  perSystem = { system, pkgs, config, ... }: {
+    packages.my-neovim = ((inputs.nvf.lib.neovimConfiguration {
+      inherit pkgs;
+      modules = [
+        {
+          # https://nvf.notashelf.dev/search.html
+          config.vim = {
+            options = {
+              number = true;
+              relativenumber = true;
+              expandtab = true;
+              shiftwidth = 4;
+              tabstop = 4;
+              softtabstop = 4;
+
+              wrap = true;
+              linebreak = true;
+            };
+
+            syntaxHighlighting = true;
+
+            # Enable custom theming options
+            theme.enable = true;
+            theme.name = "catppuccin";
+            theme.style = "mocha";
+
+            git.enable = true;
+            # git.neogit.enable = true;
+
+            # https://github.com/akinsho/toggleterm.nvim
+            terminal.toggleterm.enable = true;
+            terminal.toggleterm.lazygit.enable = true;
+            terminal.toggleterm.lazygit.direction = "float";
+            terminal.toggleterm.lazygit.mappings.open = "<C-g>";
+
+
+            utility.nix-develop.enable = true;
+
+            utility.oil-nvim.enable = true;
+            utility.oil-nvim.gitStatus.enable = true;
+
+            filetree.neo-tree = {
+              enable = true;
+            };
+
+            # lazy = {
+            #   enable = true;
+            # };
+
+            # globals = {
+            #   SimpylFold_docstring_preview = 1;
+            #   SimpylFold_fold_blank = 0;
+            # };
+
+            # extraPlugins = with pkgs.vimPlugins; {
+            #   SimpylFold.package = SimpylFold;
+            # };
+
+            telescope = {
+              enable = true;
+              extensions  = [
+                {
+                  name = "fzf";
+                  packages = [pkgs.vimPlugins.telescope-fzf-native-nvim];
+                  setup = {fzf = {fuzzy = true;};};
+                }
+              ];
+            };
+
+            # Enable Treesitter
+            treesitter = {
+              enable = true;
+              grammars = with pkgs.vimPlugins.nvim-treesitter-parsers; [ python ];
+            };
+
+            lsp.enable = true;
+
+            languages = {
+              enableTreesitter = true;
+              enableFormat = true;
+
+              markdown = {
+                enable = true;
+                extensions = {
+                  # render-markdown-nvim.enable = true;
+                  markview-nvim.enable = true;
+                };
+              };
+
+              bash.enable = true;
+              css.enable = true;
+              yaml.enable = true;
+              toml.enable = true;
+
+              nix = {
+                enable = true;
+              };
+
+              python = {
+                enable = true;
+                dap.enable = true;
+                format.type = [ "ruff" ];
+              };
+            };
+
+            keymaps = [
+              {
+                desc = "Edit key mappings";
+                key = "<leader>ekm";
+                mode = [ "n" ];
+                silent = false;
+                action = "<cmd>:edit +/keymaps /home/john/.config/home-manager/jsl-dendritic/modules/programs/neovim.nix<CR>";
+              }
+              {
+                desc = "Home Manager Switch";
+                key = "<leader>nhms";
+                mode = [ "n" ];
+                silent = false;
+                action = "<cmd>:TermExec cmd='clear && nhms && exit' name='Nix Home Manager Switch' direction=float<CR>";
+              }
+              {
+                desc = "Key Maps [Telescope]";
+                key = "<leader>fkm";
+                mode = "n";
+                silent = false;
+                action = "<cmd>:Telescope keymaps<CR>";
+              }
+              {
+                desc = "Toggle Filesystem Tree [NeoTree]";
+                key = "<C-b>";
+                mode = [ "n" "v" "t" ];
+                silent = false;
+                action = "<cmd>:Neotree toggle filesystem left action=show<CR>";
+              }
+              {
+                key = "<C-`>";
+                mode = ["n" "v" "t"];
+                silent = false;
+                action = "<cmd>:ToggleTerm<CR>";
+              } 
+            ];
+          };
+        }
+      ];
+    }).neovim).overrideAttrs (old: {
+      pname = "my-neovim";
+      version = "custom";
+    });
+  };
+}
@@ -1,9 +1,4 @@
 { self, inputs, ... }: {
-  flake-file.inputs = {
-    wrapper-modules.url = "github:BirdeeHub/nix-wrapper-modules";
-    wrapper-modules.follows = "nixpkgs";
-  };
-
  flake.modules.nixos.niri = { pkgs, lib, ... }: {
    programs.niri = {
      enable = true;
@@ -1,25 +1,10 @@
-{
-  flake.modules.homeManager.onepassword = { config, pkgs, lib, ... }: {
-    programs._1password-shell-plugins = {
-      # enable 1Password shell plugins for bash, zsh, and fish shell
-      enable = true;
-      # the specified packages as well as 1Password CLI will be
-      # automatically installed and configured to use shell plugins
-      # https://developer.1password.com/docs/cli/shell-plugins
-      plugins = with pkgs; [ gh ];
-    };
-
+{ self, inputs, ... }: {
+  flake.modules.homeManager.onepassword = { config, ... }: {
    home.file.".config/1Password/ssh/agent.toml".text = ''
      # https://developer.1password.com/docs/ssh/agent/config
      [[ssh-keys]]
      vault = "Private"
    '';
-    programs.ssh = {
-      enable = true;
-      extraConfig = ''
-        Host *
-            IdentityAgent ${config.home.homeDirectory}/.1password/agent.sock
-      '';
-    };
+    programs.ssh.matchBlocks."*".identityAgent = "${config.home.homeDirectory}/.1password/agent.sock";
  };
 }
@@ -40,13 +40,22 @@ in
        default = "${config.xdg.configHome}/sops/age/keys.txt";
      };
      hostSecretFile = lib.mkOption {
-        description = "Path to the secrets file for this host";
+        description = "Path to the secrets file for this host. Used to create the edit-secrets script";
        type = lib.types.nullOr lib.types.str;
        default = null;
      };
    };

-    config = {
+    config =
+    let
+      echo = lib.getExe' pkgs.coreutils "echo";
+      dirname = lib.getExe' pkgs.coreutils "dirname";
+      mkdir = lib.getExe' pkgs.coreutils "mkdir";
+      show-age-key = (pkgs.writeShellScriptBin "show-age-key" ''
+        ${lib.getExe' pkgs.age "age-keygen"} -y ${cfg.ageKeyFile}
+      '');
+    in
+    {
      home.packages = with pkgs; [
        eza
        age
@@ -55,22 +64,22 @@ in
        (writeShellScriptBin "gen-age-key" ''
          set -eu

-          if [ ! -f "${config.ssh.IdentityFile}" ]; then
-            echo "SSH identity file not found: ${config.ssh.IdentityFile}" >&2
+          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
+            ${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)
+          ${mkdir} -p "$(${dirname} "${cfg.ageKeyFile}")"
+          ${lib.getExe pkgs.ssh-to-age} -i ${config.ssh.identityFile} -private-key > ${cfg.ageKeyFile}
+          ${echo} -n "Created ${cfg.ageKeyFile}: "
+          ${echo} $(${lib.getExe show-age-key})
        '')
-        (writeShellScriptBin "show-age-key" "${lib.getExe' pkgs.age "age-keygen"} -y ${cfg.ageKeyFile}")
+        show-age-key
        (writeShellScriptBin "ls-secrets" "${lib.getExe pkgs.eza} -alT --follow-symlinks ~/.config/sops-nix/secrets")
      ] ++ editScript;

@@ -81,7 +90,7 @@ in
      sops = {
        defaultSopsFile = sopsSecretsPath;
        defaultSopsFormat = "yaml";
-        age.sshKeyPaths = [ "${config.ssh.IdentityFile}" ];
+        age.sshKeyPaths = [ "${config.ssh.identityFile}" ];
      };
    };
  };
@@ -0,0 +1,14 @@
+{ self, inputs, ... }: {
+  flake.modules.nixos.steam = {
+    programs.steam = {
+      enable = true;
+      gamescopeSession.enable = true;
+      # Open ports in the firewall for Steam Remote Play
+      remotePlay.openFirewall = true;
+      # Open ports in the firewall for Source Dedicated Server
+      dedicatedServer.openFirewall = true;
+      # Open ports in the firewall for Steam Local Network Game Transfers
+      localNetworkGameTransfers.openFirewall = true;
+    };
+  };
+}
@@ -29,7 +29,7 @@
          ${principalArgs} \
          --provisioner "${cfg.provisioner}" \
          --provisioner-password-file "${config.sops.secrets."janus/admin_jwk".path}" \
-          "${firstPrincipal}" "${config.ssh.IdentityFile}.pub"
+          "${firstPrincipal}" "${config.ssh.identityFile}.pub"
        '')
      ];
    };
@@ -1,6 +1,10 @@
-{
-  flake.modules.homeManager.vscode = { pkgs, ... }:
-  {
+{ self, inputs, ... }: {
+  flake.modules.homeManager.vscode = { config, pkgs, lib, ... }: {
+    options.my-vscode = {
+      enable = lib.mkEnableOption "Enable nix-managed VSCode";
+    };
+
+    config = lib.mkIf config.my-vscode.enable {
      programs.vscode = {
        enable = true;
        package = pkgs.vscode;
@@ -18,4 +22,5 @@
        ];
      };
    };
+  };
 }
@@ -0,0 +1,59 @@
+{ self, inputs, ... }: {
+  flake.modules.nixos.wireguard = { config, pkgs, lib, ... }:
+  let
+    wgInterface = "platform";
+    systemctl = lib.getExe' pkgs.systemd "systemctl";
+    journalctl = lib.getExe' pkgs.systemd "journalctl";
+
+    mkConnect = interface:
+      let
+        serviceName = "wg-quick-${interface}";
+        service = "${serviceName}.service";
+      in
+      pkgs.writeShellScriptBin "wg-connect-${interface}" ''
+        ${systemctl} start ${service}
+        start_time=$(${systemctl} show -p ActiveEnterTimestamp ${serviceName} | cut -d= -f2)
+        ${journalctl} -u ${service} --since "$start_time" --no-pager
+      '';
+    mkDisconnect = interface:
+      let
+        serviceName = "wg-quick-${interface}";
+        service = "${serviceName}.service";
+      in
+      pkgs.writeShellScriptBin "wg-disconnect-${interface}" ''
+        STOPTIME=$(${lib.getExe' pkgs.coreutils "date"} '+%Y-%m-%d %H:%M:%S')
+        ${systemctl} stop ${service}
+        start_time=$(${systemctl} show -p ActiveEnterTimestamp ${serviceName} | cut -d= -f2)
+        ${journalctl} -u ${service} --since "$STOPTIME" --no-pager
+      '';
+  in
+  {
+    imports = [ inputs.sops-nix.nixosModules.sops ];
+
+    environment.systemPackages = with pkgs; [
+      wireguard-tools
+      wg-netmanager
+      (mkConnect "platform")
+      (mkDisconnect "platform")
+    ];
+
+    sops.secrets.wireguard_private_key = { };
+    networking.wg-quick.interfaces = {
+      ${wgInterface} = {
+        autostart = false; # Managed by dispatcher
+        postUp = "echo 'Post up command'";
+        address = [ "192.168.3.5/32" ];
+        dns = [ "192.168.1.150" ];
+        privateKeyFile = config.sops.secrets.wireguard_private_key.path;
+        peers = [
+          {
+            publicKey = "BD1/q18OfpoMCDusNZk9cqB1vvR8bgodZ1L7198jVic=";
+            allowedIPs = [ "192.168.0.0/16" ];
+            endpoint = "wg.john-stream.com:51830";
+            persistentKeepalive = 25;
+          }
+        ];
+      };
+    };
+  };
+}
@@ -1,4 +1,4 @@
-{ inputs, ... }:
+{ self, inputs, ... }:
 let
  username = "john";
 in
@@ -51,4 +51,138 @@ in
    };
  };

+  perSystem = { system, pkgs, ... }: {
+    packages.jsl-zsh = inputs.wrapper-modules.wrappers.zsh.wrap {
+      inherit pkgs;
+      extraPackages = with pkgs; [
+        inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.neovim-min
+        btop
+        coreutils
+        curl
+        wget
+        yazi
+        zsh
+      ];
+    };
+
+    packages.neovim-min = ((inputs.nvf.lib.neovimConfiguration {
+      inherit pkgs;
+      modules = [
+        {
+          # https://nvf.notashelf.dev/search.html
+          config.vim = {
+            options = {
+              number = true;
+              relativenumber = true;
+              expandtab = true;
+              shiftwidth = 4;
+              tabstop = 4;
+              softtabstop = 4;
+
+              wrap = true;
+              linebreak = true;
+            };
+
+            syntaxHighlighting = true;
+
+            # Enable custom theming options
+            theme.enable = true;
+            theme.name = "catppuccin";
+            theme.style = "mocha";
+
+            git.enable = true;
+            # git.neogit.enable = true;
+            extraPlugins = with pkgs.vimPlugins; {
+              icons = {
+                package = nvim-web-devicons;
+              };
+              octo = {
+                package = octo-nvim;
+                setup = "require('octo').setup {}";
+                after = ["telescope" "icons"];
+              };
+            };
+
+            # https://github.com/akinsho/toggleterm.nvim
+            terminal.toggleterm.enable = true;
+            terminal.toggleterm.lazygit.enable = true;
+            terminal.toggleterm.lazygit.direction = "float";
+            terminal.toggleterm.lazygit.mappings.open = "<C-g>";
+
+            utility.nix-develop.enable = true;
+
+            filetree.neo-tree.enable = true;
+
+            telescope = {
+              enable = true;
+              extensions  = [
+                {
+                  name = "fzf";
+                  packages = [pkgs.vimPlugins.telescope-fzf-native-nvim];
+                  setup = {fzf = {fuzzy = true;};};
+                }
+              ];
+            };
+
+            languages = {
+              enableTreesitter = true;
+              enableFormat = true;
+
+              markdown = {
+                enable = true;
+                extensions = {
+                  markview-nvim.enable = true;
+                };
+              };
+
+              bash.enable = true;
+              yaml.enable = true;
+              toml.enable = true;
+              nix.enable = true;
+            };
+
+            keymaps = [
+              {
+                desc = "Edit key mappings";
+                key = "<leader>ekm";
+                mode = [ "n" ];
+                silent = false;
+                action = "<cmd>:edit +/keymaps /home/john/.config/home-manager/jsl-dendritic/modules/programs/neovim.nix<CR>";
+              }
+              {
+                desc = "Home Manager Switch";
+                key = "<leader>nhms";
+                mode = [ "n" ];
+                silent = false;
+                action = "<cmd>:TermExec cmd='clear && nhms && exit' name='Nix Home Manager Switch' direction=float<CR>";
+              }
+              {
+                desc = "Key Maps [Telescope]";
+                key = "<leader>fkm";
+                mode = "n";
+                silent = false;
+                action = "<cmd>:Telescope keymaps<CR>";
+              }
+              {
+                desc = "Toggle Filesystem Tree [NeoTree]";
+                key = "<C-b>";
+                mode = [ "n" "v" "t" ];
+                silent = false;
+                action = "<cmd>:Neotree toggle filesystem left action=show<CR>";
+              }
+              {
+                key = "<C-`>";
+                mode = ["n" "v" "t"];
+                silent = false;
+                action = "<cmd>:ToggleTerm<CR>";
+              } 
+            ];
+          };
+        }
+      ];
+    }).neovim).overrideAttrs (old: {
+      pname = "neovim-min";
+      version = "custom";
+    });
+  };
 }
@@ -1,20 +1,13 @@
-{ inputs, ... }:
+{ self, inputs, ... }:
 {
  flake.modules.nixos.docker = {
-    virtualisation.docker = {
-      enable = true;
-    };
-    home-manager.sharedModules = with inputs.self.modules.homeManager; [
-      docker
-    ];
+    virtualisation.docker.enable = true;
+    home-manager.sharedModules = [ 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;
@@ -4,19 +4,29 @@ let
  sshHostCAPubKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBNug18oLH0vZxnibXJzMJvTWFPZTnSlhCDDVi+rHhgnIum6ZXQ4SF+VHOOAM5BbzZmMKitNJ5lcrGP15Eur7DzQ=";
 in
 {
-  flake.modules.nixos.ssh = { pkgs, config, lib, ... }:
+  flake.modules.nixos.ssh = { config, pkgs, lib, ... }:
  let
    cfg = config.ssh;
-    userCAPath = "ssh/ssh_user_ca.pub";
-    hostKeyFile = "ssh/ssh_host_ed25519_key";
+    configDir = "/etc/ssh";
  in
  {
    options.ssh = {
+      hostKey = lib.mkOption {
+        description = "String path to the host private key file";
+        type = lib.types.str;
+        default = "ssh_host_ed25519_key";
+      };
      certificates = {
        enable = lib.mkEnableOption "Enable SSH host certificates";
        userCA = lib.mkOption {
+          description = "Content for the SSH user CA file (public key)";
          type = lib.types.path;
-          default = ../../keys/ssh_user_ca.pub;
+          default = ../hosts/janus/ssh_user_ca.pub;
+        };
+        userCAFile = lib.mkOption {
+          description = "String path to the SSh user CA";
+          type = lib.types.str;
+          default = "ssh_user_ca.pub";
        };
      };
    };
@@ -29,16 +39,16 @@ in
          {
            PasswordAuthentication = false;
            KbdInteractiveAuthentication = false;
-            HostKey = "/etc/${hostKeyFile}";
+            HostKey = "${configDir}/${cfg.hostKey}";
          }
          (lib.mkIf cfg.certificates.enable {
-            TrustedUserCAKeys = "/etc/${userCAPath}";
-            HostCertificate = "/etc/${hostKeyFile}-cert.pub";
+            TrustedUserCAKeys = "${configDir}/${cfg.certificates.userCAFile}";
+            HostCertificate = "${configDir}/${cfg.hostKey}-cert.pub";
          })
        ];
      };

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

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

-  flake.modules.homeManager.ssh = { pkgs, config, lib, ... }:
+  flake.modules.homeManager.ssh = { config, pkgs, lib, ... }:
+  let
+    cfg = config.ssh;
+    configDir = "${config.home.homeDirectory}/.ssh";
+    identityFile = cfg.identityFile;
+    publicKeyFile = "${identityFile}.pub";
+    certificateFile = "${identityFile}-cert.pub";
+  in
  {
-    options.ssh = {
-      IdentityFile = lib.mkOption {
+    options.ssh = with lib; {
+      identityFile = mkOption {
        # Intentionally not using a path type here because that will end up with the private key getting copied into the store
-        type = lib.types.str;
+        type = types.str;
        default = "${config.home.homeDirectory}/.ssh/id_ed25519";
        description = "Path to the SSH identity file.";
      };

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

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

      matchSets = {
-        appdaemon = lib.mkEnableOption "Enable AppDaemon SSH targets";
-        certs = lib.mkEnableOption "Enable Janus and Soteria SSH targets";
-        homelab = lib.mkEnableOption "Enable various Homelab targets";
-        dev = lib.mkEnableOption "Enable development targets";
+        appdaemon = mkEnableOption "Enable AppDaemon SSH targets";
+        certs = mkEnableOption "Enable Janus and Soteria SSH targets";
+        homelab = mkEnableOption "Enable various Homelab targets";
+        dev = mkEnableOption "Enable development targets";
      };
    };

    # 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" (
-          [
-            "fded:fb16:653e:25da:be24:11ff:fea0:753f ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ9ZqiWPrCwHjxFCiu0lT4rlQs7KyMapxKJQQ5PJP1eh"
+          cfg.knownHosts ++ lib.optionals cfg.certificates.enable [
+            "@cert-authority 192.168.1.* ${sshHostCAPubKey}"
+            "@cert-authority *.john-stream.com ${sshHostCAPubKey}"
          ]
-          ++ (lib.optional cfg.certificates.enable "@cert-authority 192.168.1.* ${sshHostCAPubKey}")
-          ++ (lib.optional cfg.certificates.enable "@cert-authority *.john-stream.com ${sshHostCAPubKey}")
        );
      };

@@ -109,12 +123,16 @@ 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;
@@ -122,14 +140,16 @@ in
                serverAliveCountMax = 3;

                identitiesOnly = true;
-              inherit identityFile certificateFile;
+                inherit identityFile;

                hashKnownHosts = false;
                userKnownHostsFile = cfg.knownHostsFile;

                addKeysToAgent = "yes";
                forwardAgent = false;
-            };
+              }
+              (lib.mkIf cfg.certificates.enable { inherit certificateFile; })
+            ];
          }
          (lib.mkIf cfg.matchSets.appdaemon {
            "appdaemon" = {
@@ -173,7 +193,6 @@ in
            "test-nix" = {
              hostname = "fded:fb16:653e:25da:be24:11ff:fea0:753f";
              user = "john";
-              identityFile = identityFile;
            };
          })
        ];
@@ -1,303 +0,0 @@
-{ 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;
-        });
-      };
-    };
-}
@@ -33,7 +33,7 @@
      networking.nameservers = [ "192.168.1.150" ];
      networking.dhcpcd.extraConfig = "nohook resolv.conf";
      environment.systemPackages = with pkgs; [
-        step-cli
+        # step-cli
        (writeShellScriptBin "ssh-host-cert-renew" ''
          ${lib.getExe pkgs.step-cli} ssh certificate \
          --host --sign \
@@ -51,7 +51,7 @@
        wantedBy = [ ];
        after = [ "network-online.target" ];
        wants = [ "network-online.target" ];
-        path = [ pkgs.step-cli pkgs.openssh pkgs.coreutils pkgs.systemd ];
+        path = with pkgs; [ coreutils systemd step-cli openssh  ];
        serviceConfig = {
          Type = "oneshot";
          User = "root";
@@ -17,6 +17,9 @@ in
        crt = "";
      };
    };
-    environment.systemPackages = with pkgs; [ step-ca step-cli ];
+    environment.systemPackages = with pkgs; [
+      step-ca
+      step-cli
+    ];
  };
 }
@@ -1,13 +1,12 @@
-{ inputs, ... }:
+{ self, inputs, lib, ... }:
 let
  username = "john";
 in
 {
-  flake = {
-    meta.users."${username}" = {
+  flake.meta.users."${username}" = {
    email = "32917998+jsl12@users.noreply.github.com";
    name = "John Lancaster";
-      username = "${username}";
+    inherit username;
    key = "";
    keygrip = [
    ];
@@ -17,30 +16,33 @@ in
    ];
  };

-    modules = {
+  flake.modules = lib.mkMerge [
+    (self.factory.user {
+      username = username;
+      isAdmin = true;
+    })
+    {
      nixos."${username}" = {
        imports = [
-          (inputs.self.factory.user username true).nixos."${username}"
+          inputs.home-manager.nixosModules.home-manager
        ];
        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}"; {
        home.stateVersion = "25.11";
        xdg.enable = true;
-
        programs.git.settings.user.name = name;
        programs.git.settings.user.email = email;
-
        imports = with inputs.self.modules.homeManager; [
          ssh
          shell-tools
          git
        ];
      };
-    };
-  };
+    }
+  ];
 }
Author	SHA1	Message	Date
John Lancaster	244519f406	rest server	2026-04-16 17:31:57 -05:00
John Lancaster	213d97d13e	added quotes to fix error	2026-04-15 23:20:08 -05:00
John Lancaster	51a2b8078f	added joplin desktop to john-p14s	2026-04-15 23:20:08 -05:00
John Lancaster	5d5ad75c06	added proton vpn to john-p14s	2026-04-14 17:30:22 -05:00
John Lancaster	e63ca7b244	removed proton vpn from desktop feature	2026-04-14 17:30:11 -05:00
John Lancaster	ff7d03ecfd	modernized homeConfig call	2026-04-14 17:29:56 -05:00
John Lancaster	c6b1361a68	update eza config	2026-04-14 17:29:28 -05:00
John Lancaster	934aeb429c	prune	2026-04-13 09:28:33 -05:00
John Lancaster	dbbdf8991f	moved wrapper inputs	2026-04-13 08:58:49 -05:00
John Lancaster	70315d5020	nvim-web-devicons	2026-04-12 23:21:57 -05:00
John Lancaster	7080410c0c	more writeShellApplication	2026-04-12 23:21:12 -05:00
John Lancaster	35e1d5ee61	writeShellApplication updates	2026-04-12 23:21:12 -05:00
John Lancaster	ec5ff115ce	writeShellApplication reworks	2026-04-12 23:21:12 -05:00
John Lancaster	58066d2a08	flake.lock update	2026-04-12 21:18:35 -05:00
John Lancaster	bf478b5f38	enabled ssh certs for laptop	2026-04-12 21:17:51 -05:00
John Lancaster	e18c28905d	fixes	2026-04-11 09:16:54 -05:00
John Lancaster	e8ac1fb552	added octo-nvim	2026-04-11 09:13:53 -05:00
John Lancaster	630e385fb1	neovim-min	2026-04-11 00:21:46 -05:00
John Lancaster	6df0f8d1ab	persystem wrapper	2026-04-10 09:35:35 -05:00
John Lancaster	c044f2aa5a	fix	2026-04-10 08:49:56 -05:00
John Lancaster	1caf0fa10d	started zsh wrapper	2026-04-10 08:48:40 -05:00
John Lancaster	5cb1c88e51	lockfile update	2026-04-09 23:52:03 -05:00
John Lancaster	5fcd6abdb2	test-push using nh	2026-04-05 11:22:47 -05:00
John Lancaster	e59aa7a5f1	home manager rebuilds using nh pacakge for nice outputs	2026-04-05 11:13:17 -05:00
John Lancaster	bf9c3c2597	lf settings	2026-04-05 11:02:37 -05:00
John Lancaster	151512a071	added nix shell-tools	2026-04-05 10:38:46 -05:00
John Lancaster	8141662832	added some oauth2 client options	2026-04-04 17:28:20 -05:00
John Lancaster	1196d69778	broke out root_url option for forgejo	2026-04-04 13:51:40 -05:00
John Lancaster	c1e00a7c45	clean script updates	2026-04-04 13:44:48 -05:00
John Lancaster	fe19700514	set timezone on soteria	2026-04-04 13:33:20 -05:00
John Lancaster	25ea6ac502	fixed forgejo dump	2026-04-04 13:33:12 -05:00
John Lancaster	01fde39946	updated eza alias flags	2026-04-04 13:33:02 -05:00
John Lancaster	84b32cea01	service_status motd updates	2026-04-04 13:15:29 -05:00
John Lancaster	bccb96a0b3	updated soteria settings	2026-04-04 12:26:05 -05:00
John Lancaster	44fd737afe	reorg	2026-04-04 12:25:56 -05:00
John Lancaster	0854439bdf	disabled TCP connections for postgres	2026-04-04 12:21:50 -05:00
John Lancaster	ff70a35078	janus-ca pkg updates	2026-04-04 12:09:13 -05:00
John Lancaster	b8b8a445f9	mTLS generate script improvements	2026-04-04 11:09:25 -05:00
John Lancaster	13a841c8db	mtls optimizations	2026-04-04 10:44:37 -05:00
John Lancaster	6c26e898b2	improving renew script	2026-04-04 09:46:55 -05:00
John Lancaster	710f13ace4	renew script tweaks	2026-04-04 09:33:08 -05:00
John Lancaster	1a7a1189e7	privileged port permissions for https	2026-04-03 18:16:29 -05:00
John Lancaster	ff74205c57	mtls file permissions	2026-04-03 18:16:12 -05:00
John Lancaster	32b7932916	script tweaks	2026-04-02 17:28:06 -05:00
John Lancaster	f05a3af30d	forgejo secrets	2026-04-02 17:24:32 -05:00
John Lancaster	3e84eb641f	added forgejo secrets to soteria	2026-04-02 07:56:35 -05:00
John Lancaster	9b51398ceb	nhms switch keymap	2026-04-01 23:34:39 -05:00
John Lancaster	2a97dbf7ca	slowed down the mouse scrolling in ghostty	2026-04-01 23:32:28 -05:00
John Lancaster	d7e32c0a2f	Merge branch 'forgejo'	2026-04-01 20:55:17 -05:00
John Lancaster	76cb1d078b	added key and cert files to https config in forgejo	2026-04-01 20:48:38 -05:00
John Lancaster	fb7750235f	added my-neovim to soteria	2026-04-01 20:48:07 -05:00
John Lancaster	4c90263866	flake.lock update	2026-04-01 20:47:20 -05:00
John Lancaster	fac9c7f5ce	mtls param renames	2026-04-01 20:45:09 -05:00
John Lancaster	a7b65e4eee	formatting	2026-04-01 20:44:40 -05:00
John Lancaster	1fe4d59ce6	mtls options	2026-04-01 15:59:56 -05:00
John Lancaster	86bb800886	prune	2026-04-01 15:57:51 -05:00
John Lancaster	c4cf7c8096	fixed postgres group	2026-04-01 15:57:44 -05:00
John Lancaster	863ff2d04d	ssh updates for john p14s	2026-03-31 23:54:45 -05:00
John Lancaster	bc66ec89c6	neovim updates	2026-03-31 23:46:23 -05:00
John Lancaster	cf02260941	my-neovim shortcuts	2026-03-31 23:11:23 -05:00
John Lancaster	609d2a5cca	p14 ssh config	2026-03-31 23:09:32 -05:00
John Lancaster	395e13acd2	started forgejo config	2026-03-31 20:17:52 -05:00
John Lancaster	b6a85631f3	cleanup script	2026-03-30 18:59:28 -05:00
John Lancaster	f82d084030	typo fix	2026-03-30 18:59:17 -05:00
John Lancaster	3674a0e6c4	started janus-ca wrapper	2026-03-30 18:59:07 -05:00
John Lancaster	89a4d5a228	mtls working on soteria	2026-03-30 15:23:52 -05:00
John Lancaster	fef4ff71bb	fixed ghostty x11 stuff	2026-03-30 00:07:16 -05:00
John Lancaster	c0c1e92249	filled in some neovim config	2026-03-30 00:04:50 -05:00
John Lancaster	d42de74755	started neovim config	2026-03-29 23:05:45 -05:00
John Lancaster	bc3d7e9b6f	fixes	2026-03-29 22:51:06 -05:00
John Lancaster	30ea383040	limiting systems	2026-03-29 22:50:52 -05:00
John Lancaster	205d9ea867	added no password for soteria	2026-03-29 22:22:04 -05:00
John Lancaster	311ab760ea	remove no password stuff from user factory	2026-03-29 18:47:05 -05:00
John Lancaster	aebe978684	soteria fixes	2026-03-29 18:07:38 -05:00
John Lancaster	2b65433d63	key update	2026-03-29 17:47:53 -05:00
John Lancaster	0ae3d950e9	updated secrets for soteria	2026-03-29 17:44:46 -05:00
John Lancaster	04bbf00c3d	ssh options	2026-03-29 17:38:45 -05:00
John Lancaster	e0abbd6b90	ssh options	2026-03-29 16:53:54 -05:00
John Lancaster	0cf3f05df2	ssh options into variables	2026-03-29 15:29:30 -05:00
John Lancaster	93458a5e53	incorporated john-p14s, big squash merge of stuff	2026-03-29 15:12:38 -05:00
				`@@ -0,0 +1 @@`
				`2036c44f7b5901566ff7611ea6c927291ecc6d2dd00779c0eead70ec77fa10d6`