flake.lock: Update

Flake lock file updates:

• Updated input 'darwin':
    'github:lnl7/nix-darwin/e95de00a471d07435e0527ff4db092c84998698e' (2025-11-26)
  → 'github:lnl7/nix-darwin/7e22bf538aa3e0937effcb1cee73d5f1bcc26f79' (2025-12-06)
• Updated input 'disko':
    'github:nix-community/disko/5a88a6eceb8fd732b983e72b732f6f4b8269bef3' (2025-12-01)
  → 'github:nix-community/disko/d64e5cdca35b5fad7c504f615357a7afe6d9c49e' (2025-12-10)
• Updated input 'home-manager':
    'github:nix-community/home-manager/ccd22c13b2200263fb59342a34bf7119a31aa363' (2025-12-06)
  → 'github:nix-community/home-manager/39cb677ed9e908e90478aa9fe5f3383dfc1a63f3' (2025-12-11)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/418468ac9527e799809c900eda37cbff999199b6' (2025-12-02)
  → 'github:nixos/nixpkgs/addf7cf5f383a3101ecfba091b98d0a1263dc9b8' (2025-12-08)
• Updated input 'nixpkgs-stable':
    'github:nixos/nixpkgs/ff06bd3398fb1bea6c937039ece7e7c8aa396ebf' (2025-12-04)
  → 'github:nixos/nixpkgs/d2b1213bf5ec5e62d96b003ab4b5cbc42abfc0d0' (2025-12-10)
• Updated input 'nur':
    'github:nix-community/nur/cfab17b2d4bf4e9fa3aa48d6b9cb36c749e096e9' (2025-12-06)
  → 'github:nix-community/nur/da24c00523a3125a97b24783e2b59b5b98ac5da7' (2025-12-13)
• Updated input 'rust-overlay':
    'github:oxalica/rust-overlay/086fd19a68e80fcc8a298e9df4674982e4c498a6' (2025-12-06)
  → 'github:oxalica/rust-overlay/348b94ed9ddffccdf1a65582a2dcff0a4a3eeeb4' (2025-12-13)
• Updated input 'wsl':
    'github:nix-community/NixOS-WSL/10124c58674360765adcb38c9a8b081fb72904e4' (2025-12-03)
  → 'github:nix-community/NixOS-WSL/0c040f28b44b18e0d4240e027096078e34dbb029' (2025-12-11)
• Updated input 'wsl/flake-compat':
    'github:edolstra/flake-compat/f387cd2afec9419c8ee37694406ca490c3f34ee5' (2025-10-27)
  → 'github:edolstra/flake-compat/65f23138d8d09a92e30f1e5c87611b23ef451bf3' (2025-12-07)
• Updated input 'zenyd-mpv-scripts':
    'github:zenyd/mpv-scripts/d20a64a008fc6fb03f026c379313111291bdd49f' (2025-12-02)
  → 'github:zenyd/mpv-scripts/62f4bb313c6cb6366672e78dea940e9da8fec84a' (2025-12-06)

flake.lock

