diff --git a/home/apps/vscodium.nix b/home/apps/vscodium.nix
index 4f8718f..2129304 100644
--- a/home/apps/vscodium.nix
+++ b/home/apps/vscodium.nix
@@ -11,19 +11,19 @@
   };
 
   config = lib.mkIf config.modules.apps.vscodium.enable {
-    home.sessionVariables = {
-      VISUAL = "codium --wait --new-window";
-    };
     programs = {
-      niri.settings.binds = lib.mkIf config.modules.desktop.niri.enable {
-        "Mod+Shift+C" = {
-          action.spawn = ["codium"];
-          hotkey-overlay.title = "Open VSCodium";
-        };
-        "Mod+Shift+Ctrl+C" = {
-          action.spawn-sh = "codium ${config.modules.terminal.flakeManagement.repoPath}/";
-          hotkey-overlay.title = "Open NixOS Config";
+      niri.settings = lib.mkIf config.modules.desktop.niri.enable {
+        binds = {
+          "Mod+Shift+C" = {
+            action.spawn = ["codium"];
+            hotkey-overlay.title = "Open VSCodium";
+          };
+          "Mod+Shift+Ctrl+C" = {
+            action.spawn-sh = "codium ${config.modules.terminal.flakeManagement.repoPath}/";
+            hotkey-overlay.title = "Open NixOS Config";
+          };
         };
+        environment.VISUAL = "codium --wait --new-window";
       };
       vscodium = {
         enable = true;
diff --git a/home/console/helix.nix b/home/console/helix.nix
index f1f57ba..5c5591b 100644
--- a/home/console/helix.nix
+++ b/home/console/helix.nix
@@ -26,12 +26,6 @@
     };
   };
   config = lib.mkIf config.modules.terminal.helix.enable {
-    home.sessionVariables = {
-      EDITOR = "hx";
-      JJ_EDITOR = "hx";
-      SOPS_EDITOR = "hx";
-    };
-
     programs = {
       helix = {
         enable = true;
@@ -175,11 +169,16 @@
       };
     };
 
-    programs.niri.settings.binds = lib.mkIf config.modules.desktop.niri.enable {
-      "Mod+Shift+H" = {
+    programs.niri.settings = lib.mkIf config.modules.desktop.niri.enable {
+      binds."Mod+Shift+H" = {
         action.spawn-sh = "${config.modules.terminal.emulator.command} -e hx";
         hotkey-overlay.title = "Open Helix";
       };
+      environment = {
+        EDITOR = config.modules.editor.command;
+        JJ_EDITOR = config.modules.editor.command;
+        SOPS_EDITOR = config.modules.editor.command;
+      };
     };
   };
 }
diff --git a/home/desktop/niri.nix b/home/desktop/niri.nix
index be25bd8..807e60f 100644
--- a/home/desktop/niri.nix
+++ b/home/desktop/niri.nix
@@ -12,8 +12,8 @@
   config = lib.mkIf config.modules.desktop.niri.enable {
     programs.niri.settings = {
       environment = {
-        "NIXOS_OZONE_WL" = "1";
-        "QT_QPA_PLATFORMTHEME" = "qt6ct";
+        NIXOS_OZONE_WL = "1";
+        QT_QPA_PLATFORMTHEME = "qt6ct";
       };
 
       hotkey-overlay = {