improve baseline module

home/modules/baseline.nix

@@ -13,7 +13,8 @@ in {
   config = mkIf cfg.enable {
     xdg.enable = true;
 
-    home.packages = with pkgs; [
+    home = {
+      packages = with pkgs; [
         calc
         file
         git
@@ -24,7 +25,16 @@ in {
         tree
         units
         unzip
+        vim
         zip
       ];
     };
+    keyboard = {
+      layout = "us";
+      variant = "altgr-intl";
+    };
+    sessionVariables = {
+      "EDITOR" = mkDefault "vim";
+    };
+  };
 }

home/modules/neovim.nix

@@ -44,5 +44,8 @@ in {
         vim-multiple-cursors
       ];
     };
+    home.sessionVariables = {
+      "EDITOR" = "neovim";
+    };
   };
 }

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;
 }