@@ -22,11 +22,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1758805352,
-        "narHash": "sha256-BHdc43Lkayd+72W/NXRKHzX5AZ+28F3xaUs3a88/Uew=",
+        "lastModified": 1765065051,
+        "narHash": "sha256-b7W9WsvyMOkUScNxbzS45KEJp0iiqRPyJ1I3JBE+oEE=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "c48e963a5558eb1c3827d59d21c5193622a1477c",
+        "rev": "7e22bf538aa3e0937effcb1cee73d5f1bcc26f79",
         "type": "github"
       },
       "original": {
@@ -43,11 +43,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1758287904,
-        "narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=",
+        "lastModified": 1765326679,
+        "narHash": "sha256-fTLX9kDwLr9Y0rH/nG+h1XG5UU+jBcy0PFYn5eneRX8=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "67ff9807dd148e704baadbd4fd783b54282ca627",
+        "rev": "d64e5cdca35b5fad7c504f615357a7afe6d9c49e",
         "type": "github"
       },
       "original": {
@@ -76,11 +76,11 @@
     "flake-compat_2": {
       "flake": false,
       "locked": {
-        "lastModified": 1747046372,
-        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
+        "lastModified": 1765121682,
+        "narHash": "sha256-4VBOP18BFeiPkyhy9o4ssBNQEvfvv1kXkasAYd0+rrA=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
+        "rev": "65f23138d8d09a92e30f1e5c87611b23ef451bf3",
         "type": "github"
       },
       "original": {
@@ -148,27 +148,6 @@
         "type": "github"
       }
     },
-    "helix": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "rust-overlay": "rust-overlay"
-      },
-      "locked": {
-        "lastModified": 1759850138,
-        "narHash": "sha256-fYHIxjTvVIAEDWzenUROuzDPxy1rBCXZNPgh4b1dfgo=",
-        "owner": "helix-editor",
-        "repo": "helix",
-        "rev": "5b0563419eeeaf0595c848865c46be4abad246a7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "helix-editor",
-        "repo": "helix",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -176,11 +155,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760239230,
-        "narHash": "sha256-eqSP/BAbQwNTlQ/6yuK0yILzZAPNNj91gp6oIfVtu/E=",
+        "lastModified": 1765480374,
+        "narHash": "sha256-HlbvQAqLx7WqZFFQZ8nu5UUJAVlXiV/kqKbyueA8srw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "c4aaddeaecc09554c92518fd904e3e84b497ed09",
+        "rev": "39cb677ed9e908e90478aa9fe5f3383dfc1a63f3",
         "type": "github"
       },
       "original": {
@@ -259,11 +238,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1751903740,
-        "narHash": "sha256-PeSkNMvkpEvts+9DjFiop1iT2JuBpyknmBUs0Un0a4I=",
+        "lastModified": 1764234087,
+        "narHash": "sha256-NHF7QWa0ZPT8hsJrvijREW3+nifmF2rTXgS2v0tpcEA=",
         "owner": "nix-community",
         "repo": "nixos-generators",
-        "rev": "032decf9db65efed428afd2fa39d80f7089085eb",
+        "rev": "032a1878682fafe829edfcf5fdfad635a2efe748",
         "type": "github"
       },
       "original": {
@@ -290,27 +269,27 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1735563628,
-        "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=",
+        "lastModified": 1765363881,
+        "narHash": "sha256-3C3xWn8/2Zzr7sxVBmpc1H1QfxjNfta5IMFe3O9ZEPw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798",
+        "rev": "d2b1213bf5ec5e62d96b003ab4b5cbc42abfc0d0",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-24.05",
+        "ref": "nixos-25.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1760038930,
-        "narHash": "sha256-Oncbh0UmHjSlxO7ErQDM3KM0A5/Znfofj2BSzlHLeVw=",
+        "lastModified": 1765186076,
+        "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0b4defa2584313f3b781240b29d61f6f9f7e0df3",
+        "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8",
         "type": "github"
       },
       "original": {
@@ -322,11 +301,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1728538411,
-        "narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=",
+        "lastModified": 1744536153,
+        "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221",
+        "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11",
         "type": "github"
       },
       "original": {
@@ -344,11 +323,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760289427,
-        "narHash": "sha256-WZoxzFxrovU5LZhkdt77qUa2zYEBy7ntxLFUEayp2XE=",
+        "lastModified": 1765598217,
+        "narHash": "sha256-yJhIuiP6znKni5djRu+84X2ye4yyqqwz+Ob07gcgDbs=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "a82226091501c0ee01e7fb55b8f357afe0faa392",
+        "rev": "da24c00523a3125a97b24783e2b59b5b98ac5da7",
         "type": "github"
       },
       "original": {
@@ -361,7 +340,6 @@
       "inputs": {
         "darwin": "darwin",
         "disko": "disko",
-        "helix": "helix",
         "home-manager": "home-manager",
         "mac-app-util": "mac-app-util",
         "nix2vim": "nix2vim",
@@ -369,42 +347,22 @@
         "nixpkgs": "nixpkgs_2",
         "nixpkgs-stable": "nixpkgs-stable",
         "nur": "nur",
+        "rust-overlay": "rust-overlay",
         "wsl": "wsl",
         "zellij-switch": "zellij-switch",
         "zenyd-mpv-scripts": "zenyd-mpv-scripts"
       }
     },
     "rust-overlay": {
-      "inputs": {
-        "nixpkgs": [
-          "helix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1759631821,
-        "narHash": "sha256-V8A1L0FaU/aSXZ1QNJScxC12uP4hANeRBgI4YdhHeRM=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "1d7cbdaad90f8a5255a89a6eddd8af24dc89cafe",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    },
-    "rust-overlay_2": {
       "inputs": {
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1736476219,
-        "narHash": "sha256-+qyv3QqdZCdZ3cSO/cbpEY6tntyYjfe1bB12mdpNFaY=",
+        "lastModified": 1765593578,
+        "narHash": "sha256-qbl874bCIy9+OLImdfBfZ9ITUDDjjTAB04Dk4PlZFV0=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "de30cc5963da22e9742bbbbb9a3344570ed237b9",
+        "rev": "348b94ed9ddffccdf1a65582a2dcff0a4a3eeeb4",
         "type": "github"
       },
       "original": {
@@ -484,11 +442,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1759833546,
-        "narHash": "sha256-rOfkgIiiZNPUbf61OqEym60wXEODeDG8XH+gV/SUoUc=",
+        "lastModified": 1765483419,
+        "narHash": "sha256-w6wznH1lBzlSH3+pWDkE+L6xA0F02drFAzu2E7PD/Jo=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "7c0c0f4c3a51761434f18209fa9499b8579ff730",
+        "rev": "0c040f28b44b18e0d4240e027096078e34dbb029",
         "type": "github"
       },
       "original": {
@@ -502,7 +460,9 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "rust-overlay": "rust-overlay_2",
+        "rust-overlay": [
+          "rust-overlay"
+        ],
         "systems": "systems_3"
       },
       "locked": {
@@ -522,11 +482,11 @@
     "zenyd-mpv-scripts": {
       "flake": false,
       "locked": {
-        "lastModified": 1707704915,
-        "narHash": "sha256-9P/8q/OZXfaJMS08acQP4h3/zUA5mKRQee0JmkXcz1w=",
+        "lastModified": 1765050776,
+        "narHash": "sha256-9gO+GkNoGsxAbMRrBWu0FfXEQtyTmHivlaxlYLpV2YM=",
         "owner": "zenyd",
         "repo": "mpv-scripts",
-        "rev": "9bdce0050144cb24f92475f7bdd77180e0e4c26b",
+        "rev": "62f4bb313c6cb6366672e78dea940e9da8fec84a",
         "type": "github"
       },
       "original": {

flake.nix

@@ -8,7 +8,7 @@
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
 
     # Used for specific stable packages
-    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05";
+    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.05";
 
     # Used for MacOS system config
     darwin = {
@@ -64,17 +64,23 @@
       flake = false;
     };
 
+    rust-overlay = {
+      url = "github:oxalica/rust-overlay";
+    };
+
     # Zellij Switcher
     zellij-switch = {
       url = "github:mostafaqanbaryan/zellij-switch";
       inputs.nixpkgs.follows = "nixpkgs";
+      inputs.rust-overlay.follows = "rust-overlay";
     };
 
-    # Text editor
-    helix = {
-      url = "github:helix-editor/helix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    # # Text editor
+    # helix = {
+    #   url = "github:helix-editor/helix";
+    #   inputs.nixpkgs.follows = "nixpkgs";
+    #   inputs.rust-overlay.follows = "rust-overlay";
+    # };
 
     # # Nextcloud Apps
     # nextcloud-news = {
@@ -133,6 +139,7 @@
           photos = "photos.${baseName}";
           postgresql = "pg.${baseName}";
           prometheus = "prom.${baseName}";
+          recipes = "cooking.${baseName}";
           secrets = "vault.${baseName}";
           smtp = "smtp.purelymail.com";
           status = "status.${baseName}";

lib/default.nix

@@ -67,8 +67,9 @@ lib
     inputs.nur.overlays.default
     inputs.nix2vim.overlay
     inputs.zellij-switch.overlays.default
-    inputs.helix.overlays.default
-  ] ++ (importOverlays ../overlays);
+    # inputs.helix.overlays.default
+  ]
+  ++ (importOverlays ../overlays);
 
   # System types to support.
   supportedSystems = [
@@ -97,7 +98,10 @@ lib
     system:
     import inputs.nixpkgs {
       inherit system overlays;
-      config.permittedInsecurePackages = [ "litestream-0.3.13" ];
+      config.permittedInsecurePackages = [
+        "litestream-0.3.13"
+        "electron-36.9.5"
+      ];
       config.allowUnfree = true;
     }
   );
@@ -130,7 +134,8 @@ lib
       ];
       extraSpecialArgs = {
         inherit colorscheme;
-      } // specialArgs;
+      }
+      // specialArgs;
     };
 
   buildNixos =
@@ -152,8 +157,10 @@ lib
           home-manager = {
             extraSpecialArgs = {
               inherit colorscheme;
-            } // specialArgs;
-          } // homeModule.home-manager;
+            }
+            // specialArgs;
+          }
+          // homeModule.home-manager;
         }
       ];
     };
