add actualtap for working with actual api

i don't like having to build them

docs/CHANGELOG.md

@@ -0,0 +1,16 @@
+# Changelog
+
+## 2026-07-25
+
+- Added jjui config generation to `jujutsu.nix` in Home Manager to include custom GitHub ruleset bypass commands (`ctrl+b` and `ctrl+shift+b`).
+- Added `overlays/cheetah3.nix` to disable `pythonMetadataCheckPhase` for `cheetah3`. 
+  This fixes an issue where the NixOS rebuild fails for `sabnzbd` due to `importlib.metadata.PackageNotFoundError: No package metadata was found for cheetah3` during the Python package evaluation in `nixos-unstable`.
+
+## 2026-07-20
+
+- Added `overlays/paho-mqtt.nix` to disable paho-mqtt's flaky, socket-based
+  test suite. Its `checkPhase` hangs in the Nix sandbox and times out with a
+  `KeyboardInterrupt` after ~150s, which was breaking the `flame` rebuild
+  (paho-mqtt is pulled in transitively, e.g. via mealie). The override is
+  applied through `pythonPackagesExtensions` so it covers every Python
+  package set.

flake.lock

@@ -28,11 +28,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1784123936,
+        "lastModified": 1784500460,
-        "narHash": "sha256-IOWwQMJhUxcojm0MRvuKs1fKLH727u4+hHeEOPhdUyA=",
+        "narHash": "sha256-UvORnAxTRHax7RG74W8Z2t4GvIkX6AjJ5kk0QlwZomo=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "a4cf1d10853b0d2be19b9eca35d749e201d70b55",
+        "rev": "57a3171f94705599a2499248ca5758d5eb47c0e0",
         "type": "github"
       },
       "original": {
@@ -80,6 +80,22 @@
       }
     },
     "flake-compat_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1767039857,
+        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
+        "owner": "NixOS",
+        "repo": "flake-compat",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_3": {
       "flake": false,
       "locked": {
         "lastModified": 1767039857,
@@ -179,11 +195,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1784351324,
+        "lastModified": 1784913159,
-        "narHash": "sha256-By+kuRJZRqs2TuXgtR8vJ8cTKWXw33YG/Yollu5cO1U=",
+        "narHash": "sha256-JWq0BfjO4ktpH5USfQNQzdvHpIDT8fSKD5K7LvdMRFs=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "460108009ca1ff69ca2ff19079ca2c838d6e3080",
+        "rev": "079a3b5d1aa6a719920a51316253b7d6dd22738d",
         "type": "github"
       },
       "original": {
@@ -216,6 +232,46 @@
         "type": "github"
       }
     },
