try to statically set caddy to prevent cloudflare hash breaking

flake.nix

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

pkgs/caddy/package.nix

@@ -0,0 +1,15 @@
+# Caddy with Cloudflare DNS
+
+{
+  pkgs,
+  ...
+}:
+
+# Maintain a static version so that the plugin hash doesn't keep breaking
+(pkgs.caddy.override {
+  version = "2.10.2";
+}).withPlugins
+  {
+    plugins = [ "github.com/caddy-dns/cloudflare@v0.2.1" ];
+    hash = "sha256-AcWko5513hO8I0lvbCLqVbM1eWegAhoM0J0qXoWL/vI=";
+  }

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+[=unbind"
+          "super+shift+bracket_right=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/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 = {

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/profiles/experimental.nix

@@ -29,6 +29,8 @@ in
       pkgs.charm # Manage account and filesystem
       pkgs.pop # Send emails from a TUI
 
+      pkgs.chawan # Browser TUI
+
     ];
 
     programs.gh-dash.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/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 {
-      plugins = [ "github.com/caddy-dns/cloudflare@v0.2.1" ];
-      hash = "sha256-AcWko5513hO8I0lvbCLqVbM1eWegAhoM0J0qXoWL/vI=";
-    };
+    services.caddy.package = pkgs.nmasur.caddy;
     nmasur.presets.services.caddy.tlsPolicies = [
       {
         issuers = [

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.powerKeyLongPress = "poweroff";
+    services.logind.settings.Login.HandlePowerKey = "suspend";
+    services.logind.settings.Login.HandlePowerKeyLongPress = "poweroff";
 
   };