fixes for caddy and adding paperless to local dns

Flake lock file updates:

• Updated input 'disko':
    'github:nix-community/disko/4073ff2f481f9ef3501678ff479ed81402caae6d' (2025-08-18)
  → 'github:nix-community/disko/bafad29f89e83b2d861b493aa23034ea16595560' (2025-08-25)
• Updated input 'helix':
    'github:helix-editor/helix/22a3b10dd8ab907367ae1fe57d9703e22b30d391' (2025-08-22)
  → 'github:helix-editor/helix/77ff51caa440b1066e0a1920007ab5e148dd4856' (2025-08-29)
• Updated input 'home-manager':
    'github:nix-community/home-manager/8b55a6ac58b678199e5bba701aaff69e2b3281c0' (2025-08-23)
  → 'github:nix-community/home-manager/77a71380c38fb2a440b4b5881bbc839f6230e1cb' (2025-08-29)
• Updated input 'mac-app-util':
    'github:hraban/mac-app-util/341ede93f290df7957047682482c298e47291b4d' (2025-03-16)
  → 'github:hraban/mac-app-util/8414fa1e2cb775b17793104a9095aabeeada63ef' (2025-08-24)
• Added input 'mac-app-util/treefmt-nix':
    'github:numtide/treefmt-nix/74e1a52d5bd9430312f8d1b8b0354c92c17453e5' (2025-08-23)
• Added input 'mac-app-util/treefmt-nix/nixpkgs':
    'github:nixos/nixpkgs/cab778239e705082fe97bb4990e0d24c50924c04' (2025-08-04)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/20075955deac2583bb12f07151c2df830ef346b4' (2025-08-19)
  → 'github:nixos/nixpkgs/dfb2f12e899db4876308eba6d93455ab7da304cd' (2025-08-28)
• Updated input 'nur':
    'github:nix-community/nur/1a47d83c521c098debd6d1f2c2ae313a5bb729f9' (2025-08-23)
  → 'github:nix-community/nur/e82a8b0095f54edb6bbbb1d862f3da502dca1396' (2025-08-30)

flake.lock

@@ -22,11 +22,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1751313918,
+        "lastModified": 1755825449,
-        "narHash": "sha256-HsJM3XLa43WpG+665aGEh8iS8AfEwOIQWk3Mke3e7nk=",
+        "narHash": "sha256-XkiN4NM9Xdy59h69Pc+Vg4PxkSm9EWl6u7k6D5FZ5cM=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "e04a388232d9a6ba56967ce5b53a8a6f713cdfcf",
+        "rev": "8df64f819698c1fee0c2969696f54a843b2231e8",
         "type": "github"
       },
       "original": {
@@ -43,11 +43,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1752718651,
+        "lastModified": 1756115622,
-        "narHash": "sha256-PkaR0qmyP9q/MDN3uYa+RLeBA0PjvEQiM0rTDDBXkL8=",
+        "narHash": "sha256-iv8xVtmLMNLWFcDM/HcAPLRGONyTRpzL9NS09RnryRM=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "d5ad4485e6f2edcc06751df65c5e16572877db88",
+        "rev": "bafad29f89e83b2d861b493aa23034ea16595560",
         "type": "github"
       },
       "original": {
@@ -156,11 +156,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1752851830,
+        "lastModified": 1756477005,
-        "narHash": "sha256-6MHI6FRiui4MR/Ek3s5yO84UVL7d1bPYdzF5LF0ZyCY=",
+        "narHash": "sha256-e/FNNIT/LPuoruzRQZf5z5L5GApq1G2y2PShy+Lakhs=",
         "owner": "helix-editor",
         "repo": "helix",
-        "rev": "4418e338e8ea055663c6029080768572d159dba1",
+        "rev": "77ff51caa440b1066e0a1920007ab5e148dd4856",
         "type": "github"
       },
       "original": {
@@ -176,11 +176,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1752814804,
+        "lastModified": 1756496801,
-        "narHash": "sha256-irfg7lnfEpJY+3Cffkluzp2MTVw1Uq9QGxFp6qadcXI=",
+        "narHash": "sha256-IYIsnPy+cJxe8RbDHBrCtfJY0ry2bG2H7WvMcewiGS8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d0300c8808e41da81d6edfc202f3d3833c157daf",
+        "rev": "77a71380c38fb2a440b4b5881bbc839f6230e1cb",
         "type": "github"
       },
       "original": {
@@ -198,14 +198,15 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "systems": "systems"
+        "systems": "systems",
+        "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1742156590,
+        "lastModified": 1756057867,
-        "narHash": "sha256-aTM/2CrNN5utdVEQGsOA+kl4UozgH7VPLBQL5OXtBrg=",
+        "narHash": "sha256-ziR5eQGqRWhW8tf8r0TIplaqNt+HXu1G1X41LUr4IYo=",
         "owner": "hraban",
         "repo": "mac-app-util",
-        "rev": "341ede93f290df7957047682482c298e47291b4d",
+        "rev": "8414fa1e2cb775b17793104a9095aabeeada63ef",
         "type": "github"
       },
       "original": {
@@ -222,11 +223,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1752588843,
+        "lastModified": 1755344765,
-        "narHash": "sha256-T4vw0himO8ami5uR7cry+El9HlQkqNcy/UtIFwkcTMw=",
+        "narHash": "sha256-k/Cvh/mzb5lSvilKdgwNBCyAyYmD8YPr1nc0sTSgwxI=",
         "owner": "gytis-ivaskevicius",
         "repo": "nix2vim",
-        "rev": "94f136cece965e33aa4ccccb4ca1af04772851f4",
+        "rev": "78467c8de07719f92397179844bf75cdf2e58b83",
         "type": "github"
       },
       "original": {
@@ -273,16 +274,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1752687322,
+        "lastModified": 1754340878,
-        "narHash": "sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo=",
+        "narHash": "sha256-lgmUyVQL9tSnvvIvBp7x1euhkkCho7n3TMzgjdvgPoU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "6e987485eb2c77e5dcc5af4e3c70843711ef9251",
+        "rev": "cab778239e705082fe97bb4990e0d24c50924c04",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-unstable",
+        "ref": "nixpkgs-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -304,6 +305,22 @@
       }
     },
     "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1756386758,
