diff --git a/general/system.nix b/general/system.nix
index de8c209..7a84e15 100644
--- a/general/system.nix
+++ b/general/system.nix
@@ -63,11 +63,10 @@
   '';
   environment.shells = with pkgs; [ fish ];
 
-  # # Environment Variables
-  # environment.sessionVariables = {
-  #   ELECTRON_OZONE_PLATFORM_HINT  = "wayland";
-  #   GTK_USE_PORTAL                = "1";
-  # };
+  # Environment Variables
+  environment.sessionVariables = {
+    EDITOR = "hx";
+  };
 
   # Graphics
   services.xserver.enable = true;
diff --git a/general/user/home.nix b/general/user/home.nix
index 6d069c0..5d7d436 100644
--- a/general/user/home.nix
+++ b/general/user/home.nix
@@ -11,8 +11,6 @@
       signByDefault = true;
     };
     extraConfig = {
-      code.editor = "nvim";
-      merge.tool = "nvim";
       color.ui = true;
       init.defaultBranch = "main";
       includeIf = {