diff --git a/modules/base.nix b/modules/base.nix
index e57cf62..042fbf9 100644
--- a/modules/base.nix
+++ b/modules/base.nix
@@ -63,8 +63,6 @@
     description = "Yoda";
     extraGroups = [ "networkmanager" "wheel" ];
     packages = with pkgs; [
-      # Nix dependency management.
-      niv
     ];
   };
 
diff --git a/modules/programs-base.nix b/modules/programs-base.nix
index ce6ebb3..9ed5d40 100644
--- a/modules/programs-base.nix
+++ b/modules/programs-base.nix
@@ -5,6 +5,7 @@
       zenith # Terminal resource monitor / task manager
       btop   # Terminal resource monitor / task manager
       htop   # Terminal resource monitor / task manager
+      niv # NixOS dependency management
       colmena # NixOS config deployment
 
       keepassxc # Password manager. TODO Wayland: Maybe QT_QPA_PLATFORM defined in ghostwriter.nix fixed blurry fonts?
diff --git a/shell.nix b/shell.nix
index 7f6d00b..2c2dcd5 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,5 +1,8 @@
 { pkgs ? import <nixpkgs> {} }:
   pkgs.mkShell {
     # nativeBuildInputs is usually what you want -- tools you need to run
-    nativeBuildInputs = with pkgs.buildPackages; [ ];
+    nativeBuildInputs = with pkgs.buildPackages; [
+      niv
+      colmena
+    ];
 }