+        "narHash": "sha256-1wxxznpW2CKvI9VdniaUnTT2Os6rdRJcRUf65ZK9OtE=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "dfb2f12e899db4876308eba6d93455ab7da304cd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1728538411,
         "narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=",
@@ -327,11 +344,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1752895120,
+        "lastModified": 1756524478,
-        "narHash": "sha256-kzJ85DF2QSSDA34Pw6mh2Y2WQM1RWBjRVMD0/I3Iejg=",
+        "narHash": "sha256-2oSBlcYCgwrVxUZwM8MV6hBFsfsWFbeN5ErQiCA+38s=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "d68ea61b416a6a14c036889652a4abe2024c3359",
+        "rev": "e82a8b0095f54edb6bbbb1d862f3da502dca1396",
         "type": "github"
       },
       "original": {
@@ -349,7 +366,7 @@
         "mac-app-util": "mac-app-util",
         "nix2vim": "nix2vim",
         "nixos-generators": "nixos-generators",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "nixpkgs-stable": "nixpkgs-stable",
         "nur": "nur",
         "wsl": "wsl",
@@ -380,7 +397,7 @@
     },
     "rust-overlay_2": {
       "inputs": {
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
         "lastModified": 1736476219,
@@ -441,6 +458,24 @@
         "type": "github"
       }
     },
+    "treefmt-nix": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1755934250,
+        "narHash": "sha256-CsDojnMgYsfshQw3t4zjRUkmMmUdZGthl16bXVWgRYU=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "74e1a52d5bd9430312f8d1b8b0354c92c17453e5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
+    },
     "wsl": {
       "inputs": {
         "flake-compat": "flake-compat_2",
@@ -449,11 +484,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1752682362,
+        "lastModified": 1755261305,
-        "narHash": "sha256-ZNIpqCG/CfhmV+TgIeyO/XbhDjSWpwWokHM44j0Mn0w=",
+        "narHash": "sha256-EOqCupB5X5WoGVHVcfOZcqy0SbKWNuY3kq+lj1wHdu8=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "20001f9bf0aaf2b1c307e43a5eec8cf8f800fe14",
+        "rev": "203a7b463f307c60026136dd1191d9001c43457f",
         "type": "github"
       },
       "original": {

flake.nix

@@ -114,6 +114,7 @@
           bookmarks = "keep.${baseName}";
           books = "books.${baseName}";
           budget = "money.${baseName}";
+          contacts = "contacts.${baseName}";
           content = "cloud.${baseName}";
           download = "download.${baseName}";
           files = "files.${baseName}";
@@ -246,30 +247,30 @@
         default = lib.pkgsBySystem.${system}.nmasur.dotfiles-devshell;
       });
 
