diff --git a/users/home-manager/foo-dogsquared/modules/programs/shell.nix b/users/home-manager/foo-dogsquared/modules/programs/shell.nix
index f075998c..5f155703 100644
--- a/users/home-manager/foo-dogsquared/modules/programs/shell.nix
+++ b/users/home-manager/foo-dogsquared/modules/programs/shell.nix
@@ -36,11 +36,7 @@ in
     };
 
     # Set up with these variables.
-    systemd.user.sessionVariables = {
-      PAGER = "moar";
-      MANPAGER = "nvim +Man!";
-      EDITOR = "nvim";
-    };
+    systemd.user.sessionVariables.PAGER = "moar";
 
     # Add it to the laundry list.
     services.bleachbit.cleaners = [ "bash.history" ];
diff --git a/users/home-manager/foo-dogsquared/modules/setups/development.nix b/users/home-manager/foo-dogsquared/modules/setups/development.nix
index 9a4b3947..3a6a049a 100644
--- a/users/home-manager/foo-dogsquared/modules/setups/development.nix
+++ b/users/home-manager/foo-dogsquared/modules/setups/development.nix
@@ -24,6 +24,22 @@ in
           servers.enable = true;
         };
 
+        programs.neovim = {
+          enable = true;
+          package = pkgs.neovim-nightly;
+          vimAlias = true;
+          vimdiffAlias = true;
+
+          withNodeJs = true;
+          withPython3 = true;
+          withRuby = true;
+        };
+
+        systemd.user.sessionVariables = {
+          MANPAGER = "nvim +Man!";
+          EDITOR = "nvim";
+        };
+
         home.packages = with pkgs; [
           cachix # Compile no more by using someone's binary cache!
           diffoscope # Oversized caffeine grinder.