diff --git a/hosts/carrot/default.nix b/hosts/carrot/default.nix
index 678720c..883382e 100644
--- a/hosts/carrot/default.nix
+++ b/hosts/carrot/default.nix
@@ -99,4 +99,6 @@
         }
       ) (config.services.postgresql.ensureDatabases ++ [ "matrix-synapse" ])
     ));
+
+  system.stateVersion = "22.05";
 }
diff --git a/hosts/gregtech/default.nix b/hosts/gregtech/default.nix
index 748c5b2..2cb3522 100644
--- a/hosts/gregtech/default.nix
+++ b/hosts/gregtech/default.nix
@@ -87,4 +87,6 @@
       };
     };
   };
+
+  system.stateVersion = "22.05";
 }
diff --git a/hosts/hex/default.nix b/hosts/hex/default.nix
index 50802cd..42b6236 100644
--- a/hosts/hex/default.nix
+++ b/hosts/hex/default.nix
@@ -67,4 +67,6 @@
     };
     sway.scale = "1.5";
   };
+
+  system.stateVersion = "22.05";
 }
diff --git a/hosts/valen/default.nix b/hosts/valen/default.nix
index 2d959eb..00eb270 100644
--- a/hosts/valen/default.nix
+++ b/hosts/valen/default.nix
@@ -12,4 +12,6 @@
   services.journald.extraConfig = ''
     SystemMaxUse = 1G
   '';
+
+  system.stateVersion = "22.05";
 }
diff --git a/hosts/vetinari/default.nix b/hosts/vetinari/default.nix
index 0edf4fc..42bab71 100644
--- a/hosts/vetinari/default.nix
+++ b/hosts/vetinari/default.nix
@@ -79,5 +79,5 @@
     intel-ocl
   ];
 
-  system.stateVersion = lib.mkForce "23.05";
+  system.stateVersion = "23.05";
 }
diff --git a/hosts/vger/default.nix b/hosts/vger/default.nix
index 702d63b..ba709b5 100644
--- a/hosts/vger/default.nix
+++ b/hosts/vger/default.nix
@@ -50,4 +50,6 @@
     };
     sway.scale = "1.1";
   };
+
+  system.stateVersion = "22.05";
 }
diff --git a/modules/server/default.nix b/modules/server/default.nix
index eba9bac..84231fe 100644
--- a/modules/server/default.nix
+++ b/modules/server/default.nix
@@ -13,6 +13,15 @@
     domain = "xanderio.de";
   };
 
+  programs.neovim = {
+    enable = true;
+    defaultEditor = true;
+    viAlias = true;
+    vimAlias = true;
+    withRuby = false;
+    withPython3 = false;
+  };
+
   deployment.tags = [ "server" ];
 
   documentation.nixos.enable = false;