Updates across the board to support nix-darwin again

home/modules/baseline/vim/config.nix

@@ -1,15 +1,4 @@
 { pkgs, ... }:
-let
-  vim-xonsh = pkgs.vimUtils.buildVimPlugin {
-    name = "vim-xonsh";
-    src = pkgs.fetchFromGitHub {
-      owner = "meatballs";
-      repo = "vim-xonsh";
-      rev = "929f35e";
-      hash = "sha256-ugHLu2Z9bTtQsIp4FQPKxgjVe9oZNjfQYrP+aHu+/uU=";
-    };
-  };
-in
 {
   colorschemes.gruvbox.enable = true;
   globals = {
@@ -162,7 +151,6 @@ in
 
     context-vim
     vim-indent-guides
-    vim-xonsh
   ];
   viAlias = true;
   vimAlias = true;

home/modules/baseline/xonsh.nix

@@ -3,7 +3,6 @@
 {
   # Programs that are used in the settings file
   home.packages = with pkgs; [
-    bitwarden-cli
     copier
     git
     gnused

home/modules/baseline/xonsh_footer.xsh

@@ -56,7 +56,7 @@ def _rebuild(args):
     system = uname()
     hostname = system.nodename
     if system.sysname == 'Darwin':
-        darwin-rebuild --flake ~/.config/darwin switch
+        sudo darwin-rebuild switch
     else:
         with TemporaryDirectory() as td:
             pushd @(td)

home/modules/development.nix

@@ -11,8 +11,6 @@ let
     cargo
     gh-copilot
     gnumake
-    libcap.dev
-    libmysqlclient.dev
     nix-eval-jobs
     nix-fast-build
     nix-output-monitor

home/modules/gui.nix

@@ -31,6 +31,7 @@ in
             cdrtools
             element-desktop
             freetube
+            onlyoffice-bin
             qpwgraph
             vlc
             x265
@@ -51,25 +52,24 @@ in
               jellyfin-media-player
               nextcloud-client
               slack
+              (pkgs.zoom-us.overrideAttrs {
+                version = "6.2.11.5069";
+                src = pkgs.fetchurl {
+                  url = "https://zoom.us/client/6.2.11.5069/zoom_x86_64.pkg.tar.xz";
+                  hash = "sha256-k8T/lmfgAFxW1nwEyh61lagrlHP5geT2tA7e5j61+qw=";
+                };
+              })
             ]
           )
         ++
 
           # Items that are not supported on ARM/Linux
           (excludes [ "aarch64-linux" ] [
-            onlyoffice-bin
             synology-drive-client
-            (pkgs.zoom-us.overrideAttrs {
-              version = "6.2.11.5069";
-              src = pkgs.fetchurl {
-                url = "https://zoom.us/client/6.2.11.5069/zoom_x86_64.pkg.tar.xz";
-                hash = "sha256-k8T/lmfgAFxW1nwEyh61lagrlHP5geT2tA7e5j61+qw=";
-              };
-            })
           ]);
 
       programs.firefox = {
-        enable = (!pkgs.stdenv.hostPlatform.isDarwin);
+        enable = true; #(!pkgs.stdenv.hostPlatform.isDarwin);
         package = pkgs.firefox-bin;
         policies = {
           DisableAppUpdate = true;