diff --git a/hosts/common/packages.nix b/hosts/common/packages.nix
index bb137db..699eee4 100644
--- a/hosts/common/packages.nix
+++ b/hosts/common/packages.nix
@@ -9,13 +9,13 @@
     btop
     comma
     git
+    helix
     micro
     neofetch
     # nix-your-shell # Currently only available in unstable
     sysz
     tmux
     tree
-    neovim
     wget
   ];
 
diff --git a/users/common/home.nix b/users/common/home.nix
index 8fb9978..8611029 100644
--- a/users/common/home.nix
+++ b/users/common/home.nix
@@ -7,7 +7,7 @@
     stateVersion = "22.05";
     sessionVariables = {
       TZ = ":/etc/localtime";
-      EDITOR = "nvim";
+      EDITOR = "hx";
     };
     file = {
       ".config/starship.toml".source =
diff --git a/users/common/programs.nix b/users/common/programs.nix
index 0854e47..9c2ff1d 100644
--- a/users/common/programs.nix
+++ b/users/common/programs.nix
@@ -1,6 +1,4 @@
-{ inputs, config, pkgs, lib, ... }:
-
-{
+{ inputs, config, pkgs, lib, ... }: {
   programs = {
     password-store.enable = true;
     bash = {
@@ -56,8 +54,6 @@
       interactiveShellInit = "nix-your-shell fish | source";
       loginShellInit = "nix-your-shell fish | source";
       shellAliases = {
-        vi = "nvim";
-        vim = "nvim";
         wget = ''wget --hsts-file="$XDG_DATA_HOME/wget-hsts"'';
       };
       functions = {