@@ -178,8 +185,10 @@ lib
           home-manager = {
             extraSpecialArgs = {
               inherit colorscheme;
-            } // specialArgs;
-          } // homeModule.home-manager;
+            }
+            // specialArgs;
+          }
+          // homeModule.home-manager;
         }
       ];
     };
@@ -222,12 +231,15 @@ lib
           home-manager = {
             extraSpecialArgs = {
               inherit colorscheme;
-            } // specialArgs;
-          } // homeModule.home-manager;
+            }
+            // specialArgs;
+          }
+          // homeModule.home-manager;
         }
       ];
       specialArgs = {
-      } // specialArgs;
+      }
+      // specialArgs;
     };
 
 }

modules/darwin/homebrew.nix

@@ -38,6 +38,7 @@
       };
       brews = [
         "trash" # Delete files and folders to trash instead of rm
+        "jiratui" # Terminal program to manage Jira
       ];
       casks = [
         "1password" # 1Password will not launch from Nix on macOS

overlays/awscli2.nix

@@ -2,6 +2,12 @@ inputs: _final: prev: {
 
   awscli2 = prev.awscli2.overrideAttrs (
     finalAttrs: previousAttrs: {
+      src = prev.fetchFromGitHub {
+        owner = "aws";
+        repo = "aws-cli";
+        rev = "2.31.27";
+        hash = "sha256-NnAEdbIZVri9Bi0KBlcZIVox+LbuD0/hBdtYB/UFHeo=";
+      };
       disabledTestPaths = previousAttrs.disabledTestPaths ++ [
         "tests/unit/customizations"
       ];

pkgs/caddy/package.nix

@@ -18,5 +18,5 @@
 }).withPlugins
   {
     plugins = [ "github.com/caddy-dns/cloudflare@v0.2.1" ];
-    hash = "sha256-XwZ0Hkeh2FpQL/fInaSq+/3rCLmQRVvwBM0Y1G1FZNU=";
+    hash = "sha256-iRzpN9awuEFsc7hqKzOMNiCFFEv833xhd4LM+VFQedI=";
   }

pkgs/tools/misc/aws-ec2/aws-ec2.sh

@@ -6,17 +6,17 @@
 # Specify AWS_PROFILE and AWS_REGION before running this script
 
 aws ec2 describe-instances \
-    --filters "Name=instance-state-name,Values=running" |
-    jq -r \
-        '.Reservations[]
+  --filters "Name=instance-state-name,Values=running" |
+  jq -r \
+    '.Reservations[]
         | .Instances[]
         | .InstanceId + " - " +
         (.PrivateIpAddress // "n/a") + " - " +
         (.PublicIpAddress // "n/a") + " - " +
         (.Tags // [] | from_entries | .Name // "n/a")' |
-    fzf \
-        --height 100% \
-        --layout reverse \
-        --header $'Press Enter to start SSM session\nInstance ID - Private IP - Public IP - Name' \
-        --preview "aws ec2 describe-instances --instance-ids \"\$(echo {} | cut -d' ' -f1)\" | jq -r '.Reservations[].Instances[0]'" \
-        --bind "enter:become(aws ssm start-session --target \$(echo {} | cut -d' ' -f1))"
+  fzf \
+    --height 100% \
+    --layout reverse \
+    --header $'Press Enter to start SSM session\nInstance ID - Private IP - Public IP - Name' \
+    --preview "aws ec2 describe-instances --instance-ids \"\$(echo {} | cut -d' ' -f1)\" | jq -r '.Reservations[].Instances[0]'" \
+    --bind "enter:become(aws ssm start-session --document-name 'AWS-StartInteractiveCommand' --parameters '{\"command\": [\"bash\"]}' --target \$(echo {} | cut -d' ' -f1))"

pkgs/tools/misc/rebuild/package.nix

@@ -1,7 +1,7 @@
 { pkgs, ... }:
 
 pkgs.writeShellScriptBin "rebuild" ''
-  echo ${pkgs.system}
+  echo ${pkgs.stdenv.hostPlatform.system}
   SYSTEM=${if pkgs.stdenv.isDarwin then "darwin" else "linux"}
   if [ "$SYSTEM" == "darwin" ]; then
       sudo darwin-rebuild switch --flake ${builtins.toString ../../../../.}

platforms/home-manager/modules/nmasur/presets/programs/aerc.nix

@@ -174,8 +174,10 @@ in
         filters = {
           "text/plain" = "${pkgs.aerc}/libexec/aerc/filters/colorize";
           "text/calendar" = "${pkgs.gawk}/bin/awk -f ${pkgs.aerc}/libexec/aerc/filters/calendar";
+          # "text/html" =
+          #   "${pkgs.aerc}/libexec/aerc/filters/html | ${pkgs.aerc}/libexec/aerc/filters/colorize"; # Requires w3m, dante
           "text/html" =
-            "${pkgs.aerc}/libexec/aerc/filters/html | ${pkgs.aerc}/libexec/aerc/filters/colorize"; # Requires w3m, dante
+            "!${pkgs.chawan}/bin/cha --type text/html --opt display.image-mode=kitty --opt display.columns=100 --opt display.force-columns=true";
           # "text/*" =
           #   ''${pkgs.bat}/bin/bat -fP --file-name="$AERC_FILENAME "'';
           "message/delivery-status" = "${pkgs.aerc}/libexec/aerc/filters/colorize";
@@ -202,7 +204,7 @@ in
 
     xdg.desktopEntries.aerc = lib.mkIf (pkgs.stdenv.isLinux) {
       name = "aerc";
-      exec = "${lib.getExe config.nmasur.presets.services.i3.terminal} aerc %u";
+      exec = "${lib.getExe config.nmasur.presets.services.i3.terminal} -e aerc %u";
     };
     xsession.windowManager.i3.config.keybindings = lib.mkIf pkgs.stdenv.isLinux {
       "${config.xsession.windowManager.i3.config.modifier}+Shift+e" =
@@ -212,7 +214,7 @@ in
             if terminal == pkgs.wezterm then
               "start --class com.noah.aerc -- aerc"
             else
-              "--class=com.noah.aerc --command=aerc";
+              "--class=com.noah.aerc -e aerc";
         in
         "exec ${
           # Don't name the script `aerc` or it will affect grep

platforms/home-manager/modules/nmasur/presets/programs/cargo.nix

@@ -27,6 +27,7 @@ in
       rustfmt
       pkg-config
       openssl
+      rust-analyzer
     ];
   };
 }

platforms/home-manager/modules/nmasur/presets/programs/chawan.nix

@@ -0,0 +1,34 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+
+let
+  cfg = config.nmasur.presets.programs.chawan;
+in
+
+{
+
+  options.nmasur.presets.programs.chawan.enable = lib.mkEnableOption "chawan TUI web browser";
+
+  config = lib.mkIf cfg.enable {
+
+    programs.chawan = {
+      enable = true;
+      settings = {
+        external.copy-cmd = if pkgs.stdenv.isLinux then "xclip -selection clipboard -in" else "pbcopy";
+      };
+    };
+
+    # Set Chawan as the default app for manual pages
+    home.sessionVariables = {
+      MANPAGER = "${lib.getExe pkgs.chawan} -T text/x-ansi";
+    };
+
+    programs.fish.shellAbbrs.man = "mancha";
+
+  };
+
+}

platforms/home-manager/modules/nmasur/presets/programs/dotfiles.nix

@@ -29,7 +29,7 @@ in
   config = lib.mkIf cfg.enable {
 
     # Always make the dotfiles directory considered safe for git and direnv
-    programs.git.extraConfig.safe.directory = cfg.path;
+    programs.git.settings.safe.directory = cfg.path;
     programs.direnv.config.whitelist.prefix = [ cfg.path ];
 
     home.activation = {

platforms/home-manager/modules/nmasur/presets/programs/ghostty.nix

@@ -16,7 +16,8 @@ in
   config = lib.mkIf cfg.enable {
 
     # Set the i3 terminal
-    nmasur.presets.services.i3.terminal = config.programs.ghostty.package;
+    nmasur.presets.services.i3.terminal =
+      if pkgs.stdenv.isDarwin then pkgs.alacritty else config.programs.ghostty.package;
 
     programs.ghostty = {
       enable = true;

platforms/home-manager/modules/nmasur/presets/programs/git-work.nix

@@ -39,8 +39,8 @@ in
   config = lib.mkIf cfg.enable {
 
     programs.git = {
-      userName = lib.mkForce cfg.work.name;
-      userEmail = lib.mkForce cfg.work.email;
+      settings.user.name = lib.mkForce cfg.work.name;
+      settings.user.email = lib.mkForce cfg.work.email;
       includes = [
         {
           path = "${config.home.homeDirectory}/${config.xdg.configFile."git/personal".target}";

platforms/home-manager/modules/nmasur/presets/programs/git/default.nix

@@ -29,9 +29,11 @@ in
 
     programs.git = {
       enable = true;
-      userName = cfg.name;
-      userEmail = cfg.email;
-      extraConfig = {
+      settings = {
+        user = {
+          name = cfg.name;
+          email = cfg.email;
+        };
         core.pager = "${pkgs.git}/share/git/contrib/diff-highlight/diff-highlight | less --no-init";
         interactive.difffilter = "${pkgs.git}/share/git/contrib/diff-highlight/diff-highlight";
         pager = {

platforms/home-manager/modules/nmasur/presets/programs/helix.nix

@@ -7,6 +7,62 @@
 
 let
   cfg = config.nmasur.presets.programs.helix;
+
+  blame_file_pretty = pkgs.writeShellScriptBin "blame_file_pretty" ''
+    # Source: https://gist.github.com/gloaysa/828707f067e3bb20da18d72fa5d4963a
+    # Utility for Helix: open the patch for the commit that last touched the current line.
+    # If the line isn’t committed yet, it shows the working-tree diff for THIS file only.
+    # The script writes the diff to /tmp and prints the absolute path to stdout
+    # Adjust `context` to see more/fewer unchanged lines around the change (default: 3).
+    #
+    # usage: git-file_pretty.sh <file> <line> [context_lines]
+    # Helix mapping example:
+    # B = ':open %sh{ ~/.config/helix/utils/git-blame-commit.sh "%{buffer_name}" %{cursor_line} 3 }'
+    file="$1"
+    line="$2"
+    ctx="''${3:-3}"
+
+    # blame the exact line
+    porc="$(git blame -L "$line",+1 --porcelain -- "$file")" || exit 1
+    sha="$(printf '%s\n' "$porc" | awk 'NR==1{print $1}')"
+    commit_path="$(printf '%s\n' "$porc" | awk '/^filename /{print substr($0,10); exit}')"
+
+    out="/tmp/hx-blame_$(basename "$file")_''${sha:-wt}.diff"
+
+    if [ -z "$sha" ] || [ "$sha" = 0000000000000000000000000000000000000000 ] || [ "$sha" = "^" ]; then
+      # uncommitted line → working tree diff for this file
+      git --no-pager diff --no-color -U"$ctx" -- "$file" > "$out"
+    else
+      # committed line → only this file’s patch in that commit
+      git --no-pager show --no-color -M -C -U"$ctx" "$sha" -- "''${commit_path:-$file}" > "$out"
+    fi
+
+    # "return" the path for :open %sh{…}
+    printf '%s' "$out"
+  '';
+
+  blame_line_pretty = pkgs.writeShellScriptBin "blame_line_pretty" ''
+    # Source: https://gist.github.com/gloaysa/828707f067e3bb20da18d72fa5d4963a
+    # Utility for Helix: pretty-print blame info for the line under the cursor.
+    # Quite basic.
+    #
+    # usage: blame_line_pretty <file> <line>
+    # Helix mapping example:
+    # b = ":run-shell-command ~/.config/helix/utils/blame_line_pretty.sh %{buffer_name} %{cursor_line}"
+      file="$1"; line="$2"
+      out="$(git blame -L "$line",+1 --porcelain -- "$file")" || return 1
+
+      sha="$(printf '%s\n' "$out" | awk 'NR==1{print $1}')"
+      author="$(printf '%s\n' "$out" | awk -F'author ' '/^author /{print $2; exit}')"
+      epoch="$(printf '%s\n' "$out" | awk '/^author-time /{print $2; exit}')"
+      # dd-mm-yyyy (macOS `date -r`; fallback to gdate if present)
+      date="$( (date -r "$epoch" +%d-%m-%Y\ %H:%M 2>/dev/null) || (gdate -d "@$epoch" +%d-%m-%Y\ %H:%M 2>/dev/null) || printf '%s' "$epoch")"
+      summary="$(printf '%s\n' "$out" | awk -F'summary ' '/^summary /{print $2; exit}')"
+      change="$(printf '%s\n' "$out" | tail -n 1)"
+
+      printf "%s\n%s\n%s\n%s\n%s\n" "$sha" "$author" "$date" "$summary" "$change"
+  '';
+
 in
 
 {
@@ -16,13 +72,13 @@ in
   config = lib.mkIf cfg.enable {
 
     # Use Neovim as the editor for git commit messages
-    programs.git.extraConfig.core.editor = lib.mkForce "${lib.getExe pkgs.helix}";
+    programs.git.settings.core.editor = lib.mkForce "${lib.getExe pkgs.helix}";
     programs.jujutsu.settings.ui.editor = lib.mkForce "${lib.getExe pkgs.helix}";
 
     # Set Neovim as the default app for text editing and manual pages
     home.sessionVariables = {
       EDITOR = lib.mkForce "${lib.getExe pkgs.helix}";
-      MANPAGER = lib.mkForce "sh -c 'col -bx | ${lib.getExe pkgs.helix}'";
+      # MANPAGER = lib.mkForce "sh -c 'col -bx | ${lib.getExe pkgs.helix}'";
       MANWIDTH = 87;
       MANROFFOPT = "-c";
     };
@@ -62,6 +118,11 @@ in
           command = lib.getExe pkgs.marksman;
         };
 
+        language-server.rumdl = {
+          command = lib.getExe pkgs.rumdl;
+          args = [ "server" ];
+        };
+
         language-server.terraform-ls = {
           command = "${lib.getExe pkgs.terraform-ls}";
           args = [ "serve" ];
@@ -87,10 +148,16 @@ in
           {
             name = "markdown";
             auto-format = false;
-            language-servers = [ "marksman" ];
+            language-servers = [
+              "marksman"
+              "rumdl"
+            ];
             formatter = {
-              command = lib.getExe pkgs.mdformat;
-              args = [ "-" ];
+              command = lib.getExe pkgs.rumdl;
+              args = [
+                "fmt"
+                "-"
+              ];
             };
             # Allows return key to continue the token on the next line
             comment-tokens = [
@@ -102,9 +169,14 @@ in
             ];
           }
           {
-            name = "tfvars";
+            name = "terraform";
+            scope = "source.tf";
             auto-format = true;
             language-servers = [ "terraform-ls" ];
+            file-types = [
+              "tf"
+              "tfvars"
+            ];
             formatter = {
               command = lib.getExe pkgs.terraform;
               args = [
@@ -116,9 +188,9 @@ in
           {
             name = "hcl";
             auto-format = true;
-            language-servers = [ "terraform-ls" ];
+            file-types = [ "hcl" ];
             formatter = {
-              command = lib.getExe pkgs.terraform;
+              command = "${pkgs.packer}/bin/packer";
               args = [
                 "fmt"
                 "-"
@@ -179,18 +251,9 @@ in
           ];
 
           # Commandline git blame
-          space.B = ":echo %sh{git log -n1 --date=short --pretty=format:'%%h %%ad %%s' $(git blame -L %{cursor_line},+1 \"%{buffer_name}\" | cut -d' ' -f1)}";
-
-          # Open yazi
-          # https://github.com/sxyazi/yazi/pull/2461
-          # Won't work until next Helix release
-          C-y = [
-            ":sh rm -f /tmp/unique-file"
-            ":insert-output ${lib.getExe pkgs.yazi} %{buffer_name} --chooser-file=/tmp/unique-file"
-            ":insert-output echo \\x1b[?1049h\\x1b[?2004h > /dev/tty"
-            ":open %sh{cat /tmp/unique-file}"
-            ":redraw"
-          ];
+          # space.B = ":echo %sh{git log -n1 --date=short --pretty=format:'%%h %%ad %%s' $(git blame -L %{cursor_line},+1 \"%{buffer_name}\" | cut -d' ' -f1)}";
+          space.B = '':open %sh{ ${blame_line_pretty}/bin/blame_line_pretty "%{buffer_name}" %{cursor_line} 3 }'';
+          space.i = '':open %sh{ ${blame_file_pretty}/bin/blame_file_pretty "%{buffer_name}" %{cursor_line} 3 }'';
 
           # Extend selection above
           X = "select_line_above";
@@ -256,6 +319,10 @@ in
             git-exclude = true; # Skip excluded files
           };
 
+          completion-replace = true; # Replace whole word with completion
+          trim-trailing-whitespace = true;
+          # rainbow-brackets = true; # Make it easier to match parentheses
+
           # Show whitespace visible to the user
           # Waiting for trailing whitespace option ideally
           whitespace = {
@@ -454,6 +521,27 @@ in
 
     };
 
+    # Create a desktop option for launching Helix from a file manager
+    # (Requires launching the terminal and then executing Helix)
+    xdg.desktopEntries.helix =
+      lib.mkIf (pkgs.stdenv.isLinux && config.nmasur.presets.services.i3.enable)
+        {
+          name = "Helix wrapper";
+          exec = ''sh -c "${lib.getExe config.nmasur.presets.services.i3.terminal} --command='hx \$1'" _ %F ''; # TODO: change to work for any terminal
+          mimeType = [
+            "text/plain"
+            "text/markdown"
+          ];
+        };
+    xdg.mimeApps.defaultApplications = {
+      "text/plain" = lib.mkBefore [ "Helix.desktop" ];
+      "text/markdown" = lib.mkBefore [ "Helix.desktop" ];
+    };
+
+    home.packages = [
+      (pkgs.writers.writeDashBin "xterm" ''${lib.getExe config.nmasur.presets.services.i3.terminal} +new-window --command"$@" '')
+    ];
+
   };
 
 }

platforms/home-manager/modules/nmasur/presets/programs/jujutsu.nix

@@ -20,8 +20,8 @@ in
       # https://github.com/martinvonz/jj/blob/main/docs/config.md
       settings = {
         user = {
-          name = config.programs.git.userName;
-          email = config.programs.git.userEmail;
+          name = config.programs.git.settings.user.name;
+          email = config.programs.git.settings.user.email;
         };
         ui.paginate = "never";
 
@@ -34,6 +34,9 @@ in
     home.packages = [
       # Required for the fsmonitor to auto-snapshot
       pkgs.watchman
+
+      # Required to be on path to work in Zellij
+      pkgs.jjui
     ];
 
   };

platforms/home-manager/modules/nmasur/presets/programs/neovim.nix

@@ -38,13 +38,13 @@ in
     );
 
     # Use Neovim as the editor for git commit messages
-    programs.git.extraConfig.core.editor = "${lib.getExe cfg.package}";
+    programs.git.settings.core.editor = "${lib.getExe cfg.package}";
     programs.jujutsu.settings.ui.editor = "${lib.getExe cfg.package}";
 
     # Set Neovim as the default app for text editing and manual pages
     home.sessionVariables = {
       EDITOR = "${lib.getExe cfg.package}";
-      MANPAGER = "${lib.getExe cfg.package} +Man!";
+      # MANPAGER = "${lib.getExe cfg.package} +Man!";
     };
 
     # Create quick aliases for launching Neovim
@@ -66,7 +66,7 @@ in
       lib.mkIf (pkgs.stdenv.isLinux && config.nmasur.presets.services.i3.enable)
         {
           name = "Neovim wrapper";
-          exec = "${lib.getExe config.nmasur.presets.services.i3.terminal} nvim %F"; # TODO: change to generic
+          exec = ''${lib.getExe config.nmasur.presets.services.i3.terminal} --command="nvim %F"''; # TODO: change to generic
           mimeType = [
             "text/plain"
             "text/markdown"

platforms/home-manager/modules/nmasur/presets/programs/nixpkgs.nix

@@ -29,6 +29,18 @@ in
           doas nixos-rebuild switch --flake ${config.nmasur.presets.programs.dotfiles.path}
         '';
       };
+      rebuildNixosAndPause = lib.mkOption {
+        type = lib.types.package;
+        default = pkgs.writeShellScriptBin "rebuild-nixos-pause" ''
+          ${lib.getExe cfg.commands.rebuildNixos} || read
+        '';
+      };
+      rebuildHomeAndPause = lib.mkOption {
+        type = lib.types.package;
+        default = pkgs.writeShellScriptBin "rebuild-home-pause" ''
+          ${lib.getExe cfg.commands.rebuildHome} || read
+        '';
+      };
     };
   };
 

platforms/home-manager/modules/nmasur/presets/programs/obsidian.nix

@@ -22,6 +22,6 @@ in
 
     # Broken on 2023-12-11
     # https://forum.obsidian.md/t/electron-25-is-now-eol-please-upgrade-to-a-newer-version/72878/8
-    # insecurePackages = [ "electron-25.9.0" ];
+    # allowInsecurePackages = [ "electron-36.9.5" ];
   };
 }

platforms/home-manager/modules/nmasur/presets/programs/zellij.nix

@@ -53,6 +53,8 @@ in
       };
     };
 
+    programs.ghostty.settings.initial-command = lib.getExe pkgs.zellij;
+
     xdg.configFile."zellij/layouts/compact-top.kdl".text = # kdl
       ''
         layout {
@@ -85,7 +87,7 @@ in
       enableFishIntegration = true;
       enableZshIntegration = true;
       attachExistingSession = true;
-      exitShellOnExit = false;
+      exitShellOnExit = true;
 
       settings = {
         default_mode = "locked";
@@ -121,9 +123,15 @@ in
           shared = {
             "bind \"Alt Shift s\"" = {
               Run = {
-                _args = [
-                  (lib.getExe zellij-switch-to-last)
-                ];
+                _args =
+                  if pkgs.stdenv.isDarwin then
+                    [
+                      "env"
+                      "PATH=${config.home.homeDirectory}/.nix-profile/bin:/usr/bin:/bin"
+                      (lib.getExe zellij-switch-to-last)
+                    ]
+                  else
+                    [ (lib.getExe zellij-switch-to-last) ];
                 close_on_exit = true;
               };
             };
@@ -186,9 +194,28 @@ in
               };
             };
             "bind \"Alt Shift j\"" = {
+              Run = {
+                _args =
+                  if pkgs.stdenv.isDarwin then
+                    [
+                      "env"
+                      "PATH=${config.home.homeDirectory}/.nix-profile/bin:/usr/bin"
+                      (lib.getExe pkgs.jjui)
+                    ]
+                  else
+                    [ (lib.getExe pkgs.jjui) ];
+                close_on_exit = true;
+                floating = true;
+                x = "1%";
+                y = "1%";
+                width = "99%";
+                height = "99%";
+              };
+            };
+            "bind \"Alt Shift y\"" = {
               Run = {
                 _args = [
-                  (lib.getExe pkgs.lazyjj)
+                  (lib.getExe pkgs.yazi)
                 ];
                 close_on_exit = true;
                 floating = true;

platforms/home-manager/modules/nmasur/presets/services/i3.nix

@@ -214,9 +214,9 @@ in
               cfg.commands.lockScreen != null
             ) "exec ${cfg.commands.lockScreen}";
             "${modifier}+Mod1+h" =
-              ''exec --no-startup-id ${lib.getExe cfg.terminal} --command="${pkgs.home-manager}/bin/home-manager switch --flake ${config.nmasur.presets.programs.dotfiles.path}#''${hostname} || read" '';
+              ''exec --no-startup-id ${lib.getExe cfg.terminal} -e "${lib.getExe config.nmasur.presets.programs.nixpkgs.commands.rebuildHome} '';
             "${modifier}+Mod1+r" =
-              "exec --no-startup-id ${lib.getExe cfg.terminal} --command='doas nixos-rebuild switch --flake ${config.nmasur.presets.programs.dotfiles.path} || read'";
+              "exec --no-startup-id ${lib.getExe cfg.terminal} -e ${lib.getExe config.nmasur.presets.programs.nixpkgs.commands.rebuildNixos}";
 
             # Window options
             "${modifier}+q" = "kill";

platforms/home-manager/modules/nmasur/profiles/common.nix

@@ -33,6 +33,7 @@ in
     nmasur.presets = {
       programs = {
         bat.enable = lib.mkDefault true;
+        chawan.enable = lib.mkDefault true;
         fd.enable = lib.mkDefault true;
         ripgrep.enable = lib.mkDefault true;
         starship.enable = lib.mkDefault true;

platforms/home-manager/modules/nmasur/profiles/developer.nix

@@ -19,6 +19,10 @@ in
       pkgs.pgcli # Postgres client with autocomplete
     ];
 
+    nmasur.presets = {
+      programs.cargo.enable = lib.mkDefault true;
+    };
+
   };
 
 }

platforms/home-manager/modules/nmasur/profiles/experimental.nix

@@ -17,7 +17,6 @@ in
 
     nmasur.presets.programs = {
       zed-editor.enable = lib.mkDefault true;
-      jujutsu.enable = lib.mkDefault true;
     };
 
     home.packages = [
@@ -29,7 +28,8 @@ in
       pkgs.charm # Manage account and filesystem
       pkgs.pop # Send emails from a TUI
 
-      pkgs.chawan # Browser TUI
+      pkgs.crush # AI LLM Agent
+      pkgs.gemini-cli # AI LLM Agent
 
     ];
 

platforms/home-manager/modules/nmasur/profiles/power-user.nix

@@ -16,10 +16,11 @@ in
       pkgs.age # Encryption
       pkgs.bc # Calculator
       pkgs.bottom # System monitor (top)
+      pkgs.csvlens # CSV viewer (easier than visidata)
       pkgs.delta # Fancy diffs
       pkgs.difftastic # Other fancy diffs
       pkgs.doggo # DNS client (dig)
-      pkgs.du-dust # Disk usage tree (ncdu)
+      pkgs.dust # Disk usage tree (ncdu)
       pkgs.dua # File sizes (du)
       pkgs.duf # Basic disk information (df)
       pkgs.jless # JSON viewer
@@ -33,7 +34,7 @@ in
       pkgs.pandoc # Convert text documents
       pkgs.qrencode # Generate qr codes
       pkgs.spacer # Output lines in terminal
-      pkgs.tealdeer # Cheatsheets
+      pkgs.stable.tealdeer # Cheatsheets
       pkgs.tree # Print tree in terminal
       pkgs.vimv-rs # Batch rename files
       pkgs.yazi # TUI file explorer
@@ -42,7 +43,7 @@ in
 
     programs.fish.shellAliases = {
       "du" = lib.mkDefault (lib.getExe pkgs.dua);
-      "ncdu" = lib.mkDefault (lib.getExe pkgs.du-dust);
+      "ncdu" = lib.mkDefault (lib.getExe pkgs.dust);
       "df" = lib.mkDefault (lib.getExe pkgs.duf);
 
       # Use eza (exa) instead of ls for fancier output
@@ -63,8 +64,9 @@ in
       ghostty.enable = lib.mkDefault true;
       git.enable = lib.mkDefault true;
       helix.enable = lib.mkDefault true;
+      jujutsu.enable = lib.mkDefault true;
       lazygit.enable = lib.mkDefault true;
-      neovim.enable = lib.mkDefault true;
+      # neovim.enable = lib.mkDefault true;
       nix-index.enable = lib.mkDefault true;
       nixpkgs.enable = lib.mkDefault true;
       notes.enable = lib.mkDefault true;

platforms/home-manager/modules/nmasur/profiles/work.nix

@@ -21,7 +21,7 @@ in
     ];
 
     home.packages = [
-      pkgs.visidata # CSV inspector
+      pkgs.stable.visidata # CSV inspector
       pkgs.dos2unix # Convert Windows text files
       pkgs.inetutils # Includes telnet
       pkgs.gnupg # Encryption
@@ -49,6 +49,7 @@ in
         aws-ssh.enable = lib.mkDefault true;
         bash.enable = lib.mkDefault true;
         bat.enable = lib.mkDefault true;
+        cargo.enable = lib.mkDefault true;
         direnv.enable = lib.mkDefault true;
         dotfiles.enable = lib.mkDefault true;
         fd.enable = lib.mkDefault true;

platforms/nixos/modules/nmasur/presets/services/kanata.nix

@@ -29,7 +29,7 @@ in
               caps
           )
           (defalias
-              escctrl (tap-hold-press 1000 1000 esc lctrl)
+              escctrl (tap-hold-press 200 200 esc lctrl)
           )
           (deflayer base
               @escctrl

platforms/nixos/modules/nmasur/presets/services/mealie.nix

@@ -0,0 +1,40 @@
+{ config, lib, ... }:
+
+let
+  inherit (config.nmasur.settings) hostnames;
+  cfg = config.nmasur.presets.services.mealie;
+in
+
+{
+
+  options.nmasur.presets.services.mealie.enable = lib.mkEnableOption "mealie recipe manager";
+  config = lib.mkIf cfg.enable {
+
+    services.mealie = {
+      enable = true;
+      port = 9099;
+      database.createLocally = true;
+      listenAddress = "127.0.0.1";
+    };
+
+    nmasur.presets.services.caddy.routes = [
+      {
+        match = [ { host = [ hostnames.recipes ]; } ];
+        handle = [
+          {
+            handler = "reverse_proxy";
+            upstreams = [ { dial = "localhost:${builtins.toString config.services.mealie.port}"; } ];
+          }
+        ];
+      }
+    ];
+
+    # Configure Cloudflare DNS to point to this machine
+    services.cloudflare-dyndns.domains = [ hostnames.recipes ];
+
+    # Point localhost to the local domain
+    networking.hosts."127.0.0.1" = [ hostnames.recipes ];
+
+  };
+
+}

platforms/nixos/modules/nmasur/presets/services/n8n.nix

@@ -2,7 +2,6 @@
 # together with triggers.
 
 { config, lib, ... }:
-
 let
   inherit (config.nmasur.settings) hostnames;
   cfg = config.nmasur.presets.services.n8n;
@@ -18,18 +17,13 @@ in
 
     services.n8n = {
       enable = true;
-      webhookUrl = "https://${hostnames.n8n}";
-      settings = {
-        listen_address = "127.0.0.1";
-        port = 5678;
-
+      environment = {
+        N8N_LISTEN_ADDRESS = "127.0.0.1";
+        N8N_PORT = 5678;
+        N8N_EDITOR_BASE_URL = "https://${hostnames.n8n}";
       };
     };
 
-    systemd.services.n8n.environment = {
-      N8N_EDITOR_BASE_URL = config.services.n8n.webhookUrl;
-    };
-
     # Configure Cloudflare DNS to point to this machine
     services.cloudflare-dyndns.domains = [ hostnames.n8n ];
 
@@ -40,7 +34,9 @@ in
         handle = [
           {
             handler = "reverse_proxy";
-            upstreams = [ { dial = "localhost:${builtins.toString config.services.n8n.settings.port}"; } ];
+            upstreams = [
+              { dial = "localhost:${builtins.toString config.services.n8n.environment.N8N_PORT}"; }
+            ];
           }
         ];
       }

platforms/nixos/modules/nmasur/profiles/communications.nix

@@ -30,9 +30,10 @@ in
         karakeep.enable = lib.mkDefault true;
         litestream.enable = lib.mkDefault true;
         mathesar.enable = lib.mkDefault true;
-        minecraft-server.enable = lib.mkDefault true;
+        mealie.enable = lib.mkDefault true;
+        minecraft-server.enable = lib.mkDefault false;
         n8n.enable = lib.mkDefault true;
-        nix-autoupgrade.enable = lib.mkDefault false; # On by default for communications
+        nix-autoupgrade.enable = lib.mkDefault true; # On by default for communications
         ntfy-sh.enable = lib.mkDefault true;
         pgweb.enable = lib.mkDefault true;
         postgresql.enable = lib.mkDefault true;