-      checks = lib.forAllSystems (
+      # checks = lib.forAllSystems (
-        system:
+      #   system:
-        let
+      #   let
-          pkgs = import nixpkgs {
+      #     pkgs = import nixpkgs {
-            inherit system;
+      #       inherit system;
-            overlays = lib.overlays;
+      #       overlays = lib.overlays;
-          };
+      #     };
-        in
+      #   in
-        {
+      #   {
-          neovim =
+      #     neovim =
-            pkgs.runCommand "neovim-check-health" { buildInputs = [ inputs.self.packages.${system}.neovim ]; }
+      #       pkgs.runCommand "neovim-check-health" { buildInputs = [ inputs.self.packages.${system}.neovim ]; }
-              ''
+      #         ''
-                mkdir -p $out
+      #           mkdir -p $out
-                export HOME=$TMPDIR
+      #           export HOME=$TMPDIR
-                nvim -c "checkhealth" -c "write $out/health.log" -c "quitall"
+      #           nvim -c "checkhealth" -c "write $out/health.log" -c "quitall"
 
-                # Check for errors inside the health log
+      #           # Check for errors inside the health log
-                if $(grep "ERROR" $out/health.log); then
+      #           if $(grep "ERROR" $out/health.log); then
-                  cat $out/health.log
+      #             cat $out/health.log
-                  exit 1
+      #             exit 1
-                fi
+      #           fi
-              '';
+      #         '';
-        }
+      #   }
-      );
+      # );
 
       formatter = lib.forAllSystems (
         system:

hosts/aarch64-linux/flame/default.nix

@@ -31,10 +31,10 @@ rec {
       power-user.enable = true;
     };
     nmasur.presets.programs.helix.enable = true;
-    home.stateVersion = "23.05";
+    home.stateVersion = "25.05";
   };
 
-  system.stateVersion = "23.05";
+  system.stateVersion = "25.05";
   # File systems must be declared in order to boot
 
   # # This is the root filesystem containing NixOS

hosts/x86_64-linux/swan/default.nix

@@ -33,9 +33,6 @@ rec {
 
   system.stateVersion = "23.05";
 
-  # Overrides
-  services.automatic-timezoned.enable = false;
-
   # Not sure what's necessary but too afraid to remove anything
   boot.initrd.availableKernelModules = [
     "xhci_pci"

pkgs/caddy/package.nix

@@ -0,0 +1,22 @@
+# Caddy with Cloudflare DNS
+
+{
+  pkgs,
+  fetchFromGitHub,
+  ...
+}:
+
+# Maintain a static version so that the plugin hash doesn't keep breaking
+(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-AcWko5513hO8I0lvbCLqVbM1eWegAhoM0J0qXoWL/vI=";
+  }

pkgs/tools/text/ren-find/package.nix

@@ -8,6 +8,5 @@ pkgs.rustPlatform.buildRustPackage {
     rev = "50c40172e354caffee48932266edd7c7a76a20fd";
     sha256 = "sha256-zVIt6Xp+Mvym6gySvHIZJt1QgzKVP/wbTGTubWk6kzI=";
   };
-  useFetchCargoVendor = true;
   cargoHash = "sha256-lSeO/GaJPZ8zosOIJRXVIEuPXaBg1GBvKBIuXtu1xZg=";
 }

pkgs/tools/text/rep-grep/package.nix

@@ -8,6 +8,5 @@ pkgs.rustPlatform.buildRustPackage {
     rev = "2a24f95170aa14b5182b2287125664a62f8688ef";
     sha256 = "sha256-gBxrbGCy6JEHnmgJmcm8sgtEvCAqra8/gPGsfCEfLqg=";
   };
-  useFetchCargoVendor = true;
   cargoHash = "sha256-t4tfQaFq4EV4ZWeU+IestSFiSAIeVQslTZhLbpKVoO4=";
 }

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

@@ -74,6 +74,8 @@ in
           "svg.context-properties.content.enabled" = true; # Sidebery styling
           "browser.tabs.hoverPreview.enabled" = false; # Disable tab previews
           "browser.tabs.hoverPreview.showThumbnails" = false; # Disable tab previews
