diff --git a/common/nvim/nvim.nix b/common/nvim/nvim.nix
index 5eee458..b5875dd 100644
--- a/common/nvim/nvim.nix
+++ b/common/nvim/nvim.nix
@@ -4,6 +4,11 @@
 
 	programs.neovim = {
 		enable = true;
+		defaultEditor = true;
+
+		viAlias = true;
+		vimAlias = true;
+		vimdiffAlias = true;
 
 		extraLuaConfig = ''
 			${builtins.readFile ./init.lua}
diff --git a/flake.lock b/flake.lock
index 8feed63..20bf91e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -181,11 +181,11 @@
         "pre-commit-hooks": "pre-commit-hooks"
       },
       "locked": {
-        "lastModified": 1709155917,
-        "narHash": "sha256-S4yHqDKFmJpFQExP7bkOSw+RQaSr8pdOrfSFCOv3G70=",
+        "lastModified": 1709277403,
+        "narHash": "sha256-xEpCiFOeu9Th0NUPUbsBncDKnXQd+A4XZd6r/FJ6dQw=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "be87309e0c1da19d99d969625300aaed36ff1b91",
+        "rev": "8c0bdb17e980b2ca64860e309ce601dd92ce0c51",
         "type": "github"
       },
       "original": {
diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix
index fbeb4db..a749b39 100644
--- a/hosts/default/configuration.nix
+++ b/hosts/default/configuration.nix
@@ -93,10 +93,10 @@
 	# List packages installed in system profile. To search, run:
 	# $ nix search wget
 	environment.systemPackages = with pkgs; [
-		neovim
 		sddm
 		git
 		zsh
+		neovim
 	];
 
 	# TODO find list of fonts to install
@@ -115,10 +115,6 @@
 	#	 enable = true;
 	#	 enableSSHSupport = true;
 	# };
-
-	programs.neovim.enable = true;
-	programs.neovim.defaultEditor = true;
-
 	programs.zsh.enable = true;
 
 	programs.hyprland.enable = true;
diff --git a/hosts/default/home.nix b/hosts/default/home.nix
index f617ca9..ee7e4db 100644
--- a/hosts/default/home.nix
+++ b/hosts/default/home.nix
@@ -69,7 +69,6 @@
 		kitty
 		pipewire
 		lsd
-		neovim
 		(writeShellScriptBin "wofi-launch" ''
 				${wofi}/bin/wofi --show drun
 			'')
@@ -106,6 +105,11 @@
 					echo "No match"
 				fi
 			'')
+
+			# Programming langs
+			go
+			nodejs
+
 	];