diff --git a/configs/home-manager/foo-dogsquared/modules/setups/development.nix b/configs/home-manager/foo-dogsquared/modules/setups/development.nix
index 34aec176..2469c50b 100644
--- a/configs/home-manager/foo-dogsquared/modules/setups/development.nix
+++ b/configs/home-manager/foo-dogsquared/modules/setups/development.nix
@@ -26,17 +26,6 @@ in
         servers.enable = true;
       };
 
-      programs.neovim = lib.mkIf (!config.programs.nixvim.enable) {
-        enable = true;
-        package = pkgs.neovim-nightly;
-        vimAlias = true;
-        vimdiffAlias = true;
-
-        withNodeJs = true;
-        withPython3 = true;
-        withRuby = true;
-      };
-
       systemd.user.sessionVariables = {
         MANPAGER = "nvim +Man!";
         EDITOR = "nvim";
@@ -50,6 +39,19 @@ in
       ];
     }
 
+    (lib.mkIf (!config.programs.nixvim.enable) {
+      programs.neovim = {
+        enable = true;
+        package = pkgs.neovim-nightly;
+        vimAlias = true;
+        vimdiffAlias = true;
+
+        withNodeJs = true;
+        withPython3 = true;
+        withRuby = true;
+      };
+    })
+
     (lib.mkIf userCfg.programs.git.enable {
       home.packages = with pkgs; [
         diffoscope # An oversized caffeine grinder.