+    "nix-caddy-withplugins": {
+      "inputs": {
+        "flake-compat": "flake-compat_2",
+        "nixpkgs": "nixpkgs_5"
+      },
+      "locked": {
+        "lastModified": 1784936738,
+        "narHash": "sha256-X4w9BrFkisfzla3m1WwDJUicUbI7JRdhzq5aS7rrB0k=",
+        "owner": "MichailiK",
+        "repo": "nix-caddy-withplugins",
+        "rev": "70307cfc568e5434cf42067d797b27c38ea69944",
+        "type": "github"
+      },
+      "original": {
+        "owner": "MichailiK",
+        "ref": "nixos-unstable",
+        "repo": "nix-caddy-withplugins",
+        "type": "github"
+      }
+    },
+    "nix-index-database": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1785046085,
+        "narHash": "sha256-UiK+mmZJuLWQVhJ5b2wDzogIYWAesyRm6LA3h3Ulh3Y=",
+        "owner": "nix-community",
+        "repo": "nix-index-database",
+        "rev": "11665045df8b9938ef811a3bfdc65cffb02b4b70",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nix-index-database",
+        "type": "github"
+      }
+    },
     "nix2vim": {
       "inputs": {
         "flake-utils": "flake-utils_2",
@@ -306,11 +362,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1784280462,
+        "lastModified": 1784707089,
-        "narHash": "sha256-DtoqIqM7VkR6NxAkcLpMwmi02USwWb3JdmNGLyhthc0=",
+        "narHash": "sha256-2V/6imsUgB7mPZlHY54oeVBRDoZbPKnvzwkAHUSSufk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "293d6abedf0478e681a4dfcfcb35b30fc796a32f",
+        "rev": "b3fe9581c9061c749abef42b6d4ee7b7c05c33fa",
         "type": "github"
       },
       "original": {
@@ -370,11 +426,27 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1784120854,
+        "lastModified": 1781074563,
-        "narHash": "sha256-KesHgItiZPgGX740axSiQLcIQ8D24MDqNpkKYWIek8k=",
+        "narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_6": {
+      "locked": {
+        "lastModified": 1784796856,
+        "narHash": "sha256-wWFrV5/Qbm+lyt5x20E/bSbfJiGKMo4RCxZV8cl/WZI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "753cc8a3a87467296ddd1fa93f0cc3e81120ee46",
+        "rev": "e2587caef70cea85dd97d7daab492899902dbf5d",
         "type": "github"
       },
       "original": {
@@ -384,7 +456,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_6": {
+    "nixpkgs_7": {
       "locked": {
         "lastModified": 1744536153,
         "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
@@ -408,11 +480,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1784353280,
+        "lastModified": 1784959021,
-        "narHash": "sha256-MV8bFWGuoJCELexhGWWhv0GiWnDY9hpgGXgxB81mr9g=",
+        "narHash": "sha256-Atc5ydxAmAAD5o8e6F8VVxVCOQb82bqi5TRNRUSBvZU=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "697f13fd230047493989b03576419792273c3a9e",
+        "rev": "1166a294990afd245fd72b8d2896075222408399",
         "type": "github"
       },
       "original": {
@@ -427,9 +499,11 @@
         "disko": "disko",
         "home-manager": "home-manager",
         "mac-app-util": "mac-app-util",
+        "nix-caddy-withplugins": "nix-caddy-withplugins",
+        "nix-index-database": "nix-index-database",
         "nix2vim": "nix2vim",
         "nixos-generators": "nixos-generators",
-        "nixpkgs": "nixpkgs_5",
+        "nixpkgs": "nixpkgs_6",
         "nixpkgs-stable": "nixpkgs-stable",
         "nur": "nur",
         "rust-overlay": "rust-overlay",
@@ -440,14 +514,14 @@
     },
     "rust-overlay": {
       "inputs": {
-        "nixpkgs": "nixpkgs_6"
+        "nixpkgs": "nixpkgs_7"
       },
       "locked": {
-        "lastModified": 1784350408,
+        "lastModified": 1784956772,
-        "narHash": "sha256-OstzLWL5t7Xe14xEC6GIMJCp0PrYNTSA0El7GG2av88=",
+        "narHash": "sha256-5polVWDhgATIQj+RUV2ZlOd5nE6cGJo+C4tOEs5vp6U=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "3c38e1e1ba9c8d7030f7b5a801398ea7d8a6fdc0",
+        "rev": "a163bd01a6e11ac58d4f8d11669da550b5afbbc6",
         "type": "github"
       },
       "original": {
@@ -554,17 +628,17 @@
     },
     "wsl": {
       "inputs": {
-        "flake-compat": "flake-compat_2",
+        "flake-compat": "flake-compat_3",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1784058842,
+        "lastModified": 1784642409,
-        "narHash": "sha256-3u3tvbCIAid3Mv7RrJx13jusIEQC/HeKYhO/SUSxR3A=",
+        "narHash": "sha256-hcbDqFuySAJawljt5r0sKBCJKYnbtGD0T/ZIozH1Dq0=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "24c8dc8e0f2170e1a377be24dfadc7d9d21dc1ad",
+        "rev": "eaeb18da90024448a60eb1ec7132eafa4003404e",
         "type": "github"
       },
       "original": {

flake.nix

@@ -40,6 +40,12 @@
       # inputs.nixpkgs.follows = "nixpkgs"; # Use system packages list for their inputs
     };
 
+    # Caddy with decoupled plugin hashes
+    nix-caddy-withplugins = {
+      url = "github:MichailiK/nix-caddy-withplugins/nixos-unstable";
+      # Important: Do not follow nixpkgs here, per the README
+    };
+
     # Manage disk format and partitioning
     disko = {
       url = "github:nix-community/disko";
@@ -52,6 +58,11 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    nix-index-database = {
+      url = "github:nix-community/nix-index-database";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     # Convert Nix to Neovim config
     nix2vim = {
       url = "github:gytis-ivaskevicius/nix2vim";

hosts/aarch64-darwin/lookingglass/default.nix

@@ -27,6 +27,7 @@ rec {
       common.enable = true;
       darwin-base.enable = true;
       darwin-gaming.enable = true;
+      llm-development.enable = true;
       power-user.enable = true;
       work.enable = true;
       experimental.enable = true;

hosts/aarch64-linux/flame/default.nix

@@ -28,6 +28,7 @@ rec {
     nmasur.profiles = {
       common.enable = true;
       linux-base.enable = true;
+      llm-development.enable = true;
       power-user.enable = true;
     };
     nmasur.presets.programs.helix.enable = true;

hosts/x86_64-linux/swan/default.nix

@@ -26,6 +26,7 @@ rec {
     nmasur.profiles = {
       common.enable = true;
       linux-base.enable = true;
+      llm-development.enable = true;
       power-user.enable = true;
     };
     home.stateVersion = "23.05";

hosts/x86_64-linux/tempest/default.nix

@@ -30,6 +30,7 @@ rec {
       linux-base.enable = true;
       linux-gui.enable = true;
       linux-gaming.enable = true;
+      llm-development.enable = true;
       power-user.enable = true;
       developer.enable = true;
       experimental.enable = true;
@@ -51,7 +52,7 @@ rec {
 
   # Graphics and VMs
   boot.initrd.kernelModules = [ "amdgpu" ];
-  boot.kernelModules = [ "kvm-amd" ];
+  boot.kernelModules = [ "kvm-amd" "it87" ];
   services.xserver.videoDrivers = [ "amdgpu" ];
 
   # Required binary blobs to boot on this machine
@@ -68,16 +69,16 @@ rec {
   hardware.fancontrol.config = ''
     # Configuration file generated by pwmconfig, changes will be lost
     INTERVAL=10
-    DEVPATH=hwmon0=devices/pci0000:00/0000:00:03.1/0000:06:00.0/0000:07:00.0/0000:08:00.0
+    DEVPATH=hwmon1=devices/pci0000:00/0000:00:03.1/0000:06:00.0/0000:07:00.0/0000:08:00.0
-    DEVNAME=hwmon0=amdgpu
+    DEVNAME=hwmon1=amdgpu
-    FCTEMPS=hwmon0/pwm1=hwmon0/temp1_input
+    FCTEMPS=hwmon1/pwm1=hwmon1/temp1_input
-    FCFANS= hwmon0/pwm1=hwmon0/fan1_input
+    FCFANS= hwmon1/pwm1=hwmon1/fan1_input
-    MINTEMP=hwmon0/pwm1=50
+    MINTEMP=hwmon1/pwm1=50
-    MAXTEMP=hwmon0/pwm1=70
+    MAXTEMP=hwmon1/pwm1=70
-    MINSTART=hwmon0/pwm1=100
+    MINSTART=hwmon1/pwm1=100
-    MINSTOP=hwmon0/pwm1=10
+    MINSTOP=hwmon1/pwm1=10
-    MINPWM=hwmon0/pwm1=10
+    MINPWM=hwmon1/pwm1=10
-    MAXPWM=hwmon0/pwm1=240
+    MAXPWM=hwmon1/pwm1=240
   '';
 
   # File systems must be declared in order to boot

lib/default.nix

@@ -154,10 +154,12 @@ lib
       pkgs = pkgsBySystem.${system};
       modules = [
         inputs.home-manager.nixosModules.home-manager
+        inputs.nix-index-database.nixosModules.default
         inputs.disko.nixosModules.disko
         inputs.wsl.nixosModules.wsl
         { imports = (nixFiles ../platforms/nixos); }
         module
+        # (builtins.removeAttrs module [ "home-manager" ])
         {
           home-manager = {
             extraSpecialArgs = {
@@ -180,21 +182,21 @@ lib
       inherit system specialArgs;
       modules = [
         inputs.home-manager.darwinModules.home-manager
+        inputs.nix-index-database.darwinModules.nix-index
         inputs.mac-app-util.darwinModules.default
         {
           imports = (nixFiles ../platforms/nix-darwin);
           nixpkgs.pkgs = pkgsBySystem.${system};
         }
-        module
+        # Home Manager is intentionally NOT activated here. It is managed
-        {
+        # standalone via `nh home switch` (see homeConfigurations, extracted
-          home-manager = {
+        # from the host module's `home-manager.users`). Strip that attr so
-            extraSpecialArgs = {
+        # darwin-rebuild doesn't also activate a second, divergent HM
-              inherit colorscheme;
+        # generation with different store paths (useUserPackages puts packages
-            }
+        # in /etc/profiles/per-user vs. ~/.nix-profile standalone) -- that
-            // specialArgs;
+        # mismatch broke the prompt after every darwin-rebuild until the next
-          }
+        # `nh home switch`.
-          // homeModule.home-manager;
+        (builtins.removeAttrs module [ "home-manager" ])
-        }
       ];
     };
 
@@ -225,6 +227,7 @@ lib
       pkgs = pkgsBySystem.${system};
       modules = [
         inputs.home-manager.nixosModules.home-manager
+        inputs.nix-index-database.homeModules.default
         inputs.disko.nixosModules.disko
         inputs.wsl.nixosModules.wsl
         {

overlays/cheetah3.nix

@@ -0,0 +1,9 @@
+_inputs: _final: prev: {
+  pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
+    (_pyfinal: pyprev: {
+      cheetah3 = pyprev.cheetah3.overridePythonAttrs (_old: {
+        dontCheckPythonMetadata = true;
+      });
+    })
+  ];
+}

overlays/nix-caddy-withplugins.nix

@@ -0,0 +1 @@
+inputs: inputs.nix-caddy-withplugins.overlays.default

overlays/paho-mqtt.nix

@@ -0,0 +1,20 @@
+# Disable paho-mqtt's flaky test suite.
+#
+# paho-mqtt's checkPhase runs socket-based integration tests that hang in
+# the Nix sandbox (they eventually time out with a KeyboardInterrupt after
+# ~150s, reporting errors and failing the build). This breaks the flame
+# rebuild, where paho-mqtt is pulled in transitively (e.g. via mealie).
+#
+# Applied through pythonPackagesExtensions so it covers every Python
+# package set (python3Packages, python314Packages, ...).
+
+_inputs: _final: prev: {
+  pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
+    (_pyfinal: pyprev: {
+      paho-mqtt = pyprev.paho-mqtt.overridePythonAttrs (_old: {
+        doCheck = false;
+        doInstallCheck = false;
+      });
+    })
+  ];
+}

pkgs/actualtap/package.nix

@@ -0,0 +1,43 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  nodejs,
+}:
+
+buildNpmPackage rec {
+  pname = "actualtap";
+  version = "1.0.34";
+
+  src = fetchFromGitHub {
+    owner = "MattFaz";
+    repo = "actualtap";
+    rev = "v${version}";
+    hash = "sha256-I2yb3WCOXYx/6RXiKjePlpChrr9G1il44OdON/SeVCw=";
+  };
+
+  npmDepsHash = "sha256-LlTLwUt0Yja4NSBLbaYPV/keawSJKffno/28rtSj/oQ=";
+
+  dontNpmBuild = true;
+
+  postPatch = ''
+    substituteInPlace src/server.js \
+      --replace-fail 'port: 3001' 'port: process.env.PORT || 3001'
+  '';
+
+  postInstall = ''
+    mkdir -p $out/bin
+    cat <<EOF > $out/bin/actualtap
+    #!/bin/sh
+    exec ${lib.getExe nodejs} $out/lib/node_modules/actualtap/src/server.js "\$@"
+    EOF
+    chmod +x $out/bin/actualtap
+  '';
+
+  meta = with lib; {
+    description = "Automatically create transactions in Actual Budget when you use Tap-to-Pay on a mobile device";
+    homepage = "https://github.com/MattFaz/actualtap";
+    license = licenses.gpl3Only;
+    maintainers = [ ];
+  };
+}

pkgs/caddy/package.nix

@@ -2,21 +2,10 @@
 
 {
   pkgs,
-  fetchFromGitHub,
   ...
 }:
 
-# Maintain a static version so that the plugin hash doesn't keep breaking
+pkgs.caddy.withPlugins {
-(pkgs.caddy.overrideAttrs rec {
-  version = "2.10.2";
-  src = fetchFromGitHub {
-    owner = "caddyserver";
-    repo = "caddy";
-    tag = "v${version}";
-    hash = "sha256-KvikafRYPFZ0xCXqDdji1rxlkThEDEOHycK8GP5e8vk=";
-  };
-}).withPlugins
-  {
   plugins = [ "github.com/caddy-dns/cloudflare@v0.2.1" ];
-    hash = "sha256-xz43pXTsnYmXZDAAUT+vTapoq3O/8br7igGwqZbjFdk=";
+  hash = "sha256-HuVBmiT3kD6RrDejQ6SnjCN8f7pFdZlGtZFbEf47bks=";
-  }
+}

pkgs/mathesar/package.nix

@@ -89,6 +89,13 @@ let
         drf-access-policy
         # psycopg-binary
         ;
+      # clevercsv's test_encoding_chardet is nondeterministic (chardet
+      # returns None instead of ISO-8859-1/KOI8-R on some platforms),
+      # breaking the build. Skip its test suite.
+      clevercsv = pyprev.clevercsv.overridePythonAttrs (_old: {
+        doCheck = false;
+        doInstallCheck = false;
+      });
     };
   };
 

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

@@ -18,16 +18,16 @@ in
       ca = "cargo";
     };
 
-    home.packages = with pkgs; [
+    home.packages = [
-      gcc
+      pkgs.gcc
-      rustc
+      pkgs.rustc
-      cargo
+      pkgs.cargo
-      cargo-watch
+      pkgs.stable.cargo-watch
-      clippy
+      pkgs.clippy
-      rustfmt
+      pkgs.rustfmt
-      pkg-config
+      pkgs.pkg-config
-      openssl
+      pkgs.openssl
-      rust-analyzer
+      pkgs.rust-analyzer
     ];
   };
 }

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

@@ -27,6 +27,7 @@ in
       cask "notunes" # Don't launch Apple Music with the play button
       cask "topnotch" # Darkens the menu bar to complete black
       cask "ghostty" # Terminal application (not buildable on Nix on macOS)
+      cask "discord" # nixpkgs bundle breaks its notarization seal on macOS 26+
 
       # Mac App Store apps (requires 'mas' CLI, optional)
       # mas "Tailscale", id: 1475387142

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

@@ -7,6 +7,7 @@
 
 let
   cfg = config.nmasur.presets.programs.jujutsu;
+  tomlFormat = pkgs.formats.toml { };
 in
 
 {
@@ -31,6 +32,31 @@ in
       };
     };
 
+    xdg.configFile."jjui/config.toml".source = tomlFormat.generate "jjui-config" {
+      actions = [
+        {
+          name = "set-github-bypass";
+          lua = ''
+            exec_shell([[gh api --method PATCH -H "Accept: application/vnd.github+json" /repos/$(gh repo view --json nameWithOwner -q .nameWithOwner)/properties/values -f 'properties[][property_name]=Allow-Ruleset-Bypass' -f 'properties[][value]=true']])
+            flash("Set GitHub rule bypass")
+          '';
+          key = "ctrl+b";
+          scope = "revisions";
+          desc = "Set GitHub rule bypass";
+        }
+        {
+          name = "remove-github-bypass";
+          lua = ''
+            exec_shell([[gh api --method PATCH -H "Accept: application/vnd.github+json" /repos/$(gh repo view --json nameWithOwner -q .nameWithOwner)/properties/values -f 'properties[][property_name]=Allow-Ruleset-Bypass' -f 'properties[][value]=']])
+            flash("Removed GitHub rule bypass")
+          '';
+          key = "ctrl+shift+b";
+          scope = "revisions";
+          desc = "Remove GitHub rule bypass";
+        }
+      ];
+    };
+
     home.packages = [
       # Required for the fsmonitor to auto-snapshot
       pkgs.stable.watchman

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

@@ -1,6 +1,6 @@
 {
   config,
-  pkgs,
+  # pkgs,
   lib,
   ...
 }:
@@ -23,17 +23,18 @@ in
     };
 
     # Create nix-index if doesn't exist
-    home.activation.createNixIndex =
+    # Should not be necessary with the nix-index-database flake
-      let
+    # home.activation.createNixIndex =
-        cacheDir = "${config.xdg.cacheHome}/nix-index";
+    #   let
-      in
+    #     cacheDir = "${config.xdg.cacheHome}/nix-index";
-      lib.mkIf config.programs.nix-index.enable (
+    #   in
-        config.lib.dag.entryAfter [ "writeBoundary" ] ''
+    #   lib.mkIf config.programs.nix-index.enable (
-          if [ ! -d ${cacheDir} ]; then
+    #     config.lib.dag.entryAfter [ "writeBoundary" ] ''
-              run ${pkgs.nix-index}/bin/nix-index -f ${pkgs.path}
+    #       if [ ! -d ${cacheDir} ]; then
-          fi
+    #           run ${pkgs.nix-index}/bin/nix-index -f ${pkgs.path}
-        ''
+    #       fi
-      );
+    #     ''
+    #   );
 
   };
 

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

@@ -15,10 +15,21 @@ in
 
   config = lib.mkIf (cfg.enable && (pkgs.stdenv.isDarwin || config.services.dunst.enable)) {
     home.packages = [ pkgs.noti ];
-    programs.fish.shellAbbrs = {
+    programs.fish = {
+      shellAbbrs = {
         # Add noti for ghpr in Darwin
         ghpr = lib.mkForce "gh pr create && sleep 3 && noti gh run watch";
         grw = lib.mkForce "noti gh run watch";
       };
+      functions = {
+        gh-run = {
+          body =
+            lib.mkForce # fish
+              ''
+                ${lib.getExe pkgs.zellij} action new-pane --start-suspended -- noti gh run watch
+              '';
+        };
+      };
+    };
   };
 }

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

@@ -109,6 +109,10 @@ in
 
       settings = {
         default_mode = "locked";
+        # Spawn fish directly instead of trusting $SHELL, which inherits the
+        # macOS login shell. On darwin that login shell is no longer managed by
+        # nix-darwin, so $SHELL can point at a stale /run/current-system path.
+        default_shell = lib.getExe pkgs.fish;
         # default_layout = "compact-top";
         # Remove border
         pane_frames = false;

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

@@ -48,17 +48,23 @@ in
         tilesize = 44;
 
         persistent-apps = map mkDockApp [
-          "${pkgs._1password-gui}/Applications/1Password.app"
+          "/Applications/1Password.app"
+          "${pkgs.thunderbird}/Applications/Thunderbird.app"
           "${pkgs.slack}/Applications/Slack.app"
+          "/System/Applications/Reminders.app"
           "/System/Applications/Calendar.app"
+          "/Applications/Claude.app"
           "${pkgs.firefox-unwrapped}/Applications/Firefox.app"
           "/System/Applications/Messages.app"
+          "/System/Applications/Preview.app"
           "/System/Applications/Mail.app"
           "/Applications/zoom.us.app"
           "${config.programs.ghostty.package}/Applications/Ghostty.app"
-          "${pkgs.discord}/Applications/Discord.app"
+          # Discord comes from Homebrew on macOS: the nixpkgs bundle is
+          # modified in place, breaking its notarization seal, so macOS 26+
+          # refuses to launch it ("damaged"). See presets/programs/homebrew.nix.
+          "/Applications/Discord.app"
           "${pkgs.obsidian}/Applications/Obsidian.app"
-          "${pkgs.thunderbird}/Applications/Thunderbird.app"
         ];
       };
     };

platforms/home-manager/modules/nmasur/presets/services/hammerspoon/default.nix

@@ -33,7 +33,7 @@ in
     xdg.configFile."hammerspoon/Spoons/Launcher.spoon/init.lua".source =
       pkgs.replaceVars ./Spoons/Launcher.spoon/init.lua
         {
-          discord = "${pkgs.discord}/Applications/Discord.app";
+          discord = "Discord.app";
           firefox = "${pkgs.firefox-unwrapped}/Applications/Firefox.app";
           ghostty = "${pkgs.ghostty-bin}/Applications/Ghostty.app";
           obsidian = "${pkgs.obsidian}/Applications/Obsidian.app";

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

@@ -21,6 +21,9 @@ in
 
     home.packages = [
 
+      pkgs.nmasur.ren-find # Rename files
+      pkgs.nmasur.rep-grep # Replace text in files
+
       # Charm tools
 
       pkgs.glow # Markdown previews

platforms/home-manager/modules/nmasur/profiles/llm-development.nix

@@ -0,0 +1,26 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  cfg = config.nmasur.profiles.llm-development;
+in
+
+{
+
+  options.nmasur.profiles.llm-development.enable = lib.mkEnableOption "LLM coding tools";
+
+  config = lib.mkIf cfg.enable {
+
+    home.packages = [
+
+      pkgs.pi-coding-agent # AI LLM Agent
+
+    ];
+
+  };
+
+}

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

@@ -29,8 +29,6 @@ in
       pkgs.nixfmt # Format Nix code
       pkgs.nmasur.jqr # FZF fq JSON tool
       pkgs.nmasur.osc # Clipboard over SSH
-      pkgs.nmasur.ren-find # Rename files
-      pkgs.nmasur.rep-grep # Replace text in files
       pkgs.pandoc # Convert text documents
       pkgs.qrencode # Generate qr codes
       pkgs.spacer # Output lines in terminal

platforms/nix-darwin/modules/nmasur/presets/programs/_1password.nix

@@ -12,12 +12,9 @@ in
   options.nmasur.presets.programs._1password.enable = lib.mkEnableOption "1Password password manager";
 
   config = lib.mkIf cfg.enable {
-    allowUnfreePackages = [
+    # Unfree packages are already permitted via the shared nixpkgs instance
-      "1password"
+    # created in lib/default.nix (config.allowUnfree = true). Setting
-      "_1password-gui"
+    # nixpkgs.config here would conflict with nixpkgs.pkgs being set externally.
-      "1password-cli"
-    ];
-
     programs._1password.enable = true;
     programs._1password-gui = {
       enable = true;

platforms/nix-darwin/modules/nmasur/presets/services/dock.nix

@@ -50,7 +50,10 @@ in
         "/System/Applications/Mail.app"
         "/Applications/zoom.us.app"
         "/Applications/Ghostty.app"
-        "${pkgs.discord}/Applications/Discord.app"
+        # Discord comes from Homebrew on macOS: the nixpkgs bundle is modified
+        # in place, breaking its notarization seal, so macOS 26+ refuses to
+        # launch it ("damaged").
+        "/Applications/Discord.app"
         "${pkgs.obsidian}/Applications/Obsidian.app"
         "${pkgs.thunderbird}/Applications/Thunderbird.app"
       ];

platforms/nix-darwin/modules/nmasur/profiles/base.nix

@@ -19,7 +19,7 @@ in
     nmasur.presets = {
       programs = {
         _1password.enable = lib.mkDefault true;
-        # fish.enable = lib.mkDefault true;
+        fish.enable = lib.mkDefault true;
         # homebrew.enable = lib.mkDefault true;
       };
       services = {

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

@@ -109,8 +109,9 @@ in
     };
 
     # Allow web traffic to Caddy
-    nmasur.presets.services.caddy.routes = [
+    nmasur.presets.services.caddy.routes = lib.mkAfter [
       {
+        group = "actual";
         match = [ { host = [ hostnames.budget ]; } ];
         handle = [
           {

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

@@ -0,0 +1,122 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+
+let
+  inherit (config.nmasur.settings) hostnames;
+  cfg = config.nmasur.presets.services.actualtap;
+
+  actualtapConfigType = lib.types.submodule {
+    options = {
+      port = lib.mkOption {
+        type = lib.types.port;
+        description = "Port to use for the actualtap instance localhost";
+      };
+      path = lib.mkOption {
+        type = lib.types.str;
+        description = "Path prefix for this actualtap instance on the reverse proxy";
+      };
+      budgetIdFile = lib.mkOption {
+        type = lib.types.path;
+        description = "Path to the age encrypted file containing the budget ID";
+      };
+      apiKeyFile = lib.mkOption {
+        type = lib.types.path;
+        description = "Path to the age encrypted file containing the API key";
+      };
+    };
+  };
+
+in
+
+{
+  options.nmasur.presets.services.actualtap = {
+    enable = lib.mkEnableOption "ActualTap instances";
+    instances = lib.mkOption {
+      type = lib.types.attrsOf actualtapConfigType;
+      default = { };
+      description = "Attribute set of ActualTap instances.";
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+
+    users.users.actualtap = {
+      isSystemUser = true;
+      group = "shared";
+      uid = 981;
+    };
+
+    systemd.services = lib.mapAttrs' (
+      name: instance:
+      lib.nameValuePair "actualtap-${name}" {
+        enable = true;
+        description = "ActualTap - ${name}";
+        after = [
+          "network.target"
+          "actual.service"
+        ];
+        wantedBy = [ "multi-user.target" ];
+
+        environment = {
+          PORT = builtins.toString instance.port;
+          ACTUAL_URL = "http://127.0.0.1:${builtins.toString config.nmasur.presets.services.actualbudget.port}";
+        };
+
+        serviceConfig = {
+          User = config.users.users.actualtap.name;
+          Group = config.users.users.actualtap.group;
+          EnvironmentFile = [
+            config.secrets."actualbudget-password".dest
+            config.secrets."actualtap-${name}-budget-id".dest
+            config.secrets."actualtap-${name}-api-key".dest
+          ];
+          ExecStart = lib.getExe pkgs.nmasur.actualtap;
+          Restart = "on-failure";
+          WorkingDirectory = "/var/lib/actualtap-${name}";
+          StateDirectory = "actualtap-${name}";
+        };
+      }
+    ) cfg.instances;
+
+    secrets = lib.mkMerge (
+      lib.mapAttrsToList (name: instance: {
+        "actualtap-${name}-budget-id" = {
+          source = instance.budgetIdFile;
+          dest = "${config.secretsDirectory}/actualtap-${name}-budget-id";
+          owner = config.users.users.actualtap.name;
+          group = config.users.users.actualtap.group;
+        };
+        "actualtap-${name}-api-key" = {
+          source = instance.apiKeyFile;
+          dest = "${config.secretsDirectory}/actualtap-${name}-api-key";
+          owner = config.users.users.actualtap.name;
+          group = config.users.users.actualtap.group;
+        };
+      }) cfg.instances
+    );
+
+    nmasur.presets.services.caddy.routes = lib.mapAttrsToList (name: instance: {
+      group = "actual";
+      match = [
+        {
+          host = [ hostnames.budget ];
+          path = [ "${instance.path}*" ];
+        }
+      ];
+      handle = [
+        {
+          handler = "rewrite";
+          strip_path_prefix = instance.path;
+        }
+        {
+          handler = "reverse_proxy";
+          upstreams = [ { dial = "localhost:${builtins.toString instance.port}"; } ];
+        }
+      ];
+    }) cfg.instances;
+  };
+}

platforms/nixos/modules/nmasur/presets/services/actualtap/budget1-api-key.age

@@ -0,0 +1,17 @@
+-----BEGIN AGE ENCRYPTED FILE-----
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE1nSGFPdyBIUkxs
+RmFmNmo3L2MwVVhmeTdUVGdXOWRIVDd5c21EVnhtWWUwTVpWbW5zCnNSS1luUHNW
+YlIwbmVrbTJTUUdOQkpCbGpNQm1tYlRrbDhaWEhJUDRHaDQKLT4gc3NoLWVkMjU1
+MTkgWXlTVU1RIHJIYTd4eFo3aklGQ1Evb0JPOGZSWDh1Q1pXU3ExZ1pmR29qT2lP
+bFcwREkKTWFXMlZCeXpoMi92OXdtN3plekE2dFlCbk44YncxLzJYZzE2amNIVnEz
+QQotPiBzc2gtZWQyNTUxOSBuanZYNUEgWi8rNnV4VWtwUEEzbys4Skl1Z0p0Ly9r
+ZS82dzFJeEhHVHpSNU04WU5CVQpIMWhQcDdNeU45dVpkVyswQW1RK2Q0aXpkZXMz
+MXAraG9KUFBDUVdFcTRVCi0+IHNzaC1lZDI1NTE5IENxSU9VQSBUQWQvU0JwdTlX
+UkJYakdYTjU1YlBzWHEzY3FQa1dhMmp6UjE0RTJYN1ZBCmk0SWc0Ym1mUTdVL1NJ
+ZXJFVkNmckRaVnlkSmUxL0dSUlo5VER0b2x3WVUKLT4gc3NoLWVkMjU1MTkgejFP
+Y1p3IHBIQllKcmczOVJvSzRMZW9mVjZjTFo1ZjVJNDRvUG9pSnlRZDBUWEtoV2sK
+aGhPeUpkVEZ0QWxDM1VJZzlDWEZ2VnFuTFRCVDkzY2JLVWNQTUE2STMyRQotLS0g
+cXhWR2lQWnkxOUZhRzhOTS96UDJWVmZEQVpZTkF1MmlpNCtEbDZzRGZaYwof4Y/t
+N5osO/bY+ojbarYoCBq12NSaKKlL6MNy1OQZOuOF0IP1CZ0fLY+R9DgJcNol3I73
+q4JyXbfohWtG/2NdIwhRXumQ/OnY1maVvg==
+-----END AGE ENCRYPTED FILE-----

platforms/nixos/modules/nmasur/presets/services/actualtap/budget1-id.age

@@ -0,0 +1,17 @@
+-----BEGIN AGE ENCRYPTED FILE-----
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE1nSGFPdyAyRTF0
+L3Y3ZVJ0YlJSbzR6cnNWeVNRd2czNUVKWmtQNFA3VFRlb053d1dRCmxmTGRGSFhL
+UmlSdUVQNzVPcktIdE0yVWFhVGpGYVRPMEpNQll6Z0owNFEKLT4gc3NoLWVkMjU1
+MTkgWXlTVU1RIHE5L09YNWFaT0JLT0o0YjdQY01GRDByeFVXeE9LMXNFNGFCWkFO
+ZStBd28KamhUYzd1VXhlL3RqY3hlMG5UeGFJemY2ajRhVGZ2ZDJNb1hSRHkrUFNt
+NAotPiBzc2gtZWQyNTUxOSBuanZYNUEgbDdMVzNTT1Y2VmVsZyt2WTh0RWdUVEpY
+c0RoRWE2S2ZyZXFuTllFU1FVWQpmeDF0MEp2NEYxS2k1ZlJaTVNWMWdRRlJ1UWh2
+Wm0xbHhGYXhoWGtDbVkwCi0+IHNzaC1lZDI1NTE5IENxSU9VQSBJeERSTUpPbzhu
+NGQrZXRoWGJEalBlMHdQUmlsVkF2TEZBOStOZ3ExN2lzClRZeE5yZG1uY3ZRRDNy
+am5uTjRiTnpLSkhURWZTNzgyVVdOVDA2WlpqZmsKLT4gc3NoLWVkMjU1MTkgejFP
+Y1p3IGticUNqWDJ0RTJTZmdXdzVWM0xsejBvYUJ3MXZvNWw1OWE3aUJMTCtSQ2MK
+KzMyZW5jZUNIV1puVFlLMEdyeUdoUUt3MjlzTUgvWlFob0QwME9ZZ1VVNAotLS0g
+VU5nOFA0Nzd3ckhnRHdSNkVSNG9tZks5VmVoZnlmU1R6bzl4ZVdMcGlLTQqZWLkP
+VdZPvgCJ8A9UcKWl+5f8Jjlc79d6ib8wwfMRl0zK4SNQJGgcXr6sFuieY3H4DzRb
+MuqKZQBBIKtPAmrvmzcKgNSeiJoZjG801Jqd3lpkJEA=
+-----END AGE ENCRYPTED FILE-----

platforms/nixos/modules/nmasur/presets/services/actualtap/budget2-api-key.age

@@ -0,0 +1,17 @@
+-----BEGIN AGE ENCRYPTED FILE-----
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE1nSGFPdyBSR2tx
+b2FyZ2t0d2xONGIvYjJrcVU1VTNHT3RVbjlWT1IyUW1CM1BkNVNzCmJmNFFFbUR6
+WG9ncmhuakFzVHhSVEtZUlR4dWg3cWRzUXc2ZmVpZ3NqZ1EKLT4gc3NoLWVkMjU1
+MTkgWXlTVU1RIGFFRmFsVjdkTkFZY29XdWo4akVDaEZHMTdXRDY4N2U5WE13a1JD
+QWdXMkUKbnVXazZpSzZqTHJqamFUdDJMMUpiTEhLeTJqcVNmV2dncjVvZlNNT09M
+WQotPiBzc2gtZWQyNTUxOSBuanZYNUEgTzV0eGpSU2plaTFCTXZTbFB2R1VOQnFn
+d01EUXcza3JuR3RFUzE3N2MzawpqT0ZRQ1hPTFcvZ2ZOQjNGcThYL1lSdURXbWlv
+NkRSRERJQ1IvSHdMa2M4Ci0+IHNzaC1lZDI1NTE5IENxSU9VQSBvQjZkYVJjYy9H
+L3BSVWRPczlOOGV2RkRBSGlIakF1cG1yQk9tbXNWdWlZCnZGaGxvdkZVWXp2THhK
+RnRBQ2VSNkErU0VnOWlYbkY2U1JCZTlBSFFUK0UKLT4gc3NoLWVkMjU1MTkgejFP
+Y1p3IFQrdUtDdENRK2dnN2t3dVBsN0oxYkNRSm43aDREa3ZJQjhvTWpxM0FWVEkK
+OTNCVFRTclFFckFkQXBzWnBybWxKRm92TEFqRU5ZWkprdytJQm5RT2tOYwotLS0g
+Nk5WZXhZM0VXaHpVK2EzeGFqNS9hZUlLQjlJRU9EMnVLL3VRV3RKTkVRcwpA8GqA
+24oLFT1VIE5eNl/Ltd102W4J6jafmiizCEu3/7EULI/X5oh2LvjSjOuivW6y+Gbu
+rXITu245mDM6ZqE2LikYR6134QSC2lmNvw==
+-----END AGE ENCRYPTED FILE-----

platforms/nixos/modules/nmasur/presets/services/actualtap/budget2-id.age

@@ -0,0 +1,17 @@
+-----BEGIN AGE ENCRYPTED FILE-----
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE1nSGFPdyAyakVC
+ZGZqMitTVVc0KzJSV0c3V3Ryc2JSWXp0V2I4YURmektyVGh5a2hBCjlCaGQ4SmxQ
+VzhBRWw4SW9QamdVZDVvK3laVkNuWTRhMW1hR1ZmS1lqOWsKLT4gc3NoLWVkMjU1
+MTkgWXlTVU1RIE5oVVdMWHZlSEJ2akc1UVcrdnNNOWgzaGFhb2VWNlNxQU5yQzM0
+dGk3eGsKaE1Ba3BneC9yQTBpcXo3YWhqcDZheUJnbE5vS0Z0WUNzYnQ1a2o5OVN4
+YwotPiBzc2gtZWQyNTUxOSBuanZYNUEgcitOTmNKS04xc01LNTZKbE9QblVKRUVr
+ZHdyY0Q2VWtUQ1VOQnFZTjNpbwp0RmNTV2RwR2RlcG5odE81VEFxNGhJOVFYd3Zk
+TU9IanIzMFkxVU1GUlQwCi0+IHNzaC1lZDI1NTE5IENxSU9VQSBmRC92WjRkTVFz
+eGlFa1VhcEk1NVpkVnFVVkpZRTdzMGR1aWNuWW9ZTFFVCkFRaVM5a1hjcjV3dU1m
+WHNnSWhSN1l4ZVEwUkhXZVg3UFRZQStSVllFcEEKLT4gc3NoLWVkMjU1MTkgejFP
+Y1p3IFUreGtraXo5aXM2OTFKcjZkL2p0ZEVwaEFXL3B5R2M1Q1J2elZYVityRUkK
+bk80bnp1UzgzdmFqV0RJaVFhaytPWnJpQ0Y4Wmg1M2xLbGJyUzZzazlMUQotLS0g
+dlZiRzZVSkYwbEVDaEVzZUhoRUkwMUpTM3pyOWJBaHUzZG8vejdmVklBYwpirejN
+5cR1roLwVsunUkn+gnaMCYk+tDlaZABGXAC94k9RQVF06KquxeK0S17KOeQNn9Gb
+N70JDklLLfuDsWbry6rIDYqsiEmTKi0WXhn44E1PaXQ=
+-----END AGE ENCRYPTED FILE-----

platforms/nixos/modules/nmasur/presets/services/calibre-web.nix

@@ -32,15 +32,11 @@ in
         reverseProxyAuth.enable = false;
         enableBookConversion = true;
         enableBookUploading = true;
+        # Point this directly to the folder containing your 'metadata.db' file
         calibreLibrary = libraryPath;
       };
     };
 
-    # metadata.db lives in /var/lib/calibre-web-db and is symlinked into the
-    # library dir; ProtectSystem=strict in the upstream module blocks writes
-    # through symlinks unless the real target path is also listed.
-    systemd.services.calibre-web.serviceConfig.ReadWritePaths = [ "/var/lib/calibre-web-db" ];
-
     # Allow web traffic to Caddy
     nmasur.presets.services.caddy.routes = [
       {
@@ -65,6 +61,13 @@ in
     # Grant user access to Calibre directories
     users.users.${username}.extraGroups = [ "calibre-web" ];
 
+    # Ensure the service has explicit filesystem read/write access to the library path
+    # This fixes the "sqlite3.OperationalError: unable to open database file" bug
+    systemd.services.calibre-web.serviceConfig.ReadWritePaths = [
+      libraryPath
+      "/var/lib/calibre-web-db"
+    ];
+
     # Run a backup on a schedule
     systemd.timers.calibre-backup = lib.mkIf config.nmasur.presets.services.litestream.enable {
       timerConfig = {

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

@@ -20,6 +20,9 @@ in
       };
     };
 
+    # Fix BASE_URL for downloading backups
+    systemd.services.mealie.environment.BASE_URL = lib.mkForce "https://${hostnames.recipes}";
+
     nmasur.presets.services.caddy.routes = [
       {
         match = [ { host = [ hostnames.recipes ]; } ];

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

@@ -57,9 +57,10 @@ in
     ];
 
     # Extending time for home-manager build for things like nix-index cache
-    systemd.services."home-manager-${username}" = {
+    # Should not be necessary with nix-index-database flake
-      serviceConfig.TimeoutStartSec = lib.mkForce "45m";
+    # systemd.services."home-manager-${username}" = {
-    };
+    #   serviceConfig.TimeoutStartSec = lib.mkForce "45m";
+    # };
 
     allowUnfreePackages = config.home-manager.users.${username}.allowUnfreePackages;
 

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

@@ -21,6 +21,23 @@ in
       };
       services = {
         actualbudget.enable = lib.mkDefault true;
+        actualtap = {
+          enable = lib.mkDefault true;
+          instances = {
+            budget1 = {
+              port = 3031;
+              path = "/actualtap1";
+              budgetIdFile = ../presets/services/actualtap/budget1-id.age;
+              apiKeyFile = ../presets/services/actualtap/budget1-api-key.age;
+            };
+            budget2 = {
+              port = 3032;
+              path = "/actualtap2";
+              budgetIdFile = ../presets/services/actualtap/budget2-id.age;
+              apiKeyFile = ../presets/services/actualtap/budget2-api-key.age;
+            };
+          };
+        };
         caddy.enable = lib.mkDefault true;
         cloudflare.enable = lib.mkDefault true;
         cloudflared.enable = lib.mkDefault true;