1 files changed, 19 insertions, 17 deletions

diff --git a/accounts/gkleen@sif/niri.nix b/accounts/gkleen@sif/niri.nix
index 3b60e033..1ee6bec9 100644
--- a/accounts/gkleen@sif/niri.nix
+++ b/accounts/gkleen@sif/niri.nix
@@ -1,4 +1,4 @@
-{ config, hostConfig, pkgs, lib, flakeInputs, ... }:
+{ config, hostConfig, pkgs, lib, utils, flakeInputs, ... }:
 let
   cfg = config.programs.niri;
 
@@ -7,7 +7,23 @@ let
 
   niri = cfg.package;
   spawnTerminal = { command ? lib.getExe config.programs.zsh.package, extraArgs ? [] }:
-    [(lib.getExe config.programs.alacritty.package) "msg" "--socket" "/run/user/1000/alacritty.sock" "create-window"] ++ lib.toList extraArgs ++ ["--command" (lib.getExe' hostConfig.systemd.package "systemd-run") "--user" "--pty" "--same-dir" "--wait" "--collect" "--quiet" "--service-type=exec" "--expand-environment=no"] ++ lib.toList command;
+    [(lib.getExe config.programs.alacritty.package) "msg" "--socket" "/run/user/1000/alacritty.sock" "create-window"] ++ lib.toList extraArgs ++ ["--command" (lib.getExe' hostConfig.systemd.package "systemd-run") "--user" "--pty" "--same-dir" "--wait" "--collect" "--quiet" "--service-type=exec" "--expand-environment=no"] ++ lib.mapAttrsToList (k: v: "--property=Environment=${utils.escapeSystemdExecArg "${k}=${if v == null then "" else v}"}") execEnvironment ++ lib.toList command;
+
+  execEnvironment = {
+    NIXOS_OZONE_WL = "1";
+    QT_QPA_PLATFORM = "wayland";
+    QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
+    GDK_BACKEND = "wayland";
+    SDL_VIDEODRIVER = "wayland";
+    DISPLAY = ":0";
+    ELECTRON_OZONE_PLATFORM_HINT = "auto";
+    SSH_ASKPASS_REQUIRE = "prefer";
+    SSH_ASKPASS = lib.getExe pkgs.kdePackages.ksshaskpass;
+    SUDO_ASKPASS = lib.getExe pkgs.kdePackages.ksshaskpass;
+    GTK_IM_MODULE = null;
+    QT_IM_MODULE = null;
+    QT_IM_MODULES = null;
+  };
 
   focus_or_spawn = pkgs.writeShellApplication {
     name = "focus-or-spawn";
@@ -507,21 +523,7 @@ in {
             (plain "hot-corners" [(flag "off")])
           ])
 
-          (plain "environment" (lib.mapAttrsToList sleaf {
-            NIXOS_OZONE_WL = "1";
-            QT_QPA_PLATFORM = "wayland";
-            QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
-            GDK_BACKEND = "wayland";
-            SDL_VIDEODRIVER = "wayland";
-            DISPLAY = ":0";
-            ELECTRON_OZONE_PLATFORM_HINT = "auto";
-            SSH_ASKPASS_REQUIRE = "prefer";
-            SSH_ASKPASS = lib.getExe pkgs.kdePackages.ksshaskpass;
-            SUDO_ASKPASS = lib.getExe pkgs.kdePackages.ksshaskpass;
-            GTK_IM_MODULE = null;
-            QT_IM_MODULE = null;
-            QT_IM_MODULES = null;
-          }))
+          (plain "environment" (lib.mapAttrsToList sleaf execEnvironment))
 
           (node "output" ["eDP-1"] [
             (sleaf "scale" 1.5)