diff --git a/modules/workstation/home-manager/desktop/sway.nix b/modules/workstation/home-manager/desktop/sway.nix
index 3486034..c2dded7 100644
--- a/modules/workstation/home-manager/desktop/sway.nix
+++ b/modules/workstation/home-manager/desktop/sway.nix
@@ -10,7 +10,7 @@ with lib;
 let
   isQwerty = keymap == "us";
   gnomeSchema = "org.gnome.desktop.interface";
-  rendererLine = if nvidiaGPU then "export WLR_RENDERER=vulkan" else "";
+  rendererLine = "export WLR_RENDERER=vulkan";
   monitorModule = types.submodule {
     options = {
       name = mkOption { type = types.str; };
diff --git a/modules/workstation/home-manager/helix.nix b/modules/workstation/home-manager/helix.nix
index 14b0681..e32fa68 100644
--- a/modules/workstation/home-manager/helix.nix
+++ b/modules/workstation/home-manager/helix.nix
@@ -1,5 +1,6 @@
-{ lib, config, ... }:
+{ lib, config, pkgs, ... }:
 with lib;
 {
   programs.helix.settings = mkIf config.programs.helix.enable { theme = "nord"; };
+  home.sessionVariables."EDITOR" = "${pkgs.helix}/bin/hx";
 }
diff --git a/modules/workstation/home-manager/neovim/default.nix b/modules/workstation/home-manager/neovim/default.nix
index 55c725c..d574f08 100644
--- a/modules/workstation/home-manager/neovim/default.nix
+++ b/modules/workstation/home-manager/neovim/default.nix
@@ -15,7 +15,6 @@ with lib;
     '';
   };
 
-  config.home.sessionVariables."EDITOR" = mkIf config.desktop.enableNeovim "${pkgs.neovim}/bin/nvim";
 
   config.programs.neovim = mkIf config.desktop.enableNeovim {
     enable = true;