rest server

flake.lock

@@ -18,11 +18,11 @@
     },
     "flake-file": {
       "locked": {
-        "lastModified": 1774886516,
+        "lastModified": 1775848911,
-        "narHash": "sha256-w2LoQVM6DXrSdGUZBZqa1nYkMzHoB0t82DrptzZKhTs=",
+        "narHash": "sha256-dqva/tlWxsXj32wYPdt06UrrR4l2QdK9JWyvPooWRi4=",
         "owner": "vic",
         "repo": "flake-file",
-        "rev": "3daadf37de2bb85b0ff34e2a7ab0d71e077c2b9e",
+        "rev": "b36cbd5fc01e9794a001ccb0c58b314efaabae08",
         "type": "github"
       },
       "original": {
@@ -95,11 +95,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1775080052,
+        "lastModified": 1776046499,
-        "narHash": "sha256-jAB4ZZbx8ECu9GcE/PUUwT+wpooZ0Ssmn2imB8PVTdM=",
+        "narHash": "sha256-Wzc4nn07/0RL21ypPHRzNDQZcjhIC8LaYo7QJQjM5T4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6267895e9898399f0ce2fe79b645e9ee4858aaff",
+        "rev": "287f84846c1eb3b72c986f5f6bebcff0bd67440d",
         "type": "github"
       },
       "original": {
@@ -184,11 +184,11 @@
     "nixos-hardware": {
       "flake": false,
       "locked": {
-        "lastModified": 1774933469,
+        "lastModified": 1775490113,
-        "narHash": "sha256-OrnCQeUO2bqaWUl0lkDWyGWjKsOhtCyd7JSfTedQNUE=",
+        "narHash": "sha256-2ZBhDNZZwYkRmefK5XLOusCJHnoeKkoN95hoSGgMxWM=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "f4c4c2c0c923d7811ac2a63ccc154767e4195337",
+        "rev": "c775c2772ba56e906cbeb4e0b2db19079ef11ff7",
         "type": "github"
       },
       "original": {
@@ -199,11 +199,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1774709303,
+        "lastModified": 1775423009,
-        "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=",
+        "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8110df5ad7abf5d4c0f6fb0f8f978390e77f9685",
+        "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9",
         "type": "github"
       },
       "original": {
@@ -215,11 +215,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1775064974,
+        "lastModified": 1775888245,
-        "narHash": "sha256-PqhsO5qloSyvATi9qAIrgUcEFK67xSoacjacPw+t4H0=",
+        "narHash": "sha256-qTVvODr6edFBLD2lncXPF8yTQeCafZUuKVtpV3Xb3yM=",
-        "rev": "6ebfbc38bdc6b22822a6f991f2d922306f33cfbc",
+        "rev": "13043924aaa7375ce482ebe2494338e058282925",
         "type": "tarball",
-        "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre973084.6ebfbc38bdc6/nixexprs.tar.xz"
+        "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre978638.13043924aaa7/nixexprs.tar.xz"
       },
       "original": {
         "type": "tarball",
@@ -228,11 +228,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1774610258,
+        "lastModified": 1775579569,
-        "narHash": "sha256-HaThtroVD9wRdx7KQk0B75JmFcXlMUoEdDFNOMOlsOs=",
+        "narHash": "sha256-/m3yyS/EnXqoPGBJYVy4jTOsirdgsEZ3JdN2gGkBr14=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "832efc09b4caf6b4569fbf9dc01bec3082a00611",
+        "rev": "dfd9566f82a6e1d55c30f861879186440614696e",
         "type": "github"
       },
       "original": {
@@ -254,11 +254,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1774852850,
+        "lastModified": 1775892726,
-        "narHash": "sha256-7VK4v7ZbQw5apfgc+FvgRi8BUC45ERlcp8VTTTQ3tko=",
+        "narHash": "sha256-1TK1pe33cEHNvGW41TP5xAzrbG1Gp7LfyFL6c3+xf+I=",
         "owner": "notashelf",
         "repo": "nvf",
-        "rev": "b4d6539e7e9948aaba5efd7a67a63672d1fa80ef",
+        "rev": "5ab359ee7dfd3fa09a5c6f863efaf810bb9a9436",
         "type": "github"
       },
       "original": {
@@ -292,11 +292,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1774910634,
+        "lastModified": 1775971308,
-        "narHash": "sha256-B+rZDPyktGEjOMt8PcHKYmgmKoF+GaNAFJhguktXAo0=",
+        "narHash": "sha256-VKp9bhVSm0bT6JWctFy06ocqxGGnWHi1NfoE90IgIcY=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "19bf3d8678fbbfbc173beaa0b5b37d37938db301",
+        "rev": "31ac5fe5d015f76b54058c69fcaebb66a55871a4",
         "type": "github"
       },
       "original": {
@@ -340,11 +340,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1774879171,
+        "lastModified": 1775940860,
-        "narHash": "sha256-a6JZDuBIwQmuEwYM4dziH+WyrpE8HCP8F7JFIn3CNvw=",
+        "narHash": "sha256-8Jxnn2uoFhm2H579ycVxFWDtrywJ6Mc8RmqWbZwk5So=",
         "owner": "BirdeeHub",
         "repo": "nix-wrapper-modules",
-        "rev": "bab35ffae25cf6f4e4fdb3c2f7f0ac80966ce737",
+        "rev": "fb62851ffc5f6a4d53ebc00b93743e29b41e6224",
         "type": "github"
       },
       "original": {
@@ -360,11 +360,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1774293387,
+        "lastModified": 1775600302,
-        "narHash": "sha256-yVekLWxKTUfUyuvo9HVihtOK8llIP3IZCrJmftxT+Nc=",
+        "narHash": "sha256-2fgKImv78CXIcfo1RsY7EI4uMZ84x/MggA5rrusYc7c=",
         "owner": "lassulus",
         "repo": "wrappers",
-        "rev": "3cf1e8371129e8746d37c863c5d56a81fb16caa0",
+        "rev": "9d8397d8ef1ac35763085f3338589f558128f7db",
         "type": "github"
       },
       "original": {

modules/features/desktop.nix

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

modules/features/forgejo.nix

@@ -2,10 +2,14 @@
   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;
@@ -25,40 +29,119 @@
       config = lib.mkIf cfg.enable {
         networking.firewall.allowedTCPPorts = lib.optionals cfg.openFirewall [ cfg.port ];
 
-        services.forgejo = {
+        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;
-          settings.server = lib.mkMerge [
+            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 {
-              ROOT_URL = "https://forgejo.john-stream.com";
                   PROTOCOL = "https";
                   COOKIE_SECURE = true;
                   KEY_FILE = config.mtls.keyFile;
                   CERT_FILE = config.mtls.certFile;
                 })
               ];
-
+              oauth2_client = {
-          database = {
+                ENABLE_AUTO_REGISTRATION = true;
-            type = "postgres";
+                USERNAME = "nickname";
-            port = config.services.postgresql.settings.port;
+                UPDATE_AVATAR = true;
-            # createDatabase = false;
+                ACCOUNT_LINKING = "login";
+                REGISTER_EMAIL_CONFIRM = false;
+              };
+              repository = {
+                ENABLE_PUSH_CREATE_USER = true;
+              };
+              ui.SHOW_USER_EMAIL = false;
+              markup = {
+                ENABLED = true;
               };
-          # dump = {
-          #   enable = true;
-          #   interval = "12h";
-          # };
             };
 
-        services.postgresql = {
+            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;
-          settings = {
+              type = "tar";
+              interval = "*-*-* 00/12:00:00";
+            };
+          };
 
+          postgresql = {
+            enable = true;
+            enableTCPIP = false;
           };
         };
+
+        # https://forgejo.org/docs/latest/admin/command-line/#dump
+        systemd.services.forgejo-dump.serviceConfig.ExecStart = lib.mkForce ''
+          ${lib.getExe config.services.forgejo.package} dump --verbose \
+          --type ${config.services.forgejo.dump.type} \
+          --database postgres \
+          --work-path ${config.services.forgejo.dump.backupDir}
+        '';
+
+        environment.systemPackages =
+          let
+            systemctl = lib.getExe' pkgs.systemd "systemctl";
+            clean-forgejo = (pkgs.writeShellScriptBin "clean-forgejo" ''
+              set -euo pipefail
+              sudo ${systemctl} stop forgejo.service
+              ${lib.getExe' pkgs.coreutils "echo"} "Stopped Forgejo"
+              sudo ${lib.getExe' pkgs.coreutils "rm"} -rf ${config.services.forgejo.stateDir}
+              ${lib.getExe' pkgs.coreutils "echo"} "Removed ${config.services.forgejo.stateDir}"
+            '');
+            clean-postgres = (pkgs.writeShellScriptBin "clean-postgres" ''
+              set -euo pipefail
+              sudo ${systemctl} stop postgresql.service
+              ${lib.getExe' pkgs.coreutils "echo"} "Stopped PostgreSQL"
+              sudo ${lib.getExe' pkgs.coreutils "rm"} -rf ${config.services.postgresql.dataDir}
+              ${lib.getExe' pkgs.coreutils "echo"} "Removed ${config.services.postgresql.dataDir}"
+            '');
+          in [
+            clean-forgejo
+            clean-postgres
+            (pkgs.writeShellScriptBin "clean-all" ''
+              set -euo pipefail
+              GREEN_CHECK="\e[32m✔\e[0m"
+              YELLOW_BANG="\e[33m!\e[0m"
+              ${lib.getExe' pkgs.coreutils "echo"} -n -e "$YELLOW_BANG Remove everything related to Forgejo and the PostgreSQL database behind it?"
+              read -p " (y/n) " -n 1 -r
+              if [[ $REPLY =~ ^[Yy]$ ]]; then
+                ${lib.getExe clean-forgejo}
+                ${lib.getExe clean-postgres}
+                ${lib.getExe' pkgs.coreutils "echo"} -e "$GREEN_CHECK Removed everything related to forgejo"
+              fi
+            '')
+          ];
       };
     };
 }

modules/features/mtls.nix

@@ -66,9 +66,9 @@ let
         default = "root";
       };
       group = lib.mkOption {
-        description = "Group to run the mTLS renewal service as. Defaults to the configured renewal user when null.";
+        description = "Group to run the mTLS renewal service as. Defaults to the configured renewal user.";
         type = lib.types.nullOr lib.types.str;
-        default = null;
+        default = "mtls";
       };
       reloadUnits = lib.mkOption {
         description = "systemd units to try-reload-or-restart after a successful certificate renewal.";
@@ -92,88 +92,103 @@ let
     keyFile,
     bundleFile,
     lifetime,
+    user,
+    group,
   }:
   let
-    stepCmd = lib.getExe pkgs.step-cli;
     sanArgs = lib.concatMapStringsSep " " (s: "--san \"${s}\"") san;
   in
-    pkgs.writeShellScriptBin "mtls-generate" ''
+    pkgs.writeShellApplication {
+      name = "mtls-generate";
+      runtimeInputs = with pkgs; [ coreutils step-cli ];
+      text = ''
         set -euo pipefail
-      ${stepCmd} ca certificate \
+        step ca certificate ${subject} ${certFile} ${keyFile} \
-        ${subject} ${certFile} ${keyFile} \
-        --not-before=-5m --not-after=${lifetime} \
           --provisioner ${provisioner} \
+          --not-before=-5m --not-after=${lifetime} \
           ${sanArgs} \
           "$@"
-      cat ${certFile} ${keyFile} > ${bundleFile}
+        (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.writeShellScriptBin "mtls-check" ''
+  mkMtlsCheckScript = { pkgs, bundleFile }: pkgs.writeShellApplication {
-    ${lib.getExe pkgs.openssl} x509 \
+    name = "mtls-check";
-    -noout -subject -issuer \
+    runtimeInputs = with pkgs; [ openssl ];
+    text = ''
+      openssl x509 -noout -in ${bundleFile} \
+        -subject -issuer \
         -ext subjectAltName,extendedKeyUsage \
-    -enddate -in ${bundleFile}
+        -enddate
     '';
+  };
 
   mkMtlsRenewScript = {
     pkgs,
-    certFile,
+    cfg,
-    keyFile,
-    bundleFile,
-    reloadUnits ? [ ],
-    postCommands ? [ ],
     systemctlArgs ? [ ],
   }:
   let
-    echoCmd = lib.getExe' pkgs.coreutils "echo";
+    systemctlCmd = "systemctl ${lib.escapeShellArgs systemctlArgs}";
-    systemctl = lib.getExe' pkgs.systemd "systemctl";
+
-    escapedArgs = lib.escapeShellArgs systemctlArgs;
+    hasReloadUnits = cfg.renew.reloadUnits != [ ];
-    systemctlCommand = "${systemctl} ${escapedArgs}";
     renewReloadScript = lib.concatMapStringsSep "\n" (unit: ''
-      if ${systemctlCommand} --quiet is-active "${unit}"; then
+      if ${systemctlCmd} --quiet is-active "${unit}"; then
-        ${systemctlCommand} try-reload-or-restart "${unit}"
+        ${systemctlCmd} try-reload-or-restart "${unit}"
       fi
-    '') reloadUnits;
+    '') cfg.renew.reloadUnits;
-    renewPostCommands = lib.concatStringsSep "\n" postCommands;
+
+    hasPostCommands = cfg.renew.postCommands != [ ];
+    renewPostCommands = lib.concatStringsSep "\n" cfg.renew.postCommands;
+
+    fileOwner = "${cfg.renew.user}:${cfg.renew.group}";
   in
-    pkgs.writeShellScriptBin "mtls-renew" ''
+    pkgs.writeShellApplication {
+      name = "mtls-renew";
+      runtimeInputs = with pkgs; [ coreutils step-cli systemd ];
+      text = ''
       set -euo pipefail
 
-      if ${lib.getExe pkgs.step-cli} certificate needs-renewal "${certFile}"; then
+      YELLOW_BANG="\e[33m!\e[0m"
-        ${echoCmd} "Renewing mTLS certificate"
+
-      else
+      force=0
-        ${echoCmd} "Skipping renew"
+      while [[ $# -gt 0 ]]; do
-        exit "$?"
+      case $1 in
+        --force)
+        force=1
+        shift
+        ;;
+        *)
+        echo -e "$YELLOW_BANG Warning: ignoring unrecognized argument '$1'"
+        exit 1
+        ;;
+      esac
+      done
+
+      if [[ $force -eq 0 ]] && ! step certificate needs-renewal "${cfg.certFile}"; then
+        echo "Skipping renew"
+        exit 0
       fi
 
-      ${lib.getExe pkgs.step-cli} ca renew --force "${certFile}" "${keyFile}"
+      echo "Renewing mTLS certificate"
+      step ca renew --force "${cfg.certFile}" "${cfg.keyFile}"
+      (umask 077; cat "${cfg.certFile}" "${cfg.keyFile}" > "${cfg.bundleFile}")
+      chown ${fileOwner} ${cfg.certFile} ${cfg.keyFile} ${cfg.bundleFile}
+      chmod 640 ${cfg.certFile} ${cfg.keyFile} ${cfg.bundleFile}
 
-      umask 077
+      ${lib.optionalString hasReloadUnits ''
-      ${lib.getExe' pkgs.coreutils "cat"} "${certFile}" "${keyFile}" > "${bundleFile}"
+        echo "Reloading units: ${lib.concatStringsSep ", " cfg.renew.reloadUnits}"
-
-      ${echoCmd} "Reloading units:"
         ${renewReloadScript}
+      ''}
 
-      ${echoCmd} "Post commands:"
+      ${lib.optionalString hasPostCommands ''echo "Post commands:" ${renewPostCommands}''}
-      ${renewPostCommands}
       '';
-
-  mkNixosMtlsRenewService = {
-    pkgs,
-    certFile,
-    keyFile,
-    bundleFile,
-    reloadUnits ? [ ],
-    postCommands ? [ ],
-    user ? "root",
-    group ? null,
-  }:
-  let
-    serviceGroup = if group == null then user else group;
-    renewScript = mkMtlsRenewScript {
-      inherit pkgs certFile keyFile bundleFile reloadUnits postCommands;
     };
-  in
+
+  mkNixosMtlsRenewService = { pkgs, cfg, ... }:
     {
       description = "Renew the mTLS certificate when Smallstep marks it ready";
       wantedBy = [ ];
@@ -181,9 +196,9 @@ let
       wants = [ "network-online.target" ];
       serviceConfig = {
         Type = "oneshot";
-      User = user;
+        User = cfg.renew.user;
-      Group = serviceGroup;
+        Group = cfg.renew.group;
-      ExecStart = lib.getExe renewScript;
+        ExecStart = lib.getExe (mkMtlsRenewScript { inherit pkgs cfg; });
       };
     };
 
@@ -203,17 +218,10 @@ let
     };
   };
 
-  mkHomeManagerMtlsRenewService = {
+  mkHomeManagerMtlsRenewService = { pkgs, cfg, ... }:
-    pkgs,
-    certFile,
-    keyFile,
-    bundleFile,
-    reloadUnits ? [ ],
-    postCommands ? [ ],
-  }:
   let
     renewScript = mkMtlsRenewScript {
-      inherit pkgs certFile keyFile bundleFile reloadUnits postCommands;
+      inherit pkgs cfg;
       systemctlArgs = [ "--user" ];
     };
   in
@@ -263,28 +271,36 @@ in
           type = lib.types.str;
           default = "/etc/step-ca/certs";
         };
+        certReaders = lib.mkOption {
+          description = "";
+          type = lib.types.listOf lib.types.str;
+          default = [ ];
+        };
       };
 
       config = lib.mkIf cfg.enable {
+        users.groups.certReaders = {
+          name = cfg.renew.group;
+          members = cfg.certReaders;
+        };
+
         environment.systemPackages = with pkgs; lib.optionals cfg.enable [
           # step-cli
           (mkMtlsGenerateScript {
             inherit pkgs;
             inherit (cfg) subject provisioner san certFile keyFile bundleFile lifetime;
+            inherit (cfg.renew) user group;
           })
           (mkMtlsCheckScript { inherit pkgs; inherit (cfg) bundleFile; })
-          (mkMtlsRenewScript { inherit pkgs; inherit (cfg) certFile keyFile bundleFile; })
+          (mkMtlsRenewScript { inherit pkgs cfg; })
         ];
 
         systemd.tmpfiles.rules = [
-          "d ${cfg.certDir} 0750 ${cfg.renew.user} ${if cfg.renew.group == null then cfg.renew.user else cfg.renew.group} -"
+          "d ${cfg.certDir} 0750 ${cfg.renew.user} ${cfg.renew.group} -"
         ];
 
-        systemd.services.mtls-renew = lib.mkIf cfg.renew.enable (mkNixosMtlsRenewService {
+        systemd.services.mtls-renew = lib.mkIf cfg.renew.enable
-          inherit pkgs;
+          (mkNixosMtlsRenewService { inherit pkgs cfg; });
-          inherit (cfg) certFile keyFile bundleFile;
-          inherit (cfg.renew) reloadUnits postCommands user group;
-        });
 
         systemd.timers.mtls-renew = lib.mkIf cfg.renew.enable (mkNixosMtlsRenewTimer {
           inherit (cfg.renew) onCalendar randomizedDelaySec;
@@ -314,20 +330,19 @@ in
           # 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 certFile keyFile 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 {
+        systemd.user.services.mtls-renew = lib.mkIf cfg.renew.enable
-          inherit pkgs certFile keyFile bundleFile;
+          (mkHomeManagerMtlsRenewService { inherit pkgs cfg; });
-          inherit (cfg.renew) reloadUnits postCommands;
-        });
 
         systemd.user.timers.mtls-renew = lib.mkIf cfg.renew.enable (mkHomeManagerMtlsRenewTimer {
           inherit (cfg.renew) onCalendar randomizedDelaySec;

modules/features/shell-tools.nix

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

modules/hosts/janus/default.nix

@@ -3,32 +3,52 @@ let
   username = "john";
   hostname = "janus";
   ca-url = "https://janus.john-stream.com/";
-  fingerprint = "2036c44f7b5901566ff7611ea6c927291ecc6d2dd00779c0eead70ec77fa10d6";
+  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/config/defaults.json"
+        "L+ ${home}/.step/config/defaults.json - - - - /etc/step-ca/defaults.json"
-        "L+ ${home}/.step/certs/root_ca.crt - - - - /etc/step/certs/root_ca.crt"
+        "L+ ${home}/.step/certs/root_ca.crt - - - - ${cfg.certDir}/root_ca.crt"
       ];
     in
     {
-      environment.etc."step/config/defaults.json".text = builtins.toJSON {
+      options.janus-ca = {
-        inherit ca-url fingerprint;
+        certDir = lib.mkOption {
-        root = "/etc/step-ca/certs/root_ca.crt";
+          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;
         };
-      environment.etc."step-ca/certs/root_ca.crt".source = ./root_ca.crt;
         systemd.tmpfiles.rules =
           mkStepRules johnHome username johnGroup
           ++ mkStepRules "/root" "root" "root";
       };
+    };
 
   flake.modules.homeManager.janus-ca = { config, ... }: {
     home.file.".step/config/defaults.json".text = builtins.toJSON {
@@ -75,14 +95,7 @@ in
     ];
   };
 
-  flake-file.inputs = {
+  perSystem = { system, pkgs, lib, ... }: {
-    wrappers = {
-      url = "github:lassulus/wrappers";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-  };
-
-  perSystem = { pkgs, lib, ... }: {
     packages.janus-ca = inputs.wrappers.lib.wrapPackage {
       inherit pkgs;
       package = pkgs.step-cli;

modules/hosts/janus/fingerprint

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

modules/hosts/john-p14s/configuration.nix

@@ -125,7 +125,10 @@
             bash
             discord
             my-neovim
+            proton-vpn
+            joplin-desktop
           ];
+          ssh.certificates.enable = true;
           ssh.matchSets = {
             appdaemon = true;
             homelab = true;

modules/hosts/john-pc/default.nix

@@ -1,27 +1,25 @@
-{ self, inputs, ... }:
+{ withSystem, self, inputs, ... }:
 let
   username = "john";
   hostname = "john-pc-ubuntu";
 
-  testHost = "soteria"; # which host to test build
-  testTarget = "fded:fb16:653e:25da:be24:11ff:fea0:753f"; # test-nix
   # testTarget = "fded:fb16:653e:25da:be24:11ff:fe89:1cc3"; # soteria
+  # testTarget = "fded:fb16:653e:25da:be24:11ff:fea0:753f"; # test-nix
+  testHost = "soteria"; # which host to test build
+  testTarget = "test-nix";
 
 in
 {
   flake.modules.homeManager."${hostname}" = { config, pkgs, lib, ... }:
   let
-    flakeDir = "${config.xdg.configHome}/home-manager/jsl-dendritic";
+    selfPkgs = inputs.self.packages.${pkgs.stdenv.hostPlatform.system};
     resticPasswordFile = "${config.xdg.configHome}/restic/password.txt";
-
+    flakeDir = "${config.xdg.configHome}/home-manager/jsl-dendritic";
-    testPushCmd = (pkgs.writeShellScriptBin "test-push" ''
+    test-push = with pkgs; writeShellApplication {
-      ${lib.getExe' pkgs.coreutils "echo"} "Pushing ${testHost} to ${testTarget}"
+      name = "test-push";
-      ${lib.getExe' pkgs.coreutils "mkdir"} -p /var/tmp/nix-build
+      runtimeInputs = [ nh ];
-      ${lib.getExe' pkgs.coreutils "chmod"} 1777 /var/tmp/nix-build
+      text = ''nh os switch ${flakeDir}#${testHost} --target-host root@${testTarget} -e none'';
-      ${lib.getExe pkgs.nixos-rebuild} switch \
+    };
-        --flake ${flakeDir}#${testHost} \
-        --target-host root@${testTarget}
-    '');
   in
   {
     imports = with inputs.self.modules.homeManager; [
@@ -34,7 +32,6 @@ in
       restic
       docker
       desktop
-      # neovim
     ];
     # TODO: make this more restrictive, rather than allowing all unfree packages
     nixpkgs.config.allowUnfree = true;
@@ -46,8 +43,11 @@ in
     home.homeDirectory = "/home/${username}";
     home.packages = with pkgs; [
       nixos-rebuild
-      testPushCmd
+      test-push
-      inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.my-neovim
+      selfPkgs.neovim-min
+      # ${selfPkgs}.my-neovim
+      # selfPkgs.richPrinter
+      selfPkgs.janus-ca
     ];
 
     shell.program = "zsh";
@@ -109,10 +109,9 @@ in
     };
   };
 
-  flake.homeConfigurations."${hostname}" = inputs.home-manager.lib.homeManagerConfiguration {
+  flake.homeConfigurations."john@john-pc-ubuntu" = withSystem "x86_64-linux" (ctx@{ config, inputs', ...}:
-    pkgs = import inputs.nixpkgs { system = "x86_64-linux"; };
+    inputs.home-manager.lib.homeManagerConfiguration {
-    modules = with inputs.self.modules; [
+      pkgs = inputs'.nixpkgs.legacyPackages;
-      homeManager."${hostname}"
+      modules = [ inputs.self.modules.homeManager."${hostname}" ];
-    ];
+  });
-  };
 }

modules/hosts/soteria/secrets.yaml

@@ -1,5 +1,14 @@
 janus:
     admin_jwk: ENC[AES256_GCM,data:2XcN5X77wTQ+OUXa4C9xAErGvrwJKseHjCcgoj6jt+c=,iv:9x+M1wM0dYND1JYkJjM4N8pSOok2OF+P9vmm9NCumTI=,tag:dTCfh+KB1iRJBVoNsGqvuw==,type:str]
+forgejo:
+    #ENC[AES256_GCM,data:/wtm0uXbiWFoGNWtlTzVuNxBR7CPm2FMB98t3AxSj5V5rltLvzF9BjgWoJCiX3ltzmU=,iv:xaZXbUIGJHxPrLRQzEQI7hgRgc0y061jIhoE3zlcMaA=,tag:fQGheCIdBKm6wE+vtj7g6A==,type:comment]
+    secret_key: ENC[AES256_GCM,data:/jcyeDcsryLqu9Q3VnNaENb71/Tl5JUr0zDzxt8L5UCtnJ/YHA6MKItrQ9ZHFv1XROtnSfZl9D5kKomeM8EVqA==,iv:HxMKAMVQ08gkq6SWENj0/d8i9PhcgPCp5eqbztj9bSg=,tag:nO2dFWT/vfgGc/9JIDZrGw==,type:str]
+    #ENC[AES256_GCM,data:TADqVsZwXpH/zfrXNclavH8Sv++jX081UjK/Mkys5x52gU5fU0ikk478EmwzeergsHpmxxon,iv:v9HsIsud+eiko7F0u622MBrTVDsIxlpqru0Viifvqow=,tag:FLgNTW0EcGhHT6iI9I6Bsg==,type:comment]
+    internal_token: ENC[AES256_GCM,data:7eZM+misgHZz1p6HH9VzCAPIIFjp2vT0kyc9B1KllE+x2URyrgs5IR9SZ+T5vNdMdnlNzF25pUhKzjbak8tVN554rYWp06SczzqhLyaoHKs8iGBohMqfJkoZxxIVSB7g7GC+/SAsb719,iv:XbBXqXh/PqjEcAj0qsajR7Ij56KGT/9Spdp5T549p9I=,tag:o4ONucOkIE2VJ6VjOlPb6w==,type:str]
+    #ENC[AES256_GCM,data:ZqwgnKjaolJtjcy287fnDOkb/oSLnBpfWfsTeVPwbIE8YLRSoPP4gbCnHJBLq+TJNNI=,iv:zTvw4ZS6C1ifUwOijNLuTfUQ3JM+5gj1X2f/s8MwWXc=,tag:Y1yKlL+jIRHVBulGlSErog==,type:comment]
+    jwt_secret: ENC[AES256_GCM,data:e59MlATOorsTIQjtTUKfX5Yo3CVsbbfuKczp1gh1m2D1kkZK3ORFztYpjg==,iv:JH3PVUmXToiThEKDkDJ8MGVMAPlIEgPSWhru+9WgNjk=,tag:FfDpaCPejpw6kGDkxJwDWw==,type:str]
+    lfs_jwt_secret: ENC[AES256_GCM,data:xi9PEKFUGRyc3YOg3JM3KrrENi9xsbeBjiz4R16SK5WDafoGFLazN6KRJQ==,iv:1IhPyQDwA8tZ22pfZJiU8TRTCLCHC/HAnKdmSGDfvcM=,tag:rLdREVSKBm67rt8ayN16Vw==,type:str]
+restic_password: ENC[AES256_GCM,data:u7QOZXJkxVG4J75K5nphb2uJGdz6jbWuVSsKKu+41fshp7cVoRijtr/Cs02LjVse,iv:bt1W2FeBTG6ypBFYzMPXPIkYTSn0uHURY2ui6MRgYY8=,tag:DObAMws/zQcM+UKUe9EECA==,type:str]
 sops:
     age:
         - recipient: age1ykcs39e62pz3xu6cedg8ea685kv5d5qsrhgkndygzm8rx30xd5ys5t3qxt
@@ -29,7 +38,7 @@ sops:
             Yjd0MUcxcExvWVpCOUR3MkdZdGQyWUkKnru0Y2A98+0Mps7EtVK7ct3vPqIGveUt
             E5fzpcKvdefzObrx7BPTwJ19t2fZg/dSi7HKwx3vmKZSzyQaqJOzsg==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2026-03-29T22:44:20Z"
+    lastmodified: "2026-04-04T23:18:43Z"
-    mac: ENC[AES256_GCM,data:f2QVZsCNZJIxnsWsBXVyD6JFSmsMktZqCXQWAJcLfSaojEld9CMu1rJjDyCbG3GPJStrMS20WZbtQvx7H6gosnkxXL401L8SwIoy/gNNEIx0qVLUneoEsuvjSTIiiUG7B2Y9lBKQ/kO/iKrJMURSke0wWWC1Ng5mUePfZ94FVTg=,iv:xOFeak0pjBt4iTFr9vt4cuA9WzFD/ipVThgulNOp100=,tag:YPLXK4RmQLa+ADl6DohmBQ==,type:str]
+    mac: ENC[AES256_GCM,data:qBgeli5lHb4pyA8nAADBuRBAaq8VbAIsFI37OZtgnbnoHW2crxo3YC+EknaIYnZpZ48kwVhQS5lGRjI6JsWWhTH3+LVAhTmS2Qj/pZTD/JDLK6XJGXS4U9nB7m9aGYyW8gFCy9/DfoJWGsS//+ZmUikKPfd5kMZgh1zGoYCIGug=,iv:h+2fA+bO2SMCNrEslP36x3BPRaIy25cU/DNX8CYSC6A=,tag:RvVyUZ4ONRaKaqGiT31eUQ==,type:str]
     unencrypted_suffix: _unencrypted
-    version: 3.12.1
+    version: 3.12.2

modules/hosts/soteria/soteria.nix

@@ -17,21 +17,9 @@ in
       nixos.forgejo
       # nixos.restic-server
       # nixos.restic-envoy
-      ({ pkgs, ... }: {
+      ({ config, pkgs, ... }: {
         networking.hostName = hostname;
-        mtls = {
+        time.timeZone = "America/Chicago";
-          enable = true;
-          subject = hostname;
-          san = [
-            "${hostname}.john-stream.com"
-            "192.168.1.142"
-          ];
-          lifetime = "1h";
-          renew.onCalendar = "*:3/15";
-          renew.postCommands = [
-            "${lib.getExe pkgs.docker} restart envoy"
-          ];
-        };
 
         # Removes password for sudo
         security.sudo-rs.extraRules = lib.mkAfter [
@@ -45,13 +33,53 @@ in
             ];
           }
         ];
-        # nix.settings.build-dir = "/var/tmp/nix-build";
+
-        # systemd.tmpfiles.rules = [
+        users.users."${username}".extraGroups = [ "mtls" ];
-        #   "d /var/tmp/nix-build 1777 root root -"
+        mtls = {
-        # ];
+          enable = true;
-        step-ssh-host = {
+          certDir = config.janus-ca.certDir;
-          hostname = hostname;
+          subject = hostname;
+          san = [
+            "${hostname}.john-stream.com"
+            # "192.168.1.142"
+            "forgejo.john-stream.com"
+            "192.168.1.244"
+          ];
+          lifetime = "12h";
+          renew.onCalendar = "*:3/15";
+          renew.reloadUnits = [ "forgejo.service" "restic-rest-server.service" ];
+          certReaders = [ config.services.forgejo.user "restic" ];
         };
+        forgejo = {
+          enable = true;
+          root_url = "https://forgejo.john-stream.com";
+          https = true;
+          port = 443;
+        };
+
+        networking.firewall.allowedTCPPorts = [ 8000 ];
+        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;
 
@@ -65,9 +93,8 @@ in
         environment.systemPackages = [
           inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.janus-ca
           inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.my-neovim
+          inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.jsl-zsh
         ];
-
-        forgejo.enable = true;
       })
     ];
   };

modules/nix-tools/rebuild.nix

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

modules/nix-tools/wrappers.nix

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

modules/nixos/login-text.nix

@@ -1,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 = {
+          service_status = lib.mkMerge [
-          Docker = "docker";
+            defaultServiceStatus
-          SSH = "sshd.socket";
+            config.loginText.extraServiceStatus
-          "SSH Cert Renewal" = "step-ssh-host-renew.timer";
+          ];
-          "mTLS Renewal" = "mtls-renew.timer";
-        };
 
           # This calculation is wrong for LXCs
           # uptime = {
@@ -43,4 +54,5 @@
         };
       };
     };
+  };
 }

modules/programs/eza.nix

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

modules/programs/files.nix

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

modules/programs/niri.nix

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

modules/programs/zsh.nix

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