4 files changed, 20 insertions, 2 deletions

diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index e07362fc..36a81f83 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -320,6 +320,9 @@ in {
             "kitty_mod+n" = "detach_window";
             "kitty_mod+m" = "detach_window ask";
           };
+          extraConfig = ''
+            envinclude KITTY_CONF_*
+          '';
         };
         fuzzel = {
           enable = true;
diff --git a/accounts/gkleen@sif/niri/default.nix b/accounts/gkleen@sif/niri/default.nix
index 924d3843..af1af07a 100644
--- a/accounts/gkleen@sif/niri/default.nix
+++ b/accounts/gkleen@sif/niri/default.nix
@@ -711,7 +711,21 @@ in {
                   "Mod+Slash".action = show-hotkey-overlay;
 
                   "Mod+Return".action = spawn terminal;
-                  "Mod+Shift+Return".action = spawn terminal (lib.getExe config.programs.nushell.package);
+                  "Mod+Shift+Return".action =
+                    let
+                      nushellKitty = pkgs.symlinkJoin {
+                        name = "nushell-kitty";
+                        paths = [ config.programs.kitty.package ];
+                        buildInputs = [ pkgs.makeWrapper ];
+                        postBuild = ''
+                          wrapProgram $out/bin/kitty \
+                            --add-flags "--config ${pkgs.writeText "kitty.conf" ''
+                              include $HOME/${config.xdg.configFile."kitty/kitty.conf".target}
+                              shell ${lib.getExe config.programs.nushell.package}
+                            ''}"
+                        '';
+                      };
+                    in spawn (lib.getExe' nushellKitty "kitty");
                   "Mod+Q".action = close-window;
                   "Mod+O".action = spawn (lib.getExe config.programs.fuzzel.package);
                   "Mod+Shift+O".action = spawn (lib.getExe config.programs.fuzzel.package) "--list-executables-in-path";
diff --git a/hosts/surtr/email/default.nix b/hosts/surtr/email/default.nix
index 4666d1d6..845f6455 100644
--- a/hosts/surtr/email/default.nix
+++ b/hosts/surtr/email/default.nix
@@ -364,6 +364,7 @@ in {
       domains = [ "surtr.yggdrasil.li" ] ++ concatMap (domain: [".${domain}" domain]) emailDomains;
       separator = "+";
       extraConfig = ''
+        socketmap = unix:/run/postsrsd/postsrsd-socketmap.sock
         milter = unix:/run/postsrsd/postsrsd-milter.sock
       '';
     };
diff --git a/hosts/vidhar/prometheus/default.nix b/hosts/vidhar/prometheus/default.nix
index d368ad52..b1d90d47 100644
--- a/hosts/vidhar/prometheus/default.nix
+++ b/hosts/vidhar/prometheus/default.nix
@@ -26,7 +26,7 @@ in {
       enable = true;
 
       extraFlags = [
-        "--enable-feature=remote-write-receiver"
+        "--web.enable-remote-write-receiver"
       ];
 
       exporters = {