+          "browser.gesture.swipe.left" = "cmd_scrollLeft"; # Disable swipe to go back
+          "browser.gesture.swipe.right" = "cmd_scrollRight"; # Disable swipe to go forward
         };
         userChrome = ''
           :root {

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

@@ -21,7 +21,7 @@ in
     programs.ghostty = {
       enable = true;
 
-      package = if pkgs.stdenv.isDarwin then pkgs.nur.repos.DimitarNestorov.ghostty else pkgs.ghostty;
+      package = if pkgs.stdenv.isDarwin then null else pkgs.ghostty;
 
       enableFishIntegration = true;
       enableBashIntegration = true;
@@ -37,8 +37,8 @@ in
         fullscreen = if pkgs.stdenv.isDarwin then true else false;
         keybind = [
           "super+t=unbind" # Pass super-t to underlying tool (e.g. zellij tabs)
-          "super+shift+]=unbind"
+          "super+shift+bracket_right=unbind"
-          "super+shift+[=unbind"
+          "super+shift+bracket_left=unbind"
           "ctrl+tab=unbind"
           "ctrl+shift+tab=unbind"
           "ctrl+tab=text:\\x1b[9;5u"

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

@@ -1,6 +1,5 @@
 {
   config,
-  pkgs,
   lib,
   ...
 }:
@@ -66,6 +65,18 @@ in
       };
     };
 
+    # Personal jj config
+    programs.jujutsu.settings = {
+      "--scope" = [
+        {
+          "--when".repositories = [ "~/dev/personal" ];
+          user = {
+            name = cfg.personal.name;
+            email = cfg.personal.email;
+          };
+        }
+      ];
+    };
   };
 
 }

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

@@ -46,6 +46,10 @@ in
           command = "${pkgs.nixd}/bin/nixd";
         };
 
+        language-server.ty = {
+          command = "${pkgs.ty}/bin/ty";
+        };
+
         language-server.fish-lsp = {
           command = "${pkgs.fish-lsp}/bin/fish-lsp";
         };
@@ -59,7 +63,8 @@ in
         };
 
         language-server.terraform-ls = {
-          command = "${lib.getExe pkgs.terraform-ls} serve";
+          command = "${lib.getExe pkgs.terraform-ls}";
+          args = [ "serve" ];
         };
 
         language-server.bash-language-server = {
@@ -130,6 +135,7 @@ in
 
       ignores = [
         "content/.obsidian/**"
+        ".direnv/**"
       ];
 
       settings = {
@@ -146,6 +152,10 @@ in
             "keep_primary_selection"
           ];
 
+          # Quit shortcuts
+          space.q = ":quit-all";
+          space.x = ":quit-all!";
+
           # Enable and disable inlay hints
           space.H = ":toggle lsp.display-inlay-hints";
 
@@ -160,7 +170,7 @@ in
           space.l = [
             ":write-all"
             ":new"
-            ":insert-output ${lib.getExe pkgs.lazygit}"
+            ":insert-output ${lib.getExe pkgs.lazygit} > /dev/tty"
             ":buffer-close!"
             ":redraw"
             ":reload-all"
@@ -168,6 +178,9 @@ in
             ":set mouse true"
           ];
 
+          # 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
@@ -195,6 +208,27 @@ in
             "paste_before"
           ];
 
+          A-S-ret = [
+            "open_above"
+            "normal_mode"
+          ];
+          A-ret = [
+            "open_below"
+            "normal_mode"
+          ];
+
+        };
+
+        keys.insert = {
+          # Allows not continuing the comment
+          "A-ret" = [
+            "insert_newline"
+            "extend_to_line_bounds"
+            "delete_selection"
+            "insert_newline"
+            "move_line_up"
+            "insert_mode"
+          ];
         };
 
         editor = {
@@ -216,10 +250,10 @@ in
 
           # Show hidden files
           file-picker = {
-            hidden = false;
+            hidden = false; # Show hidden files
-            git-ignore = true;
+            git-ignore = true; # Skip gitignore files
-            git-global = true;
+            git-global = true; # Skip global gitignore files
-            git-exclude = true;
+            git-exclude = true; # Skip excluded files
           };
 
           # Show whitespace visible to the user
@@ -322,7 +356,7 @@ in
           bg = config.theme.colors.base00;
         };
         "ui.cursor" = {
-          fg = config.theme.colors.base0A;
+          fg = config.theme.colors.base04;
           modifiers = [ "reversed" ];
         };
         "ui.cursor.insert" = {
@@ -334,11 +368,11 @@ in
           bg = config.theme.colors.base01;
         };
         "ui.cursor.match" = {
-          fg = config.theme.colors.base0A;
+          fg = config.theme.colors.base03;
           modifiers = [ "reversed" ];
         };
         "ui.cursor.select" = {
-          fg = config.theme.colors.base0A;
+          fg = config.theme.colors.base04;
           modifiers = [ "reversed" ];
         };
         "ui.gutter" = {

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

@@ -1,5 +1,6 @@
 {
   config,
+  pkgs,
   lib,
   ...
 }:
@@ -22,8 +23,18 @@ in
           name = config.programs.git.userName;
           email = config.programs.git.userEmail;
         };
