diff --git a/flake.lock b/flake.lock index 8b0335268..0bdb07005 100644 --- a/flake.lock +++ b/flake.lock @@ -218,6 +218,42 @@ "type": "github" } }, + "flake-utils": { + "locked": { + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "foundry": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1769497704, + "narHash": "sha256-McmVZ/3yWd1ifYyhyPG+GIiG5LjOukwu0l3S5mob96g=", + "owner": "shazow", + "repo": "foundry.nix", + "rev": "55d3c56b759b03bc15c2a4ebf7d47c41beec886b", + "type": "github" + }, + "original": { + "owner": "shazow", + "repo": "foundry.nix", + "type": "github" + } + }, "git-hooks": { "inputs": { "flake-compat": [ @@ -503,6 +539,7 @@ "agenix": "agenix", "devenv": "devenv", "flake-parts": "flake-parts_2", + "foundry": "foundry", "home-manager": "home-manager", "mk-shell-bin": "mk-shell-bin", "neovim-nightly-overlay": "neovim-nightly-overlay", diff --git a/flake.nix b/flake.nix index c0395089d..99770d2e3 100644 --- a/flake.nix +++ b/flake.nix @@ -37,6 +37,10 @@ url = "github:cachix/devenv"; inputs.nixpkgs.follows = "nixpkgs"; }; + foundry = { + url = "github:shazow/foundry.nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; mk-shell-bin = { url = "github:rrbutani/nix-mk-shell-bin"; }; diff --git a/home-manager/packages/default.nix b/home-manager/packages/default.nix index 94920501e..5b823ad76 100644 --- a/home-manager/packages/default.nix +++ b/home-manager/packages/default.nix @@ -36,6 +36,7 @@ with pkgs; eza fastfetch fd + foundry-bin fswatch fzf-make gh diff --git a/home-manager/programs/bash/default.nix b/home-manager/programs/bash/default.nix index 3ab8b91f0..153998988 100644 --- a/home-manager/programs/bash/default.nix +++ b/home-manager/programs/bash/default.nix @@ -50,7 +50,6 @@ export PATH="$PATH:$GOPATH/bin" export PATH="$HOME/.bun/bin:$PATH" export PATH="$HOME/.cargo/bin:$PATH" - export PATH="$HOME/.foundry/bin:$PATH" export PATH="$HOME/.local/bin:$PATH" export PATH="$HOME/.nix-profile/bin:$PATH" export PATH="/nix/var/nix/profiles/default/bin:$PATH" diff --git a/home-manager/programs/fish/default.nix b/home-manager/programs/fish/default.nix index 2d675c812..06c6ac835 100644 --- a/home-manager/programs/fish/default.nix +++ b/home-manager/programs/fish/default.nix @@ -35,7 +35,6 @@ fish_add_path -p ~/.local/bin fish_add_path -p ~/.bun/bin fish_add_path -p ~/.cargo/bin - fish_add_path -p ~/.foundry/bin fish_add_path -p ~/.nix-profile/bin fish_add_path -p ~/go/bin fish_add_path -p /nix/var/nix/profiles/default/bin @@ -56,7 +55,6 @@ fish_add_path -p ~/.local/bin fish_add_path -p ~/.bun/bin fish_add_path -p ~/.cargo/bin - fish_add_path -p ~/.foundry/bin fish_add_path -p ~/.nix-profile/bin fish_add_path -p ~/go/bin fish_add_path -p /nix/var/nix/profiles/default/bin diff --git a/home-manager/programs/zsh/default.nix b/home-manager/programs/zsh/default.nix index 2bfde40cd..027511271 100644 --- a/home-manager/programs/zsh/default.nix +++ b/home-manager/programs/zsh/default.nix @@ -50,7 +50,6 @@ export PATH="$PATH:$GOPATH/bin" export PATH="$HOME/.bun/bin:$PATH" export PATH="$HOME/.cargo/bin:$PATH" - export PATH="$HOME/.foundry/bin:$PATH" export PATH="$HOME/.local/bin:$PATH" export PATH="$HOME/.nix-profile/bin:$PATH" export PATH="/nix/var/nix/profiles/default/bin:$PATH" diff --git a/overlays/default.nix b/overlays/default.nix index 0bab21d52..101f7d9a0 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -2,6 +2,7 @@ [ inputs.nur.overlays.default inputs.neovim-nightly-overlay.overlays.default + inputs.foundry.overlay (final: prev: { # Ensure neovim-unwrapped exposes a lua attribute for wrapper consumers (e.g., home-manager) neovim-unwrapped =