Updates across the board to support nix-darwin again

darwin/default.nix

@@ -14,14 +14,17 @@ let
     top.darwin.lib.darwinSystem {
       inherit system;
       specialArgs = {
+        inherit (top) self;
         inherit nixpkgs;
       };
       modules = [
         {
           nixpkgs.overlays = overlays;
-          home-manager.extraSpecialArgs = {
+          home-manager = {
-            inherit top;
+            extraSpecialArgs = {
-            host = name;
+              inherit top;
+              host = name;
+            };
           };
         }
         hm.darwinModules.home-manager
@@ -30,6 +33,5 @@ let
     };
 in
 rec {
-  la23002 = mac { name = "ivr"; };
+  "MacBook-Pro" = mac { name = "ivr"; };
-  LA23002 = la23002;
 }

darwin/hosts/ivr/default.nix

@@ -1,9 +1,12 @@
 { ... }:
+let
+  username = "gregory.hellings";
+in
 {
-  #environment.loginShell = lib.getExe pkgs.xonsh;
+  homebrew = {
-  homebrews = {
     enable = true;
     brews = [
+      "bitwarden-cli"
       "direnv"
       {
         name = "libvirt";
@@ -14,6 +17,7 @@
     ];
     casks = [
       "alt-tab"
+      "bitwarden"
       "bruno"
       "chromium"
       "firefox"
@@ -24,5 +28,13 @@
       "visual-studio-code"
       "zed"
     ];
+    user = username;
+  };
+
+  system.primaryUser = username;
+
+  users.users."${username}" = {
+    name = username;
+    home = "/Users/${username}";
   };
 }

flake.lock

@@ -47,7 +47,7 @@
     },
     "crane": {
       "inputs": {
-        "nixpkgs": "nixpkgs_5"
+        "nixpkgs": "nixpkgs_4"
       },
       "locked": {
         "lastModified": 1717383740,
@@ -93,11 +93,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1747521943,
+        "lastModified": 1747820204,
-        "narHash": "sha256-GMAJcB8oB9cC+TbYTE7QDfw9fwHZyloxUWnUpHnQRko=",
+        "narHash": "sha256-oY/mH8K1LOd+YbO58sw9ORtOdTxy3rR9lvTzOJKVUtA=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "b9b927dd1f24094b271e8ec5277a672dc4fc860d",
+        "rev": "e2676937faf868111dcea6a4a9cf4b6549907c9d",
         "type": "github"
       },
       "original": {
@@ -356,11 +356,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1747688838,
+        "lastModified": 1747834438,
-        "narHash": "sha256-FZq4/3OtGV/cti9Vccsy2tGSUrxTO4hkDF9oeGRTen4=",
+        "narHash": "sha256-AHJt79W8wADzur2htCx1U8FtEk4XjvrHb9/3iDfNedI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "45c2985644b60ab64de2a2d93a4d132ecb87cf66",
+        "rev": "6c2eb1e24cd0e76d88bdd633ef4c50d6286586e0",
         "type": "github"
       },
       "original": {
@@ -441,11 +441,11 @@
     },
     "nix-hardware": {
       "locked": {
-        "lastModified": 1747684167,
+        "lastModified": 1747723695,
-        "narHash": "sha256-l6jbonaboCBlB8lCjBkrqgh2zEnvt6F3f4dOU/8CLd4=",
+        "narHash": "sha256-lSXzv33yv1O9r9Ai1MtYFDX3OKhWsZMn/5FFb4Rni/k=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "e8f38b2c19c0647e39021c3d47172ff5469af8a9",
+        "rev": "6ac6ec6fcb410e15a60ef5ec94b8a2b35b5dd282",
         "type": "github"
       },
       "original": {
@@ -600,27 +600,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1747467164,
+        "lastModified": 1747744144,
-        "narHash": "sha256-JBXbjJ0t6T6BbVc9iPVquQI9XSXCGQJD8c8SgnUquus=",
+        "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "3fcbdcfc707e0aa42c541b7743e05820472bdaec",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_4": {
-      "locked": {
-        "lastModified": 1747542820,
-        "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043",
+        "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f",
         "type": "github"
       },
       "original": {
@@ -630,7 +614,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_5": {
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1714656196,
         "narHash": "sha256-kjQkA98lMcsom6Gbhw8SYzmwrSo+2nruiTcTZp5jK7o=",
@@ -646,7 +630,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_6": {
+    "nixpkgs_5": {
       "locked": {
         "lastModified": 1713805509,
         "narHash": "sha256-YgSEan4CcrjivCNO5ZNzhg7/8ViLkZ4CB/GrGBVSudo=",
@@ -664,11 +648,11 @@
     },
     "nixunstable": {
       "locked": {
-        "lastModified": 1747542820,
+        "lastModified": 1747744144,
-        "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=",
+        "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043",
+        "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f",
         "type": "github"
       },
       "original": {
@@ -681,16 +665,18 @@
     "nixvimunstable": {
       "inputs": {
         "flake-parts": "flake-parts_2",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": [
+          "nixunstable"
+        ],
         "nuschtosSearch": "nuschtosSearch",
         "systems": "systems_4"
       },
       "locked": {
-        "lastModified": 1747683610,
+        "lastModified": 1747845951,
-        "narHash": "sha256-Jis9/4lnr3pn1AIRgCnoeiReKs2MGy6COWc6JtAEESo=",
+        "narHash": "sha256-wTmZS30RIM6ELx9JFH5XSI5bjI4GzjtpodjHTSZBY3g=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "14c7f5f8968940d1730b5e935dd1d9f3e461a2d3",
+        "rev": "7e3a0f4e97c0906a276a860975888db96106b75e",
         "type": "github"
       },
       "original": {
@@ -703,15 +689,15 @@
     "nurpkgs": {
       "inputs": {
         "flake-parts": "flake-parts_3",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_3",
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1747683907,
+        "lastModified": 1747844583,
-        "narHash": "sha256-dgEK4d1QPNFhv0s5s9lpvEWOVBlRZENp7TVh8V8qYDU=",
+        "narHash": "sha256-zbwqs9a2mh0Q7i3ZPjEGipbYHoTOHh31IRlYm97B1Ec=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "64046fedb710701f87e5e86390b4dbe77f1d733b",
+        "rev": "b9b668b91302e0ee12aaa0114c4a8ae8096871f3",
         "type": "github"
       },
       "original": {
@@ -933,7 +919,7 @@
       "inputs": {
         "flake-compat": "flake-compat_3",
         "flake-utils": "flake-utils_3",
-        "nixpkgs": "nixpkgs_6"
+        "nixpkgs": "nixpkgs_5"
       },
       "locked": {
         "lastModified": 1739984805,

flake.nix

@@ -39,7 +39,10 @@
       url = "github:nix-community/nixos-generators";
       inputs.nixpkgs.follows = "nixunstable";
     };
-    nixvimunstable.url = "github:nix-community/nixvim/main";
+    nixvimunstable = {
+      url = "github:nix-community/nixvim/main";
+      inputs.nixpkgs.follows = "nixunstable";
+    };
     nixunstable.url = "github:nixos/nixpkgs/nixos-unstable";
     nurpkgs.url = "github:nix-community/NUR";
     vsext.url = "github:greg-hellings/nix-vscode-extensions/fix-json";

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 (
+  username = "gregory.hellings";
-    p: with p; [
-      pyyaml
-      ruamel-yaml
-      tox
-    ]
-  );
   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";
+    username = username;
-    homeDirectory = lib.mkForce "/home/gregory.hellings";
+    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;

hosts/default.nix

@@ -39,7 +39,7 @@ let
             useUserPackages = true;
             users.greg = import ../home/home.nix;
             extraSpecialArgs = {
-              inherit top overlays nixvim;
+              inherit top overlays;
               home = "/home/greg";
               host = name;
             };

modules/baseline.nix

@@ -22,79 +22,6 @@ in
   ];
 
   programs.ssh = {
-    knownHosts = {
-      chronicles = {
-        extraHostNames = [
-          "chronicles.thehellings.lan"
-          "chronicles.home"
-          "nas"
-          "nas.thehellings.lan"
-          "nas.home"
-        ];
-        publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEBecZUva9OnZuXLaBun6/1ITo5f9p0YMLPD+q0egLRS";
-      };
-      dns = {
-        extraHostNames = [
-          "dns"
-          "dns.me.ts"
-          "dns.home"
-        ];
-        publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKRCXdhXWHEvw84V9JC5bAGovvj12DLVphcEnsTHDjxW";
-      };
-      "genesis" = {
-        extraHostNames = [
-          "genesis.shire-zebra.ts.net"
-          "genesis.home"
-        ];
-        publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEI9jbTPmEWQ0F2bLYmnIOLmBnag1fkKxHRjz3X8lB/k";
-      };
-      "git" = {
-        extraHostNames = [
-          "git.home"
-          "git.thehellings.lan"
-        ];
-        publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC7hesFWwlmSbWPJWUiF8fIppy5a83yXw84O0Ytz+Zyq";
-      };
-      hosea = {
-        extraHostNames = [
-          "hosea.home"
-          "hosea.thehellings.lan"
-        ];
-        publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKLIwkTTXA56sUlUjEulXXZRvZy5H4a5ZwgKWLlpkQDz";
-      };
-      isaiah = {
-        extraHostNames = [
-          "isaiah.home"
-          "isaiah.thehellings.lan"
-          "isaiah-builder"
-        ];
-        publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHleYKtfV4W1Z63Ysu9w5Rbglqlz4F92YcZoMkucoTNf";
-      };
-      jeremiah = {
-        extraHostNames = [
-          "jeremiah.home"
-          "jeremiah.thehellings.lan"
-          "jeremiah-builder"
-        ];
-        publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOjQjXq9WYU2Ki27BR9WwJ4ZruS/lJXbjC1b0Q42Adi0";
-      };
-      jude = {
-        extraHostNames = [
-          "jude.home"
-          "jude.thehellings.lan"
-          "jude-builder"
-        ];
-        publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOos0zQePsa+T6Z2dsKbPOvEdrBQ8a6mx3s7pN6ysCI0";
-      };
-      linode = {
-        extraHostNames = [
-          "linode.home"
-          "linode.thehellings.lan"
-          "thehellings.com"
-        ];
-        publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMv9Zud3kZOl86gtmkn+uj3D4kiXWDPtyUL02VVLNR4Q";
-      };
-    };
     extraConfig = builtins.concatStringsSep "\n" (
       lib.map (x: ''
         Host ${x}-builder

modules/darwin/default.nix

@@ -4,22 +4,22 @@
 
   home-manager = {
     useGlobalPkgs = true;
-    users."gregory.hellings" = import ../../home/home.nix;
+    users."${config.system.primaryUser}" = import ../../home/home.nix;
     extraSpecialArgs = {
+      inherit (config.users.users."${config.system.primaryUser}") home;
       gnome = false;
       gui = false;
-      home = "/Users/gregory.hellings";
     };
   };
 
   fonts.packages = with pkgs; [
     dejavu_fonts
-    hack-font
+    nerd-fonts.hack
-    nerdfonts
   ];
 
   nix = {
-    gc.interval.Hour = 24;
+    enable = true;
+    gc.interval.Hour = 3;
     settings.auto-optimise-store = false; # Darwin bugs?
   };
 
@@ -34,10 +34,13 @@
     bash.enable = true;
   };
 
-  services.nix-daemon.enable = true;
-
   system = {
     defaults = {
+      CustomSystemPreferences = {
+        ".GlobalPreferences" = {
+          "com.apple.swipescrolldirection" = 0;
+        };
+      };
       finder = {
         AppleShowAllExtensions = true;
         AppleShowAllFiles = true;
@@ -50,7 +53,7 @@
       LaunchServices.LSQuarantine = false;
       menuExtraClock = {
         Show24Hour = true;
-        ShowDate = true;
+        ShowDate = 2;
       };
       screencapture = {
         include-date = true;
@@ -66,6 +69,4 @@
   };
 
   time.timeZone = "America/Chicago";
-
-  users.users."gregory.hellings".home = "/Users/gregory.hellings";
 }

modules/nixos/default.nix

@@ -32,6 +32,7 @@
 
   environment.systemPackages = with pkgs; [
     btrfs-progs
+    bitwarden-cli
     coreutils-full
     efibootmgr
     psmisc
@@ -56,15 +57,90 @@
     networkmanager.enable = false;
   };
 
-  programs.xonsh = {
+  programs = {
-    enable = true;
+    xonsh = {
-    extraPackages = (
+      enable = true;
-      ps: with ps; [
+      extraPackages = (
-        xonsh-apipenv
+        ps: with ps; [
-        pkgs.nur.repos.xonsh-xontribs.xonsh-direnv
+          xonsh-apipenv
-        pkgs.nur.repos.xonsh-xontribs.xontrib-vox
+          pkgs.nur.repos.xonsh-xontribs.xonsh-direnv
-      ]
+          pkgs.nur.repos.xonsh-xontribs.xontrib-vox
-    );
+        ]
+      );
+    };
+    ssh.knownHosts = {
+      chronicles = {
+        extraHostNames = [
+          "chronicles.thehellings.lan"
+          "chronicles.home"
+          "nas"
+          "nas.thehellings.lan"
+          "nas.home"
+        ];
+        publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEBecZUva9OnZuXLaBun6/1ITo5f9p0YMLPD+q0egLRS";
+      };
+      dns = {
+        extraHostNames = [
+          "dns"
+          "dns.me.ts"
+          "dns.home"
+        ];
+        publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKRCXdhXWHEvw84V9JC5bAGovvj12DLVphcEnsTHDjxW";
+      };
+      "genesis" = {
+        extraHostNames = [
+          "genesis.shire-zebra.ts.net"
+          "genesis.home"
+        ];
+        publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEI9jbTPmEWQ0F2bLYmnIOLmBnag1fkKxHRjz3X8lB/k";
+      };
+      "git" = {
+        extraHostNames = [
+          "git.home"
+          "git.thehellings.lan"
+        ];
+        publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC7hesFWwlmSbWPJWUiF8fIppy5a83yXw84O0Ytz+Zyq";
+      };
+      hosea = {
+        extraHostNames = [
+          "hosea.home"
+          "hosea.thehellings.lan"
+        ];
+        publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKLIwkTTXA56sUlUjEulXXZRvZy5H4a5ZwgKWLlpkQDz";
+      };
+      isaiah = {
+        extraHostNames = [
+          "isaiah.home"
+          "isaiah.thehellings.lan"
+          "isaiah-builder"
+        ];
+        publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHleYKtfV4W1Z63Ysu9w5Rbglqlz4F92YcZoMkucoTNf";
+      };
+      jeremiah = {
+        extraHostNames = [
+          "jeremiah.home"
+          "jeremiah.thehellings.lan"
+          "jeremiah-builder"
+        ];
+        publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOjQjXq9WYU2Ki27BR9WwJ4ZruS/lJXbjC1b0Q42Adi0";
+      };
+      jude = {
+        extraHostNames = [
+          "jude.home"
+          "jude.thehellings.lan"
+          "jude-builder"
+        ];
+        publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOos0zQePsa+T6Z2dsKbPOvEdrBQ8a6mx3s7pN6ysCI0";
+      };
+      linode = {
+        extraHostNames = [
+          "linode.home"
+          "linode.thehellings.lan"
+          "thehellings.com"
+        ];
+        publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMv9Zud3kZOl86gtmkn+uj3D4kiXWDPtyUL02VVLNR4Q";
+      };
+    };
   };
 
   # Enable the OpenSSH daemon for remote control