simplify configuration for darwin

5 files changed, 43 insertions, 2 deletions

diff --git a/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P.nix b/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P.nix
index 19dbeb2..761b20e 100644
--- a/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P.nix
+++ b/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P.nix
@@ -6,6 +6,7 @@
 {
   imports = [
     ../../../profiles/darwin.nix
+    ../../../profiles/home-manager.nix
   ];
 
   users = {
@@ -14,6 +15,10 @@
     };
   };
 
+  environment.systemPackages = with pkgs; [
+    fish
+  ];
+
   environment.shells = [ pkgs.fish ];
 
   programs.fish.shellInit = ''
@@ -31,6 +36,7 @@
     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 276654b..943ccf0 100644
--- a/machines/darwin/aarch64-darwin/mba-m2.nix
+++ b/machines/darwin/aarch64-darwin/mba-m2.nix
@@ -10,6 +10,7 @@
 
   imports = [
     ../../../profiles/darwin.nix
+    ../../../profiles/home-manager.nix
     ../../../profiles/nix/remote-builder.nix
   ];
 
@@ -18,12 +19,18 @@
 
   networking.hostName = "mba-m2";
 
+  services.tailscale.enable = true;
+
   users = {
     users.${adminUser.name} = {
       home = "/Users/${adminUser.name}";
     };
   };
 
+  environment.systemPackages = with pkgs; [
+    fish
+  ];
+
   environment.shells = [ pkgs.fish ];
 
   programs.fish.shellInit = ''
@@ -38,12 +45,14 @@
     home.stateVersion = "23.05";
     home.username = "${adminUser.name}";
     home.homeDirectory = "/Users/${adminUser.name}";
+    home.packages = with pkgs; [
+      element-desktop
+    ];
     imports = [
       ../../../home/profiles/mac.nix
       ../../../home/profiles/media.nix
+      ../../../home/profiles/workstation.nix
     ];
     inherit (adminUser) userinfo;
   };
-
-  services.tailscale.enable = true;
 }
diff --git a/machines/nixos/x86_64-linux/do-rproxy.nix b/machines/nixos/x86_64-linux/do-rproxy.nix
index c444fef..bac3885 100644
--- a/machines/nixos/x86_64-linux/do-rproxy.nix
+++ b/machines/nixos/x86_64-linux/do-rproxy.nix
@@ -4,6 +4,7 @@
   pkgs,
   config,
   modulesPath,
+  adminUser,
   ...
 }:
 {
@@ -200,4 +201,12 @@
         };
       };
     };
+
+  home-manager = {
+    users.${adminUser.name} = {
+      imports = [
+        ../../../home/profiles/minimal.nix
+      ];
+    };
+  };
 }
diff --git a/machines/nixos/x86_64-linux/rivendell.nix b/machines/nixos/x86_64-linux/rivendell.nix
index f158113..969133c 100644
--- a/machines/nixos/x86_64-linux/rivendell.nix
+++ b/machines/nixos/x86_64-linux/rivendell.nix
@@ -3,6 +3,7 @@
   config,
   modulesPath,
   inputs,
+  adminUser,
   ...
 }:
 {
@@ -96,5 +97,13 @@
 
   my.modules.hardware.baremetal.enable = true;
 
+  home-manager = {
+    users.${adminUser.name} = {
+      imports = [
+        ../../../home/profiles/minimal.nix
+      ];
+    };
+  };
+
   system.stateVersion = "23.11"; # Did you read the comment?
 }
diff --git a/machines/nixos/x86_64-linux/synology-vm.nix b/machines/nixos/x86_64-linux/synology-vm.nix
index 702f8b4..0ffe222 100644
--- a/machines/nixos/x86_64-linux/synology-vm.nix
+++ b/machines/nixos/x86_64-linux/synology-vm.nix
@@ -119,5 +119,13 @@
 
   networking.firewall.allowedUDPPorts = [ 51871 ];
 
+  home-manager = {
+    users.${adminUser.name} = {
+      imports = [
+        ../../../home/profiles/minimal.nix
+      ];
+    };
+  };
+
   system.stateVersion = "23.11"; # Did you read the comment?
 }