+        ui.paginate = "never";
+
+        # Automatically snapshot when files change
+        fsmonitor.backend = "watchman";
+        fsmonitor.watchman.register-snapshot-trigger = true;
       };
     };
 
+    home.packages = [
+      # Required for the fsmonitor to auto-snapshot
+      pkgs.watchman
+    ];
+
   };
 }

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

@@ -24,7 +24,7 @@ in
     # These are useful for triggering from zellij (rather than running directly in the shell)
     nmasur.presets.programs.nixpkgs.commands.rebuildNixos = pkgs.writeShellScriptBin "rebuild-darwin" ''
       git -C ${config.nmasur.presets.programs.dotfiles.path} add --intent-to-add --all
-      darwin-rebuild switch --flake "${config.nmasur.presets.programs.dotfiles.path}#${config.nmasur.settings.host}"
+      sudo darwin-rebuild switch --flake "${config.nmasur.presets.programs.dotfiles.path}#${config.nmasur.settings.host}"
     '';
 
     programs.fish = {
@@ -40,13 +40,13 @@ in
         rebuild-darwin = {
           body = ''
             git -C ${config.nmasur.presets.programs.dotfiles.path} add --intent-to-add --all
-            echo "darwin-rebuild switch --flake ${config.nmasur.presets.programs.dotfiles.path}#lookingglass"
+            echo "sudo darwin-rebuild switch --flake ${config.nmasur.presets.programs.dotfiles.path}#lookingglass"
           '';
         };
         rebuild-darwin-offline = {
           body = ''
             git -C ${config.nmasur.presets.programs.dotfiles.path} add --intent-to-add --all
-            echo "darwin-rebuild switch --option substitute false --flake ${config.nmasur.presets.programs.dotfiles.path}#lookingglass"
+            echo "sudo darwin-rebuild switch --option substitute false --flake ${config.nmasur.presets.programs.dotfiles.path}#lookingglass"
           '';
         };
         rebuild-home = lib.mkForce {

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

@@ -35,6 +35,7 @@ in
   config = lib.mkIf cfg.enable {
 
     home.packages = [
+      pkgs.nh # Allows rebuilding with a cleaner TUI
       cfg.commands.rebuildHome
       cfg.commands.rebuildNixos
     ];

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

@@ -19,6 +19,7 @@ in
       enable = true;
       enableFishIntegration = true;
       enableBashIntegration = true;
+      enableTransience = true; # Replace previous prompts with custom string
       settings = {
         add_newline = false; # Don't print new line at the start of the prompt
         format = lib.concatStrings [
@@ -80,6 +81,17 @@ in
         };
       };
     };
+    programs.fish = {
+      functions = {
+        # Adjust the prompt in previous commands
+        starship_transient_prompt_func = {
+          body = "echo '$ '";
+        };
+        starship_transient_rprompt_func = {
+          body = "echo ' '";
+        };
+      };
+    };
 
   };
 }

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

@@ -7,6 +7,15 @@
 
 let
   cfg = config.nmasur.presets.programs.zellij;
+
+  zellij-switch-to-last = pkgs.writeShellScriptBin "zellij-switch-to-last" ''
+    TARGET_SESSION=$(cat ~/.local/state/zellij-last-session)
+    if [ -z "$TARGET_SESSION" ]; then
+      return 1
+    fi
+    echo "$ZELLIJ_SESSION_NAME" > ~/.local/state/zellij-last-session
+    zellij pipe --plugin file:$(which zellij-switch.wasm) -- "--session $TARGET_SESSION"
+  '';
 in
 
 {
@@ -31,6 +40,7 @@ in
               if test "$TARGET_DIR" = $(pwd)
                 return 1
               end
+              echo "$ZELLIJ_SESSION_NAME" > ~/.local/state/zellij-last-session
               zellij pipe --plugin file:$(which zellij-switch.wasm) -- "--cwd $TARGET_DIR --layout default --session $(basename $TARGET_DIR)"
             '';
         };
