diff --git a/home/modules/baseline.nix b/home/modules/baseline.nix
index fd49b9b..b6d0d20 100644
--- a/home/modules/baseline.nix
+++ b/home/modules/baseline.nix
@@ -13,18 +13,28 @@ in {
   config = mkIf cfg.enable {
     xdg.enable = true;
 
-    home.packages = with pkgs; [
-      calc
-      file
-      git
-      htop
-      killall
-      man-pages
-      man-pages-posix
-      tree
-      units
-      unzip
-      zip
-    ];
+    home = {
+      packages = with pkgs; [
+        calc
+        file
+        git
+        htop
+        killall
+        man-pages
+        man-pages-posix
+        tree
+        units
+        unzip
+        vim
+        zip
+      ];
+    };
+    keyboard = {
+      layout = "us";
+      variant = "altgr-intl";
+    };
+    sessionVariables = {
+      "EDITOR" = mkDefault "vim";
+    };
   };
 }
diff --git a/home/modules/neovim.nix b/home/modules/neovim.nix
index 78dbc6f..b909a34 100644
--- a/home/modules/neovim.nix
+++ b/home/modules/neovim.nix
@@ -44,5 +44,8 @@ in {
         vim-multiple-cursors
       ];
     };
+    home.sessionVariables = {
+      "EDITOR" = "neovim";
+    };
   };
 }
diff --git a/home/platforms/fabian@posixlycorrect/default.nix b/home/platforms/fabian@posixlycorrect/default.nix
index 03f82b4..6d16ec3 100644
--- a/home/platforms/fabian@posixlycorrect/default.nix
+++ b/home/platforms/fabian@posixlycorrect/default.nix
@@ -48,13 +48,8 @@
     username = "fabian";
     homeDirectory = "/home/fabian";
     sessionVariables = {
-      "EDITOR" = "nvim";
       "TERMINAL" = "kitty";
     };
-    keyboard = {
-      layout = "us";
-      variant = "altgr-intl";
-    };
   };
   programs.home-manager.enable = true;
 }