4 files changed, 29 insertions, 25 deletions
diff --git a/user/settings/base.nix b/user/settings/base.nix
index d7d5fb64..9f36dae0 100644
--- a/user/settings/base.nix
+++ b/user/settings/base.nix
@@ -5,14 +5,10 @@
   imports = [
     ./neovim.nix
     ./shell.nix
-    <nix-index-database/home-manager-module.nix>
   ];
 
   # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;
-  manual = {
-    html.enable = true;
-  };
   home.preferXdgDirectories = true;
   nix.settings.use-xdg-base-directories = true;
   home.shell = {
@@ -49,9 +45,6 @@
     stateHome = "${config.home.homeDirectory}/.local/state";
   };
 
-  home.shellAliases = {
-    make = "remake";
-  };
   programs.htop = {
     enable = true;
     settings = {
@@ -61,10 +54,8 @@
       hide_userland_threads = 1;
     };
   };
-  programs.nix-index-database.comma.enable = true;
   programs.ripgrep = {
     enable = true;
-    package = pkgs.ripgrep.override { withPCRE2 = true; };
     arguments = [
       "--smart-case"
     ];
@@ -78,25 +69,15 @@
       knot-dns
       dateutils
       moreutils
-      mtr
-      gping
       tree
-      remake
       abduco
-      walk
-      nuspell
-    ] ++ (with pkgs.hunspellDicts; [
-      en-gb-large
-      de-de
-    ]) ++ (
+    ] ++ (
       if !stdenv.isDarwin
       then [
         file
         lsof
         unar
         zip
-      ]
-      else [
-      ]
+      ] else [ ]
     );
 }
diff --git a/user/settings/development/base.nix b/user/settings/development/base.nix
index 3a8bcb8d..3954986b 100644
--- a/user/settings/development/base.nix
+++ b/user/settings/development/base.nix
@@ -16,6 +16,7 @@
 
       license-cli
       just
+      remake
 
       mosh
 
@@ -95,6 +96,7 @@
   };
   home.shellAliases = {
     j = "just";
+    make = "remake";
     er = "direnv reload";
     ea = "direnv allow";
     ex = "direnv exec";
diff --git a/user/settings/shell.nix b/user/settings/shell.nix
index 33130556..a51595aa 100644
--- a/user/settings/shell.nix
+++ b/user/settings/shell.nix
@@ -15,9 +15,6 @@ let
     else "--time-style=long-iso";
 in
 {
-  imports = [
-    ./yazi.nix
-  ];
   home = {
     shellAliases = {
       l = "ls ${lsOptions} -Bp";
@@ -45,7 +42,6 @@ in
 
       hist-freq-lines = lib.mkDefault "fc -l -10000 | cut -d' ' -f4- | sort | uniq -c | sort -gr | head -n100 | less";
       hist-freq-commands = lib.mkDefault "fc -l -10000 | cut -d' ' -f4 | sort | uniq -c | sort -gr | head -n100 | less";
-      wprop = "xprop | egrep '^WM_(CLASS|NAME|WINDOW_ROLE|TYPE)'";
 
       e = "$EDITOR";
       se = "sudo -e";
diff --git a/user/settings/workstation.nix b/user/settings/workstation.nix
new file mode 100644
index 00000000..8ecf1cfb
--- /dev/null
+++ b/user/settings/workstation.nix
@@ -0,0 +1,25 @@
+{ config
+, lib
+, pkgs
+, ...
+}: {
+  imports = [
+    <nix-index-database/home-manager-module.nix>
+    ./yazi.nix
+  ];
+
+  programs.nix-index-database.comma.enable = true;
+  programs.ripgrep.package = pkgs.ripgrep.override { withPCRE2 = true; };
+
+  home.packages = with pkgs; [
+    walk
+    nuspell
+  ] ++ (with pkgs.hunspellDicts; [
+    en-gb-large
+    de-de
+  ]);
+
+  home.shellAliases = {
+    wprop = "xprop | egrep '^WM_(CLASS|NAME|WINDOW_ROLE|TYPE)'";
+  };
+}