@@ -69,13 +79,13 @@ in
     programs.zellij = {
 
       enable = true;
+
+      # Auto start on shell init
       enableBashIntegration = true;
       enableFishIntegration = true;
       enableZshIntegration = true;
-
+      attachExistingSession = true;
-      # Not yet available in unstable
+      exitShellOnExit = false;
-      # attachExistingSession = true;
-      # exitShellOnExit = true;
 
       settings = {
         default_mode = "locked";
@@ -109,6 +119,14 @@ in
             };
           };
           shared = {
+            "bind \"Alt Shift s\"" = {
+              Run = {
+                _args = [
+                  (lib.getExe zellij-switch-to-last)
+                ];
+                close_on_exit = true;
+              };
+            };
             "bind \"Alt Shift p\"" = {
               Run = {
                 _args = [
@@ -167,6 +185,19 @@ in
                 ];
               };
             };
+            "bind \"Alt Shift j\"" = {
+              Run = {
+                _args = [
+                  (lib.getExe pkgs.lazyjj)
+                ];
+                close_on_exit = true;
+                floating = true;
+                x = "1%";
+                y = "1%";
+                width = "99%";
+                height = "99%";
+              };
+            };
             "bind \"Super Shift ]\"" = {
               GoToNextTab = { };
             };
@@ -190,11 +221,6 @@ in
                 _args = [ "scroll" ];
               };
             };
-            "bind \"Alt k\"" = lib.mkIf pkgs.stdenv.isLinux {
-              SwitchToMode = {
-                _args = [ "scroll" ];
-              };
-            };
             "bind \"Super Shift e\"" = lib.mkIf pkgs.stdenv.isDarwin {
               EditScrollback = { };
               SwitchToMode = {

platforms/home-manager/modules/nmasur/presets/services/hammerspoon/Spoons/Launcher.spoon/init.lua

@@ -57,7 +57,7 @@ function obj:init()
     self.launcher:bind("ctrl", "space", function() end)
     self.launcher:bind("", "return", function()
         -- self:switch("@wezterm@")
-        self:switch("@ghostty@")
+        self:switch("/Applications/Ghostty.app")
     end)
     self.launcher:bind("", "C", function()
         self:switch("Calendar.app")

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

@@ -23,7 +23,6 @@ in
         {
           discord = "${pkgs.discord}/Applications/Discord.app";
           firefox = "${pkgs.firefox-unwrapped}/Applications/Firefox.app";
-          ghostty = "${config.programs.ghostty.package}/Applications/Ghostty.app";
           obsidian = "${pkgs.obsidian}/Applications/Obsidian.app";
           slack = "${pkgs.slack}/Applications/Slack.app";
           wezterm = "${pkgs.wezterm}/Applications/WezTerm.app";

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 sh -c "${pkgs.home-manager}/bin/home-manager switch --flake ${config.nmasur.presets.programs.dotfiles.path}#''${hostname} || read" '';
+              ''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" '';
             "${modifier}+Mod1+r" =
-              "exec --no-startup-id ${lib.getExe cfg.terminal} --command sh -c 'doas nixos-rebuild switch --flake ${config.nmasur.presets.programs.dotfiles.path} || read'";
+              "exec --no-startup-id ${lib.getExe cfg.terminal} --command='doas nixos-rebuild switch --flake ${config.nmasur.presets.programs.dotfiles.path} || read'";
 
             # Window options
             "${modifier}+q" = "kill";

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

@@ -17,10 +17,7 @@ in
 
     nmasur.presets.programs = {
       zed-editor.enable = lib.mkDefault true;
-      ghostty.enable = lib.mkDefault true;
+      jujutsu.enable = lib.mkDefault true;
-      helix.enable = lib.mkDefault true;
-      zellij.enable = lib.mkDefault true;
-      lazygit.enable = lib.mkDefault true;
     };
 
     home.packages = [
@@ -32,7 +29,7 @@ in
       pkgs.charm # Manage account and filesystem
       pkgs.pop # Send emails from a TUI
 
-      pkgs.yazi # TUI file explorer
+      pkgs.chawan # Browser TUI
 
     ];
 

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

@@ -25,16 +25,19 @@ in
       pkgs.jless # JSON viewer
       pkgs.jo # JSON output
       pkgs.mpd # TUI slideshows
+      pkgs.nixfmt-rfc-style # Format Nix code
       pkgs.nmasur.jqr # FZF fq JSON tool
       pkgs.nmasur.osc # Clipboard over SSH
-      # pkgs.nmasur.ren-find # Rename files
+      pkgs.nmasur.ren-find # Rename files
-      # pkgs.nmasur.rep-grep # Replace text in 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
       pkgs.tealdeer # Cheatsheets
       pkgs.tree # Print tree in terminal
       pkgs.vimv-rs # Batch rename files
+      pkgs.yazi # TUI file explorer
+
     ];
 
     programs.fish.shellAliases = {
@@ -57,8 +60,10 @@ in
       fd.enable = lib.mkDefault true;
       fish.enable = lib.mkDefault true;
       fzf.enable = lib.mkDefault true;
+      ghostty.enable = lib.mkDefault true;
       git.enable = lib.mkDefault true;
       helix.enable = lib.mkDefault true;
+      lazygit.enable = lib.mkDefault true;
       neovim.enable = lib.mkDefault true;
       nix-index.enable = lib.mkDefault true;
       nixpkgs.enable = lib.mkDefault true;
@@ -67,6 +72,7 @@ in
       ripgrep.enable = lib.mkDefault true;
       weather.enable = lib.mkDefault true;
       yt-dlp.enable = lib.mkDefault true;
+      zellij.enable = lib.mkDefault true;
       zoxide.enable = lib.mkDefault true;
     };
 

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

@@ -6,7 +6,6 @@
 }:
 
 let
-  inherit (config.nmasur.settings) username;
   cfg = config.nmasur.presets.services.dock;
 in
 
@@ -50,7 +49,7 @@ in
         "/System/Applications/Messages.app"
         "/System/Applications/Mail.app"
         "/Applications/zoom.us.app"
-        "${config.home-manager.users.${username}.programs.ghostty.package}/Applications/Ghostty.app"
+        "/Applications/Ghostty.app"
         "${pkgs.discord}/Applications/Discord.app"
         "${pkgs.obsidian}/Applications/Obsidian.app"
       ];

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

@@ -39,6 +39,7 @@ in
       "scroll-reverser" # Different scroll style for mouse vs. trackpad
       "notunes" # Don't launch Apple Music with the play button
       "topnotch" # Darkens the menu bar to complete black
+      "ghostty" # Terminal application (not buildable on Nix on macOS)
     ];
 
   };

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

