base/<>: refactoring shell and user layout

3 files changed, 34 insertions, 1 deletions

diff --git a/modules/base/default.nix b/modules/base/default.nix
index af9b1868f57..4208e879a39 100644
--- a/modules/base/default.nix
+++ b/modules/base/default.nix
@@ -4,6 +4,7 @@
   imports = [
     ./fish
     ./git
-    ./user.nix
+    ./shell
+    ./user
   ];
 }
diff --git a/modules/base/shell/default.nix b/modules/base/shell/default.nix
new file mode 100644
index 00000000000..d746ee5244e
--- /dev/null
+++ b/modules/base/shell/default.nix
@@ -0,0 +1,32 @@
+/* ADDITIONAL SHELL TOOLS
+ *
+ * This module is a bit hard to wrap your head around, not because of
+ * what it does but because of the classification of tools it
+ * contains. It's a list of various utilities that are super useful
+ * for day-to-day use, but it's difficult to avoid just having one
+ * large file that contains _all_ applications you would ever use.
+ *
+ * Only add stuff to this list if you're sure that it will be useful
+ * on ALL workstations, as well as root-servers and user-servers!
+ */
+
+{ pkgs, ... }:
+
+{
+  home-manager.users.spacekookie = { ... }: {
+    home.packages = with pkgs; [
+      bat
+      curl
+      fzf
+      moreutils
+      pciutils
+      pv
+      ripgrep
+      skim
+      tmux
+      tree
+      usbutils
+      wget
+    ];
+  };
+}
diff --git a/modules/base/user.nix b/modules/base/user/default.nix
index 4983196e978..4983196e978 100644
--- a/modules/base/user.nix
+++ b/modules/base/user/default.nix