darwin: fix several issues with recent refactors for the darwin platform

features/bash.nix

@@ -13,10 +13,4 @@
       clear;fastfetch
     '';
   };
-
-  environment.systemPackages = with pkgs; [
-    jump
-    devenv
-    fastfetch
-  ];
 }

features/common-pkgs.nix

@@ -4,6 +4,7 @@ with pkgs;
   wget
   nil
   bash-language-server
+  btop
   devenv
   tmux
   ripgrep

features/sops.nix

@@ -1,18 +1,24 @@
 { pkgs, config, ... }:
+let
+  usr = if pkgs.stdenv.hostPlatform.isDarwin then "frank" else config.users.users.frank.name;
+  grp = if pkgs.stdenv.hostPlatform.isDarwin then "admin" else config.users.users.frank.group;
+  admgrp = if pkgs.stdenv.hostPlatform.isDarwin then "wheel" else "root";
+in
 {
   sops = {
     defaultSopsFile = ../.sops.yaml;
 
     age = {
       sshKeyPaths = [ ];
-      keyFile = "/persist/sops/age/keys.txt";
+      keyFile =
+        if pkgs.stdenv.isDarwin then "/usr/local/sops/age/keys.txt" else "/persist/sops/age/keys.txt";
     };
 
     secrets = {
       "password_hash" = {
         sopsFile = ../secrets/password-hash.yaml;
         owner = "root";
-        group = "root";
+        group = admgrp;
         mode = "0400";
         neededForUsers = true;
       };
@@ -20,32 +26,48 @@
       "personal_ssh_key_ed25519" = {
         sopsFile = ../secrets/personal-ssh-key.yaml;
         key = "personal_ssh_key_ed25519";
-        owner = config.users.users.frank.name;
-        group = config.users.users.frank.group;
+        owner = usr;
+        group = grp;
         mode = "0400";
       };
 
       "personal_ssh_key_ed25519.pub" = {
         sopsFile = ../secrets/personal-ssh-key.yaml;
         key = "personal_ssh_key_ed25519_pub";
-        owner = config.users.users.frank.name;
-        group = config.users.users.frank.group;
+        owner = usr;
+        group = grp;
+        mode = "0644";
+      };
+
+      "sapphire_ssh_key_ed25519" = {
+        sopsFile = ../secrets/sapphire-ssh-key.yaml;
+        key = "sapphire_ssh_key_ed25519";
+        owner = usr;
+        group = grp;
+        mode = "0400";
+      };
+
+      "sapphire_ssh_key_ed25519.pub" = {
+        sopsFile = ../secrets/sapphire-ssh-key.yaml;
+        key = "sapphire_ssh_key_ed25519_pub";
+        owner = usr;
+        group = grp;
         mode = "0644";
       };
 
       "work_ssh_key_rsa" = {
         sopsFile = ../secrets/work-ssh-key.yaml;
         key = "work_ssh_key_rsa";
-        owner = config.users.users.frank.name;
-        group = config.users.users.frank.group;
+        owner = usr;
+        group = grp;
         mode = "0400";
       };
 
       "work_ssh_key_rsa.pub" = {
         sopsFile = ../secrets/work-ssh-key.yaml;
         key = "work_ssh_key_rsa_pub";
-        owner = config.users.users.frank.name;
-        group = config.users.users.frank.group;
+        owner = usr;
+        group = grp;
         mode = "0644";
       };
 
@@ -53,7 +75,7 @@
         sopsFile = ../secrets/remotebuild-ssh-key.yaml;
         key = "remotebuild_ssh_key_rsa";
         owner = "root";
-        group = "root";
+        group = admgrp;
         mode = "0400";
       };
 
@@ -61,7 +83,7 @@
         sopsFile = ../secrets/work-ssh-key.yaml;
         key = "work_ssh_key_rsa_pub";
         owner = "root";
-        group = "root";
+        group = admgrp;
         mode = "0644";
       };
     };

features/zsh.nix

@@ -0,0 +1,15 @@
+{ _, ... }:
+{
+  programs.zsh = {
+    enable = true;
+    enableCompletion = true;
+    enableAutosuggestions = true;
+    enableSyntaxHighlighting = true;
+
+    interactiveShellInit = ''
+      eval "$(jump shell)"
+      eval "$(devenv hook zsh)"
+      clear;fastfetch
+    '';
+  };
+}