@@ -24,6 +24,7 @@ let
     hostnames.download
     hostnames.photos
     hostnames.audiobooks
+    hostnames.paperless
   ];
   mkRecord = service: "${service}       A       ${localIp}";
   localRecords = lib.concatLines (map mkRecord localServices);

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

@@ -66,10 +66,7 @@ in
     nmasur.presets.services.caddy.cidrAllowlist = cloudflareIpRanges;
 
     # Tell Caddy to use Cloudflare DNS for ACME challenge validation
-    services.caddy.package = pkgs.caddy.withPlugins {
+    services.caddy.package = pkgs.nmasur.caddy;
-      plugins = [ "github.com/caddy-dns/cloudflare@v0.2.1" ];
-      hash = "sha256-2D7dnG50CwtCho+U+iHmSj2w14zllQXPjmTHr6lJZ/A=";
-    };
     nmasur.presets.services.caddy.tlsPolicies = [
       {
         issuers = [
@@ -159,12 +156,13 @@ in
       requires = [ "cloudflare-api-secret.service" ];
       script =
         let
-          args =
+          args = [
-            [ "--cache-file /var/lib/cloudflare-dyndns/ip.cache" ]
+            "--cache-file /var/lib/cloudflare-dyndns/ip.cache"
-            ++ (if config.services.cloudflare-dyndns.ipv4 then [ "-4" ] else [ "-no-4" ])
+          ]
-            ++ (if config.services.cloudflare-dyndns.ipv6 then [ "-6" ] else [ "-no-6" ])
+          ++ (if config.services.cloudflare-dyndns.ipv4 then [ "-4" ] else [ "-no-4" ])
-            ++ lib.optional config.services.cloudflare-dyndns.deleteMissing "--delete-missing"
+          ++ (if config.services.cloudflare-dyndns.ipv6 then [ "-6" ] else [ "-no-6" ])
-            ++ lib.optional config.services.cloudflare-dyndns.proxied "--proxied";
+          ++ lib.optional config.services.cloudflare-dyndns.deleteMissing "--delete-missing"
+          ++ lib.optional config.services.cloudflare-dyndns.proxied "--proxied";
         in
         lib.mkForce ''
           export CLOUDFLARE_API_TOKEN=$(cat ''${CREDENTIALS_DIRECTORY}/apiToken)

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

@@ -158,7 +158,7 @@ in
       };
       script = ''
         ${pkgs.awscli2}/bin/aws s3 sync --exclude */gitea.db* \
-            ${giteaPath}/ \
+            ${giteaPath}/repositories/ \
             s3://${config.nmasur.presets.services.litestream.s3.bucket}/gitea-data/ \
             --endpoint-url=https://${config.nmasur.presets.services.litestream.s3.endpoint}
       '';

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

@@ -10,8 +10,8 @@ in
   config = lib.mkIf cfg.enable {
 
     # Use power button to sleep instead of poweroff
-    services.logind.powerKey = "suspend";
+    services.logind.settings.Login.HandlePowerKey = "suspend";
-    services.logind.powerKeyLongPress = "poweroff";
+    services.logind.settings.Login.HandlePowerKeyLongPress = "poweroff";
 
   };
 

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

@@ -17,9 +17,11 @@ in
       enable = true;
       mediaDir = "/data/generic/paperless";
       passwordFile = config.secrets.paperless.dest;
+      configureTika = true; # Enable processing of emails
       settings = {
         PAPERLESS_OCR_USER_ARGS = builtins.toJSON { invalidate_digital_signatures = true; };
         PAPERLESS_URL = "https://${hostnames.paperless}";
+        PAPERLESS_DATE_ORDER = "MDY"; # Check document for US-formatted dates
 
         # Enable if changing the path name in Caddy
         # PAPERLESS_FORCE_SCRIPT_NAME = "/paperless";

platforms/nixos/modules/nmasur/presets/services/stalwart-mail.nix

@@ -0,0 +1,56 @@
+# Stalwart is a self-hosted email service, but in my case I want to use it as a
+# vCard contacts database server and ignore the email component.
+
+{ config, lib, ... }:
+
+let
+  inherit (config.nmasur.settings) hostnames;
+  cfg = config.nmasur.presets.services.stalwart-mail;
+in
+
+{
+
+  options.nmasur.presets.services.stalwart-mail = {
+    enable = lib.mkEnableOption "Stalwart mail and contacts server";
+    port = lib.mkOption {
+      type = lib.types.port;
+      description = "Port to use for the localhost";
+      default = 7982;
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+
+    services.stalwart-mail = {
+      enable = true;
+      settings = {
+        server.listener.http = {
+          bind = [ "127.0.0.1:${builtins.toString cfg.port}" ];
+          protocol = "http";
+        };
+        authentication.fallback-admin = {
+          user = "admin";
+          secret = "$6$W/zXJP0xtZSUQqIe$DedCz9ncAn8mtfQVCg8Fzguuz.x8u1dfVU/d7wKyc6ujLuY4WCdtY0OeYwpv8huJfKAgBKE3go2MTrT99ID7I1";
+        };
+      };
+    };
+
+    # Configure Cloudflare DNS to point to this machine
+    services.cloudflare-dyndns.domains = [ hostnames.contacts ];
+
+    # Allow web traffic to Caddy
+    nmasur.presets.services.caddy.routes = [
+      {
+        match = [ { host = [ hostnames.contacts ]; } ];
+        handle = [
+          {
+            handler = "reverse_proxy";
+            upstreams = [
+              { dial = "localhost:${builtins.toString cfg.port}"; }
+            ];
+          }
+        ];
+      }
+    ];
+  };
+}

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

@@ -36,6 +36,7 @@ in
         ntfy-sh.enable = lib.mkDefault true;
         pgweb.enable = lib.mkDefault true;
         postgresql.enable = lib.mkDefault true;
+        stalwart-mail.enable = lib.mkDefault true;
         thelounge.enable = lib.mkDefault true;
         uptime-kuma.enable = lib.mkDefault true;
         vaultwarden.enable = lib.mkDefault true;

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

@@ -24,6 +24,11 @@ in
 
     # Enable automatic timezone updates based on location
     services.automatic-timezoned.enable = lib.mkDefault true;
+    services.geoclue2 = {
+      # see: https://github.com/NixOS/nixpkgs/issues/68489#issuecomment-1484030107
+      enableDemoAgent = lib.mkForce true;
+      geoProviderUrl = "https://beacondb.net/v1/geolocate";
+    };
 
     # Allow reading from Windows drives
     boot.supportedFilesystems = [ "ntfs" ];