From 1baf06b24f15826a76f380b615921bf953edb8e4 Mon Sep 17 00:00:00 2001
From: Katharina Fey <kookie@spacekookie.de>
Date: Fri, 18 Oct 2019 16:15:08 +0000
Subject: base/<>: refactoring shell and user layout

---
 modules/base/default.nix       |  3 ++-
 modules/base/shell/default.nix | 32 ++++++++++++++++++++++++++++++++
 modules/base/user.nix          | 19 -------------------
 modules/base/user/default.nix  | 19 +++++++++++++++++++
 4 files changed, 53 insertions(+), 20 deletions(-)
 create mode 100644 modules/base/shell/default.nix
 delete mode 100644 modules/base/user.nix
 create mode 100644 modules/base/user/default.nix

(limited to 'modules')

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.nix
deleted file mode 100644
index 4983196e978..00000000000
--- a/modules/base/user.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ pkgs, lib, ... }:
-
-let
-  mkDefault = lib.mkOverride ((lib.mkDefault null).priority - 1);
-in
-{
-  users.mutableUsers = false;
-  users.groups.spacekookie = {};
-  users.users.spacekookie = {
-    createHome = true;
-    description = "Katharina Fey";
-    home = mkDefault "/home";
-    uid = mkDefault 1000;
-    group = "spacekookie";
-    extraGroups = [ "wheel" ];
-    shell = lib.mkDefault pkgs.fish;
-  };
-}
-
diff --git a/modules/base/user/default.nix b/modules/base/user/default.nix
new file mode 100644
index 00000000000..4983196e978
--- /dev/null
+++ b/modules/base/user/default.nix
@@ -0,0 +1,19 @@
+{ pkgs, lib, ... }:
+
+let
+  mkDefault = lib.mkOverride ((lib.mkDefault null).priority - 1);
+in
+{
+  users.mutableUsers = false;
+  users.groups.spacekookie = {};
+  users.users.spacekookie = {
+    createHome = true;
+    description = "Katharina Fey";
+    home = mkDefault "/home";
+    uid = mkDefault 1000;
+    group = "spacekookie";
+    extraGroups = [ "wheel" ];
+    shell = lib.mkDefault pkgs.fish;
+  };
+}
+
-- 
cgit v1.2.3