Updates across the board to support nix-darwin again

home/home.nix

@@ -2,13 +2,13 @@
   pkgs,
   lib,
   host ? "most",
-  nixvim,
+  top,
   ...
 }:
 
 {
   imports = [
-    nixvim.homeManagerModules.default
+    top.nixvimunstable.homeManagerModules.nixvim
     ./modules
   ] ++ lib.optionals (builtins.pathExists ./hosts/${host}) [ ./hosts/${host} ];
 
@@ -20,9 +20,8 @@
     extraConfig = (lib.strings.concatStringsSep "\n" [ "bind P paste-buffer" ]);
   };
 
-  home.stateVersion = "23.05";
+  home.stateVersion = "25.05";
   home.packages = with pkgs; [
-    bitwarden-cli
     copier
     diffutils
     findutils

home/hosts/ivr/default.nix

@@ -4,13 +4,7 @@
   ...
 }:
 let
-  py = pkgs.python311.withPackages (
-    p: with p; [
-      pyyaml
-      ruamel-yaml
-      tox
-    ]
-  );
+  username = "gregory.hellings";
   x = pkgs.xonsh.override {
     extraPackages = (
       ps: [
@@ -23,10 +17,12 @@ let
   };
 in
 {
+  # Disables hitting local cache
+  _module.args.cache = lib.mkForce false;
   greg = {
     development = true;
     gui = true;
-    pypackage = py;
+    pypackage = pkgs.python311;
     vscodium = true;
   };
 
@@ -34,14 +30,12 @@ in
     packages = with pkgs; [
       aacs
       ansible
-      bitwarden-cli
       direnv
       home-manager
       k9s
       kubectl
       minikube
       mise
-      mysql-workbench
       nixStable
       pipenv-ivr
       (poetry.withPlugins (
@@ -52,7 +46,6 @@ in
         ]
       ))
       pre-commit
-      robo3t
       skaffold
       x
     ];
@@ -66,17 +59,8 @@ in
         "    https://pypidev.ivrtechnology.com/simple/"
       ]
     );
-    username = "gregory.hellings";
-    homeDirectory = lib.mkForce "/home/gregory.hellings";
+    username = username;
+    homeDirectory = "/Users/${username}";
   };
   programs.tmux.shell = (lib.getExe x);
-  services.podman = {
-    enable = true;
-    settings = {
-      registries.search = [
-        "docker.io"
-        "quay.io"
-      ];
-    };
-  };
 }

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;