simplify home profiles a bit more

7 files changed, 20 insertions, 38 deletions

diff --git a/home/profiles/bat.nix b/home/profiles/bat.nix
deleted file mode 100644
index a03ba62..0000000
--- a/home/profiles/bat.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ ... }:
-{
-  programs.bat.enable = true;
-}
diff --git a/home/profiles/mac.nix b/home/profiles/mac.nix
index 01a891a..100f757 100644
--- a/home/profiles/mac.nix
+++ b/home/profiles/mac.nix
@@ -1,10 +1,5 @@
-{
-  pkgs,
-  config,
-  ...
-}:
+{ pkgs, config, ... }:
 let
-
   inherit (config.home) username;
 in
 {
@@ -14,32 +9,48 @@ in
   };
 
   imports = [
+    ./direnv.nix
+    ./eza.nix
+    ./fd.nix
     ./fish.nix
-    ./ssh.nix
+    ./git.nix
+    ./go.nix
     ./onepassword.nix
+    ./ssh.nix
+    ./starship.nix
     ../programs/emacs
     ../programs/firefox
   ];
 
   home.homeDirectory = "/Users/${username}";
 
+  programs.bat.enable = true;
+
   home.packages = with pkgs; [
     age
     aider-chat
     bandwhich
+    bottom
     coreutils
     delve
     dive # explore layers in docker images
     docker
     docker-credential-helpers
+    dust
+    fish
+    jless
+    jq
     nil # nix lsp
     nix-direnv # integration with direnv
     nixfmt-rfc-style # new formatter
     procs
     restic
+    ripgrep
     shellcheck
+    tree
     wget
     wireshark
+    yq
   ];
 
   home.sessionVariables = {
diff --git a/home/profiles/minimal.nix b/home/profiles/minimal.nix
index f3aef75..ac0d84f 100644
--- a/home/profiles/minimal.nix
+++ b/home/profiles/minimal.nix
@@ -4,10 +4,11 @@ let
 in
 {
   imports = [
-    ./bat.nix
     ./eza.nix
   ];
 
+  programs.bat.enable = true;
+
   home.homeDirectory = "/home/${username}";
   home.stateVersion = "25.05";
 }
diff --git a/home/profiles/work.nix b/home/profiles/work.nix
index 04dc61e..da7104f 100644
--- a/home/profiles/work.nix
+++ b/home/profiles/work.nix
@@ -86,7 +86,6 @@ in
     shellAbbrs =
       let
         environments = [
-          o
           {
             name = "chi1";
             alias = "chi1";
diff --git a/home/profiles/workstation.nix b/home/profiles/workstation.nix
deleted file mode 100644
index 0494281..0000000
--- a/home/profiles/workstation.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ pkgs, ... }:
-{
-  imports = [
-    ./bat.nix
-    ./eza.nix
-    ./direnv.nix
-    ./go.nix
-    ./starship.nix
-    ./fd.nix
-    ./git.nix
-  ];
-
-  home.packages = with pkgs; [
-    bottom
-    dust
-    fish
-    jless
-    jq
-    ripgrep
-    tree
-    yq
-  ];
-}
diff --git a/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P.nix b/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P.nix
index 194fbdd..3207d2f 100644
--- a/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P.nix
+++ b/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P.nix
@@ -34,7 +34,6 @@
     imports = [
       ../../../home/profiles/mac.nix
       ../../../home/profiles/work.nix
-      ../../../home/profiles/workstation.nix
     ];
     inherit (adminUser) userinfo;
   };
diff --git a/machines/darwin/aarch64-darwin/mba-m2.nix b/machines/darwin/aarch64-darwin/mba-m2.nix
index e92b687..f083afa 100644
--- a/machines/darwin/aarch64-darwin/mba-m2.nix
+++ b/machines/darwin/aarch64-darwin/mba-m2.nix
@@ -49,7 +49,6 @@
     imports = [
       ../../../home/profiles/mac.nix
       ../../../home/profiles/media.nix
-      ../../../home/profiles/workstation.nix
     ];
     inherit (adminUser) userinfo;
   };