diff --git a/flake.lock b/flake.lock index 649d88d..8fa2913 100644 --- a/flake.lock +++ b/flake.lock @@ -68,31 +68,6 @@ "type": "github" } }, - "blueprint": { - "inputs": { - "nixpkgs": [ - "llm-agents", - "nixpkgs" - ], - "systems": [ - "llm-agents", - "systems" - ] - }, - "locked": { - "lastModified": 1776249299, - "narHash": "sha256-Dt9t1TGRmJFc0xVYhttNBD6QsAgHOHCArqGa0AyjrJY=", - "owner": "numtide", - "repo": "blueprint", - "rev": "56131e8628f173d24a27f6d27c0215eff57e40dd", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "blueprint", - "type": "github" - } - }, "bun2nix": { "inputs": { "flake-parts": [ @@ -134,11 +109,11 @@ ] }, "locked": { - "lastModified": 1783936800, - "narHash": "sha256-Aaiy1Wq/aTx/oSgUBMTqV5YJ5d2hmu6yFKAccG2OzTM=", + "lastModified": 1784007208, + "narHash": "sha256-bAJLOSNhVmIAnqTeNrVgc/Gi+3UdxGFBIU+xZ2+zlVg=", "owner": "ilysenko", "repo": "codex-desktop-linux", - "rev": "13d2d31121f9968bae59f27b322ab227e330b075", + "rev": "0883c4ebc6028b3f2492f850ab16158eac7d850a", "type": "github" }, "original": { @@ -149,11 +124,11 @@ }, "crane": { "locked": { - "lastModified": 1781825982, - "narHash": "sha256-SlXKwIRIhrOSAcTjCB3ftPLzJWZStQIPS7J1FlZPnKk=", + "lastModified": 1783203018, + "narHash": "sha256-G6R9IT/xwFuu+CYBWDUAok6AdC4ERC4ZfPPFtEpxnZE=", "owner": "ipetkov", "repo": "crane", - "rev": "469fd08d0bcf6926321fa973c6777fbc87785dd7", + "rev": "80db5bdc391be8a1794f6d8a2d56e3a84ebcede2", "type": "github" }, "original": { @@ -435,28 +410,6 @@ "type": "github" } }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "lanzaboote", - "pre-commit", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "gnome-shell": { "flake": false, "locked": { @@ -502,11 +455,11 @@ ] }, "locked": { - "lastModified": 1783221248, - "narHash": "sha256-ESQnuNHEDChsB4IxoLRhscVahqkDWkTb+qdIz8euYt4=", + "lastModified": 1783740085, + "narHash": "sha256-qajyHfZY29G2oEQk+uHxmsJcRoBUBXP9maTpFlwP/dI=", "owner": "nix-community", "repo": "home-manager", - "rev": "af2beae5f0fae0a4310cc0e6aef2572f56090353", + "rev": "3cd22efe6471dc7365c822bd9ad73a21e55f38fb", "type": "github" }, "original": { @@ -547,11 +500,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1783187991, - "narHash": "sha256-qGYEthfxqPeGfEkcJzZv98cX3+8Mg29PZDfZEhZ+Byg=", + "lastModified": 1783496806, + "narHash": "sha256-6B6CQUk1dPc8l/+otaGiYbuX8qeX/0VmSUQ+qSn0/uA=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "0368b35d4677854d897951d35b0bfd3649664383", + "rev": "6183ac79eadb079a1e72fa2c60915601be669100", "type": "github" }, "original": { @@ -562,7 +515,6 @@ }, "llm-agents": { "inputs": { - "blueprint": "blueprint", "bun2nix": "bun2nix", "flake-parts": "flake-parts_2", "nixpkgs": [ @@ -572,11 +524,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1783243767, - "narHash": "sha256-iiQL/IHgQlmnZgKgs4wBOiDA9+S3tRFsQPRxtYIhUYo=", + "lastModified": 1784012825, + "narHash": "sha256-lbdkOH57StVOFMEpFASzEmi+GlK3iX6Uu7Y2zGUgVFE=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "22f1080fb54a217bdda6cfd6eca5dbf9e7afddac", + "rev": "5c73869318afcf796a7a465b4b5e31b27f0819d4", "type": "github" }, "original": { @@ -595,11 +547,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1783267733, - "narHash": "sha256-DTvaM+0vanneOcKg3NKXV7ilf0ShY4BOBz/nde5GHos=", + "lastModified": 1783896799, + "narHash": "sha256-eXIwrSxH79I3WgRg2q0zLEi6+fyEsd2PisHv2FaR0Po=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "74053f79cad0f6c3a4a0be6b7928795d2e6a9f4b", + "rev": "9d808f1bb6e86239780039bc18abb64e5415cb23", "type": "github" }, "original": { @@ -628,11 +580,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1783248941, - "narHash": "sha256-citgYJbvR1iUKXpiWlFq3NO+fw6hXGL3Qk1ampU7lhA=", + "lastModified": 1783522755, + "narHash": "sha256-dI0HkX1djETia7cD/Y64h8BNIsSOfTRMzfNum2J6UhE=", "owner": "YaLTeR", "repo": "niri", - "rev": "a30ca7983b2f1fc3ddeb209b3fe18fa78e0dbd25", + "rev": "0777769e719b7c9b7c980d4ea66288bfbb4da5b3", "type": "github" }, "original": { @@ -669,11 +621,11 @@ ] }, "locked": { - "lastModified": 1783233851, - "narHash": "sha256-jzisD+3wWZPC4QvAsKtYguiGsmlH2SN3Mjx5LWd68Ok=", + "lastModified": 1783864904, + "narHash": "sha256-BQxN5UMg9FOevAsgBRwPxfxlh51Puj+dNn/8Dsi3sPM=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "fab14c7b63499d57cb6673d5690168c3ec42b99a", + "rev": "1111b9bc836afb7e31a7014e8d1272de9b1c917d", "type": "github" }, "original": { @@ -687,11 +639,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1782562157, - "narHash": "sha256-a7+T6QSeowynwZ1ZJJbP8T8ntAytvrui8kFGJmIZt2c=", + "lastModified": 1783792734, + "narHash": "sha256-50rvY9GdFvpYDcMLcD/4cWSi0hVxArT5wsGlVsHy8eY=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a9cf7546a938c737b079e738de73934a13de9784", + "rev": "8efb4337e857949f4cfac86d12ef1066f417f31f", "type": "github" }, "original": { @@ -707,11 +659,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1781182279, - "narHash": "sha256-V5EQQbDnmdiXGQXrEF1PEL7QYsFqfH8N1E89Z5ONwFk=", + "lastModified": 1783897948, + "narHash": "sha256-wusXpttNJn7SvUMvGLpNuJgcwIIkMwlWNnasPPxpftg=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "5675822ba756e6e56f8f6a5a76e90e0da2ece94d", + "rev": "7348d3f38ab1bd6abe156a923fab6f43656b168f", "type": "github" }, "original": { @@ -748,6 +700,22 @@ "type": "github" } }, + "nixpkgs-libxml2": { + "locked": { + "lastModified": 1751274312, + "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1782847189, @@ -766,11 +734,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1783279667, - "narHash": "sha256-/NAkDSsve+GNM0Bt6tleJdCGfsTlK89nPjkVOzZMo0s=", + "lastModified": 1783915482, + "narHash": "sha256-FmieJB8/OUvNxbkboi7+IGfIuSXY3nF/hZQm8kD0r50=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f205b5574fd0cb7da5b702a2da51507b7f4fdd1b", + "rev": "6cdc7fc76e8bf7fde9fa43a849fcaaa70e230dee", "type": "github" }, "original": { @@ -798,11 +766,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1783224372, - "narHash": "sha256-8i/87eeoqiGE4yOTjwSA3Eh/ziJRQEmd/unYU+K27sk=", + "lastModified": 1783776592, + "narHash": "sha256-UgCQzxeWI75XM8G+hPrPh+MKzEPjG3SpAj7dtqSbksA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d407951447dcd00442e97087bf374aad70c04cea", + "rev": "e7a3ca8092b61ff85b6a45bf863ea2b2d6a661b3", "type": "github" }, "original": { @@ -827,11 +795,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1780243769, - "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=", + "lastModified": 1783224372, + "narHash": "sha256-8i/87eeoqiGE4yOTjwSA3Eh/ziJRQEmd/unYU+K27sk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c", + "rev": "d407951447dcd00442e97087bf374aad70c04cea", "type": "github" }, "original": { @@ -843,11 +811,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1783148766, - "narHash": "sha256-uslt2pqShTIXDdAHRHv2QkYLsVdY8Oqwz0EA48/RSM8=", + "lastModified": 1783856661, + "narHash": "sha256-ZGP04e+Q6WyQJGA9ZvI5CL6+heGQldbAG9U1T9NGvmU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a50de1b7d8a586adc18d2395c19de7d6058e6030", + "rev": "569d578509928497eddc3fdbf94a799027050be4", "type": "github" }, "original": { @@ -889,6 +857,22 @@ "type": "github" } }, + "nixpkgs_9": { + "locked": { + "lastModified": 1778869304, + "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d233902339c02a9c334e7e593de68855ad26c4cb", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "flake-parts": "flake-parts_3", @@ -919,11 +903,11 @@ ] }, "locked": { - "lastModified": 1783311000, - "narHash": "sha256-LtX2Q7kV2JvOI1HyQ4hgNffnu6RPh0yAkGPOw6S0GgI=", + "lastModified": 1784013028, + "narHash": "sha256-5omqKdhva8yt7/pXKeJUNJMaoCLOXFz5WT5AXP/C/pE=", "owner": "noctalia-dev", "repo": "noctalia", - "rev": "b6fd0df7a4d992a19acb7261be8b5b260f03e5d4", + "rev": "c22405c3c8f8e64ddfff3a737a7f22eb25425f69", "type": "github" }, "original": { @@ -960,23 +944,22 @@ "pre-commit": { "inputs": { "flake-compat": "flake-compat_3", - "gitignore": "gitignore", "nixpkgs": [ "lanzaboote", "nixpkgs" ] }, "locked": { - "lastModified": 1781733627, - "narHash": "sha256-U3yTuGBnmXvXoQI3qkpfEDsn9RovQPAjN7ndRco+3u0=", + "lastModified": 1783008725, + "narHash": "sha256-jGiy6+sxjNWXSjp25uoJuNfyH9zBK1PEDY0lVoL4ibQ=", "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "3bbec39bc90eadfa031e6f3b77272f3f60803e39", + "repo": "git-hooks.nix", + "rev": "bca82caa46d5ec0f5d422c61fb1e30bc51313cbe", "type": "github" }, "original": { "owner": "cachix", - "repo": "pre-commit-hooks.nix", + "repo": "git-hooks.nix", "type": "github" } }, @@ -1016,11 +999,11 @@ ] }, "locked": { - "lastModified": 1783144302, - "narHash": "sha256-NQnzmXwpEAd5tjMBh2+P/y9NknF+WHv5+6yoXoN4h/Y=", + "lastModified": 1783488441, + "narHash": "sha256-jmWf+H3iC/0z7/mmvTovaJx1E/LME1QyHkyk+AFfJPk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "fe5aee0952e8e1525533d61defd9e36513db811b", + "rev": "7dc3a177a239ed879c5581a80f6dc246c7e102f1", "type": "github" }, "original": { @@ -1064,6 +1047,25 @@ "type": "github" } }, + "soulver-cpp": { + "inputs": { + "nixpkgs": "nixpkgs_9", + "nixpkgs-libxml2": "nixpkgs-libxml2" + }, + "locked": { + "lastModified": 1783621734, + "narHash": "sha256-YBFO+aurlz2y2hTRN1Kl0RjX6JzHn0mYBmt4zb436Yg=", + "owner": "vicinaehq", + "repo": "soulver-cpp", + "rev": "00e926e2bd03118638c88981f6a67bfa107210c2", + "type": "github" + }, + "original": { + "owner": "vicinaehq", + "repo": "soulver-cpp", + "type": "github" + } + }, "stylix": { "inputs": { "base16": "base16", @@ -1084,11 +1086,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1783307741, - "narHash": "sha256-c/FqXr+r16WM3ad/o+fzDcDSnqmItPkMbbJ/9FhO81Q=", + "lastModified": 1783358511, + "narHash": "sha256-/F85cBWvU8b2hpawuCog464065ZTJtdMgVPWwJ9yHjE=", "owner": "nix-community", "repo": "stylix", - "rev": "9837fb7867cc0356d86e02c3398ea876d43826c1", + "rev": "14814ef555d8148ab82eba5054e654cd9eae3a1f", "type": "github" }, "original": { @@ -1324,14 +1326,15 @@ "vicinae": { "inputs": { "nixpkgs": "nixpkgs_8", + "soulver-cpp": "soulver-cpp", "systems": "systems_7" }, "locked": { - "lastModified": 1783292987, - "narHash": "sha256-UVJ8jCm09+lPIitdGPlSzioZaZayiqZgmA2ioOufRjM=", + "lastModified": 1783972265, + "narHash": "sha256-wALYzewjUgVZrxl9FQji4ZzBAT5CGTVlR+cFCD0G11U=", "owner": "vicinaehq", "repo": "vicinae", - "rev": "6dfc50a326a54a67d0daf76ce29fcd7ebc2652b5", + "rev": "94f9570f096a407d27e18073d1b01dae13c4d064", "type": "github" }, "original": { @@ -1408,11 +1411,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1781226823, - "narHash": "sha256-28696iIw8uE0ZUyFTtzhEM8xMh85clCYypMxkvUi+sc=", + "lastModified": 1783895132, + "narHash": "sha256-Dl0Gvrig3EpE962hzF3ETPhUztlfuRhcmlpd8ioHN54=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "8575d0ef55d70f9b4c46b6bffb3accf912217e1e", + "rev": "a2b5c635d8c8c99b286967658d0d177044887eb8", "type": "github" }, "original": { diff --git a/flake/formatter.nix b/flake/formatter.nix index e86b7d4..88a637e 100644 --- a/flake/formatter.nix +++ b/flake/formatter.nix @@ -4,32 +4,45 @@ inputs.treefmt-nix.flakeModule ]; - perSystem = _: { - treefmt = { - projectRootFile = "flake.nix"; - - programs = { - nixfmt.enable = true; - deadnix.enable = true; - statix.enable = true; - - shfmt.enable = true; - shellcheck.enable = true; - - prettier.enable = true; - yamlfmt.enable = true; - taplo.enable = true; - oxfmt.enable = true; + perSystem = + { system, ... }: + let + unstable = import inputs.nixpkgs-unstable { + inherit system; + config = { + allowUnfree = true; + }; }; + in + { + treefmt = { + projectRootFile = "flake.nix"; - settings = { - excludes = [ - ".git/**" - "*.lock" - ".direnv/**" - "*.age" - ]; + programs = { + nixfmt.enable = true; + deadnix.enable = true; + statix.enable = true; + + shfmt.enable = true; + shellcheck.enable = true; + + prettier = { + enable = true; + package = unstable.prettier; + }; + yamlfmt.enable = true; + taplo.enable = true; + oxfmt.enable = true; + }; + + settings = { + excludes = [ + ".git/**" + "*.lock" + ".direnv/**" + "*.age" + ]; + }; }; }; - }; } diff --git a/hosts/default.nix b/hosts/default.nix index fe54232..b023171 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -1,6 +1,5 @@ { inputs, - pkgs, config, lib, ... @@ -10,13 +9,6 @@ let username = "moons"; - unstable = import inputs.nixpkgs-unstable { - inherit (pkgs) system; - config = { - allowUnfree = true; - }; - }; - mkSystem = { host, @@ -24,6 +16,14 @@ let profiles ? [ ], extraModules ? [ ], }: + let + unstable = import inputs.nixpkgs-unstable { + inherit system; + config = { + allowUnfree = true; + }; + }; + in assert lib.assertMsg (lib.elem system config.systems) "mkSystem: system '${system}' not in valid systems: ${lib.generators.toPretty { } config.systems}"; nixosSystem { diff --git a/modules/applications/vim/home/default.nix b/modules/applications/vim/home/default.nix index a1307a7..6e7bbc5 100644 --- a/modules/applications/vim/home/default.nix +++ b/modules/applications/vim/home/default.nix @@ -1,5 +1,6 @@ { pkgs, + unstable, inputs, lib, config, @@ -47,7 +48,7 @@ in vscode-langservers-extracted tailwindcss-language-server prettierd - prettier + unstable.prettier biome stylua shfmt diff --git a/overlays/default.nix b/overlays/default.nix index b678359..b4508ad 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,6 +1,6 @@ { inputs, ... }: { flake.overlays = { - default = inputs.llm-agents.overlays.default; + default = inputs.llm-agents.overlays.shared-nixpkgs; }; }