diff --git a/home/default.nix b/home/default.nix
index 4c23116..0a6d313 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -108,7 +108,7 @@
 	programs.gitui.enable = true;
 
 	programs.neovim = {
-		enable = true;
+		enable = false;
 		extraConfig = ''
 		syntax on
 		set number relativenumber
@@ -123,4 +123,15 @@
 			}
 		];
 	};
+
+	programs.helix = {
+		enable = true;
+		languages = [];
+		settings = {
+			theme = "base16_default";
+			editor = {
+				lsp.display-messages = true;
+			};
+		};
+	};
 }
diff --git a/nixos/default.nix b/nixos/default.nix
index a08c958..e0da466 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -44,6 +44,7 @@
 		git
 		git-lfs
 		tig
+		helix
 		tcpdump
 		iperf3
 		bmon
@@ -63,14 +64,15 @@
 		ip = "ip --color";
 		watch = "watch -c";
 		grep = "grep --color=always --exclude-dir=.git";
-		vim = "nvim";
+		vim = "hx";
 	};
+	environment.variables.EDITOR = "hx";
 
 	programs.mosh.enable = true; # open firewall
 
 	programs.neovim = {
-		enable = true;
-		defaultEditor = true;
+		enable = false;
+		defaultEditor = false;
 		configure.customRC = ''
 		syntax on
 		set number relativenumber