diff --git a/configs/common.nix b/configs/common.nix
index 7f5aea2..142cbd1 100644
--- a/configs/common.nix
+++ b/configs/common.nix
@@ -53,22 +53,16 @@ in {
 
   console.keyMap = "fr";
 
-  environment = {
-    systemPackages = with pkgs; [
-      btop
-      curl
-      git
-      htop
-      ncdu
-      neovim
-      ripgrep
-      wget
-    ];
-
-    variables = {
-      EDITOR = lib.getExe pkgs.neovim;
-    };
-  };
+  environment.systemPackages = with pkgs; [
+    btop
+    curl
+    git
+    htop
+    ncdu
+    neovim
+    ripgrep
+    wget
+  ];
 
   hm = {
     home = {inherit stateVersion;};
diff --git a/programs/neovim/default.nix b/programs/neovim/default.nix
index 542c32b..6ce438f 100644
--- a/programs/neovim/default.nix
+++ b/programs/neovim/default.nix
@@ -1,6 +1,7 @@
 {pkgs, ...}: {
   hm.programs.neovim = {
     enable = true;
+    defaultEditor = true;
     extraLuaConfig = builtins.readFile ./init.lua;
 
     extraPackages = with pkgs; [