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

hosts/franks-macbook-pro/configuration.nix

@@ -1,19 +1,10 @@
-{
-  pkgs,
-  ...
-}:
+{ _, ... }:
 {
   imports = [
     ../shared/darwin.nix
   ];
 
   environment = {
-    systemPackages = with pkgs; [
-      bash-language-server
-      nil
-      devenv
-    ];
-
     shellAliases = {
       "nix-rebuild" = "sudo darwin-rebuild switch --flake /etc/nix-darwin/.#franks-macbook-pro";
     };

hosts/shared/darwin.nix

@@ -3,6 +3,7 @@
   imports = [
     ./nix-package-manager.nix
     ../../features/sops.nix
+    ../../features/zsh.nix
   ];
 
   # Only use homebrew for casks.
@@ -11,33 +12,10 @@
   # Enables Touch ID for sudo prompts.
   security.pam.services.sudo_local.touchIdAuth = true;
 
-  programs = {
-    zsh = {
-      enable = true;
-      enableCompletion = true;
-      enableAutosuggestions = true;
-      enableSyntaxHighlighting = true;
-
-      interactiveShellInit = ''
-        eval "$(jump shell)"
-        eval "$(devenv hook zsh)"
-        clear;fastfetch
-      '';
-    };
-  };
-
   environment = {
-    shellAliases = import ../../features/aliases.nix { };
-    variables = import ../../features/xdg.nix { };
-
-    systemPackages = with pkgs; [
-      wget
-      btop
-      nerd-fonts.hack
-      devenv
-      ripgrep
-      fastfetch
-    ];
+    shellAliases = import ../../features/aliases.nix { inherit pkgs; };
+    variables = import ../../features/xdg.nix { inherit pkgs; };
+    systemPackages = import ../../features/common-pkgs.nix { inherit pkgs; };
   };
 
   # Don't touch this unless needed.