Tidy home-manager modules and misc tools

DanNixon · Oct 12, 2023 · bbd80be · bbd80be
1 parent 1c2ba7c
commit bbd80be
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 15 deletions.
diff --git a/modules/home-manager/terminal_environment/default.nix b/modules/home-manager/terminal_environment/default.nix
@@ -9,7 +9,6 @@
 
     ../base.nix
 
-    ./base.nix
     ./direnv.nix
     ./fzf.nix
     ./git.nix
@@ -18,6 +17,7 @@
     ./nix-index.nix
     ./nnn.nix
     ./pass.nix
+    ./shell.nix
     ./tmux.nix
     ./zsh.nix
   ];
@@ -31,7 +31,7 @@
     file
     ffsend
     hexdump
-    htop
+    htop-vim
     ipcalc
     jq
     neofetch
@@ -47,6 +47,7 @@
     sshfs
     sshpass # Used for some sshuttle scripts
     sshuttle
+    tcpdump
     termdown
     tomb
     tree

diff --git a/...ome-manager/terminal_environment/base.nix → ...me-manager/terminal_environment/shell.nix b/...ome-manager/terminal_environment/base.nix → ...me-manager/terminal_environment/shell.nix
diff --git a/modules/nixos/base.nix b/modules/nixos/base.nix
@@ -33,24 +33,12 @@
 
   hardware.enableRedistributableFirmware = true;
 
+  # Inspection/diagnostic tools
   environment.systemPackages = with pkgs; [
-    # Core tools
-    git
-    neovim
-
-    # Common inspection/diagnostic tools
     acpi
-    bmon
-    dogdns
-    dua
-    htop
     lm_sensors
-    progress
     smartmontools
-    tcpdump
-    tree
   ];
-
   programs.iftop.enable = true;
 
   programs.zsh.enable = true;