diff --git a/hosts/common.nix b/hosts/common.nix
index 870a763..03a7895 100644
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -35,12 +35,14 @@
 
     console.keyMap = "de-latin1-nodeadkeys";
 
-    environment.systemPackages = [
-        pkgs.git
-        pkgs.neovim
-    ];
+    programs.neovim = {
+        enable = true;
+        defaultEditor = true;
+        viAlias = true;
+        vimAlias = true;
+    };
 
-    environment.variables.EDITOR = "nvim";
+    environment.systemPackages = [pkgs.git];
 
     nixpkgs.config.allowUnfreePredicate = pkg:
         builtins.elem (pkgs.lib.getName pkg) [
diff --git a/modules/home/default.nix b/modules/home/default.nix
index c52dfc3..d38fdc0 100644
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -5,7 +5,6 @@
         ./shell
         ./ssh-client.nix
         ./git.nix
-        ./neovim.nix
         ./kitty.nix
         ./equalizer
         ./sops.nix
diff --git a/modules/home/neovim.nix b/modules/home/neovim.nix
deleted file mode 100644
index 7ea957f..0000000
--- a/modules/home/neovim.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    config,
-    lib,
-    ...
-}: {
-    options.myConfig.neovim.enable = lib.mkEnableOption "";
-
-    config = lib.mkIf config.myConfig.neovim.enable {
-        programs.neovim = {
-            enable = true;
-            defaultEditor = true;
-            viAlias = true;
-            vimAlias = true;
-            vimdiffAlias = true;
-        };
-    };
-}
diff --git a/users/seb/home.nix b/users/seb/home.nix
index 27807de..fa9ce2f 100644
--- a/users/seb/home.nix
+++ b/users/seb/home.nix
@@ -22,7 +22,6 @@
 
         ssh-client.enable = true;
         git.enable = true;
-        neovim.enable = true;
         vscode.enable = true;
         kitty.enable = true;
         equalizer.enable = true;