Merge remote-tracking branch 'origin' into overlay-atuin

flake.nix

@@ -3,8 +3,8 @@
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05";
-    flake-utils.url = "github:numtide/flake-utils";
     home-manager.url = "github:nix-community/home-manager";
+    home-manager.inputs.nixpkgs.follows = "nixpkgs";
     darwin.url = "github:LnL7/nix-darwin";
     darwin.inputs.nixpkgs.follows = "nixpkgs";
     rust-overlay = {
@@ -23,13 +23,20 @@
       rust-overlay,
       ...
     }:
+    hildibrand.url = "git+https://scm.wyattjmiller.com/wymiller/hildibrand.git";
+    hildibrand.inputs.nixpkgs.follows = "nixpkgs";
+    caitsith.url = "git+https://scm.wyattjmiller.com/wymiller/caitsith.git";
+    caitsith.inputs.nixpkgs.follows = "nixpkgs";
+  };
+
+  outputs = inputs@{ self, nixpkgs, home-manager, darwin, ... }:
     let
-      systems = [
+      supportedSystems = [
         "x86_64-linux"
         "aarch64-linux"
         "aarch64-darwin"
       ];
-      forAllSystems = f: nixpkgs.lib.genAttrs systems f;
+      forAllSystems = f: nixpkgs.lib.genAttrs supportedSystems f;
     in
     {
       packages = forAllSystems (
@@ -40,7 +47,13 @@
             overlays = [ self.overlays.default ];
           };
         in
-        import ./pkgs { inherit pkgs; }
+        import ./pkgs { 
+          inherit pkgs;
+
+          # packages that are already built with Nix go here
+          hildibrand = inputs.hildibrand.packages.${system}.default;
+          caitsith = inputs.caitsith.packages.${system}.default;
+        }
       );
 
       devShells = forAllSystems (