more simplifications

1 files changed, 13 insertions, 23 deletions

diff --git a/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P/default.nix b/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P/default.nix
index 2ffe2cb..e9d78eb 100644
--- a/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P/default.nix
+++ b/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P/default.nix
@@ -5,30 +5,38 @@
   ...
 }:
 {
-
   imports = [
+    {
+      home-manager.users.${adminUser.name} = {
+        home.homeDirectory = "/Users/${adminUser.name}";
+        imports = [
+          ./home.nix
+          { home.stateVersion = "23.05"; }
+        ];
+        inherit (adminUser) userinfo;
+        programs.git.userEmail = "fcuny@roblox.com";
+      };
+    }
     "${self}/profiles/programs/home-manager.nix"
     "${self}/profiles/darwin/desktop.nix"
     "${self}/profiles/darwin/keyboard.nix"
     "${self}/profiles/darwin/nix.nix"
     "${self}/profiles/darwin/security.nix"
     "${self}/profiles/desktop/fonts.nix"
+    "${self}/profiles/programs/fish.nix"
+    "${self}/profiles/programs/ssh.nix"
   ];
 
   system.primaryUser = adminUser.name;
 
-  # The user should already exist, but we need to set this up so Nix knows
-  # what our home directory is (https://github.com/LnL7/nix-darwin/issues/423).
   users = {
     users.${adminUser.name} = {
       home = "/Users/${adminUser.name}";
-      shell = pkgs.fish;
     };
   };
 
   environment.shells = [ pkgs.fish ];
 
-  programs.fish.enable = true;
   programs.fish.shellInit = ''
     # Nix
     if test -e '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.fish'
@@ -36,22 +44,4 @@
     end
     # End Nix
   '';
-
-  programs.ssh.knownHosts = {
-    "github.com".publicKey =
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl";
-  };
-
-  home-manager.users.${adminUser.name} = {
-    home.stateVersion = "23.05";
-    home.username = "${adminUser.name}";
-    home.homeDirectory = "/Users/${adminUser.name}";
-    home.packages = with pkgs; [ grpcurl ];
-    imports = [
-      "${self}/home/profiles/mac.nix"
-      "${self}/home/profiles/work.nix"
-    ];
-    inherit (adminUser) userinfo;
-    programs.git.userEmail = "fcuny@roblox.com";
-  };
 }