From adc4eb27f4afaa1b004acf2f5312377b01bf831b Mon Sep 17 00:00:00 2001 From: Jeremy Wall Date: Tue, 8 Oct 2024 17:52:28 -0400 Subject: [PATCH] refactor: Use custom-flakes --- Makefile | 9 - nix/base-system/flake.lock | 528 +++++++++++++++++++++++++++---------- nix/base-system/flake.nix | 32 +-- 3 files changed, 399 insertions(+), 170 deletions(-) diff --git a/Makefile b/Makefile index e1c4dec..b26e9ef 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,5 @@ %-darwin: darwin-rebuild --flake ./nix/base-system $* -update-quint: - #curl -L https://raw.githubusercontent.com/informalsystems/quint/$*/quint/package.json > nix/packages/quint/package.json - #curl -L https://raw.githubusercontent.com/informalsystems/quint/$*/quint/package-lock.json > nix/packages/quint/package-lock.json - cd nix/packages/quint; nix run "nixpkgs#node2nix" -- -18 -i node-packages.json - #pactch the default.nix - #sed -e 's#inherit nodeEnv;#inherit nodeEnv quint-src;#' -e 's/, system/, quint-src, system/' -i '' nix/packages/quint/default.nix - #sed -e 's#src = \./\.#src = "$${quint-src}/quint"#' -e 's#nodeEnv, #quint-src, nodeEnv, #' -i '' nix/packages/quint/node-packages.nix - #rm -f nix/packages/quint/package*.json - update-input-%: nix flake lock --update-input $* ./nix/base-system/ diff --git a/nix/base-system/flake.lock b/nix/base-system/flake.lock index c26a5fb..2456c4d 100644 --- a/nix/base-system/flake.lock +++ b/nix/base-system/flake.lock @@ -44,6 +44,33 @@ "type": "github" } }, + "custom-flakes": { + "inputs": { + "d2-vim-src": "d2-vim-src", + "flake-utils": "flake-utils_3", + "neogit-src": "neogit-src", + "nil-flake": "nil-flake", + "nixpkgs": [ + "nixpkgs" + ], + "nurl-flake": "nurl-flake", + "roslyn-lsp": "roslyn-lsp", + "treesitter-context": "treesitter-context" + }, + "locked": { + "lastModified": 1728423355, + "narHash": "sha256-purHXipPRWJAxFAjRevkbq4mtoOqGTzdpql/ifzDiw8=", + "owner": "zaphar", + "repo": "nix-flakes", + "rev": "a489c4f6818b31b1839463735cd3be07dcccb5da", + "type": "github" + }, + "original": { + "owner": "zaphar", + "repo": "nix-flakes", + "type": "github" + } + }, "d2-vim-src": { "flake": false, "locked": { @@ -60,6 +87,22 @@ "type": "github" } }, + "d2-vim-src_2": { + "flake": false, + "locked": { + "lastModified": 1675176182, + "narHash": "sha256-+mT4pEbtq7f9ZXhOop3Jnjr7ulxU32VtahffIwQqYF4=", + "owner": "terrastruct", + "repo": "d2-vim", + "rev": "981c87dccb63df2887cc41b96e84bf550f736c57", + "type": "github" + }, + "original": { + "owner": "terrastruct", + "repo": "d2-vim", + "type": "github" + } + }, "darwin": { "inputs": { "nixpkgs": [ @@ -105,7 +148,7 @@ "durnitisp-flake": { "inputs": { "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_5", "naersk": "naersk_2" }, "locked": { @@ -221,8 +264,41 @@ } }, "flake-utils_10": { + "locked": { + "lastModified": 1649676176, + "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_11": { "inputs": { - "systems": "systems_8" + "systems": "systems_9" + }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_12": { + "inputs": { + "systems": "systems_10" }, "locked": { "lastModified": 1681202837, @@ -257,12 +333,15 @@ } }, "flake-utils_3": { + "inputs": { + "systems": "systems_3" + }, "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -272,45 +351,9 @@ } }, "flake-utils_4": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_5": { "inputs": { "systems": "systems_4" }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_6": { - "inputs": { - "systems": "systems_5" - }, "locked": { "lastModified": 1710146030, "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", @@ -325,16 +368,49 @@ "type": "github" } }, + "flake-utils_5": { + "locked": { + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_6": { + "inputs": { + "systems": "systems_5" + }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "flake-utils_7": { "inputs": { "systems": "systems_6" }, "locked": { - "lastModified": 1687709756, - "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "owner": "numtide", "repo": "flake-utils", - "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "type": "github" }, "original": { @@ -344,12 +420,15 @@ } }, "flake-utils_8": { + "inputs": { + "systems": "systems_7" + }, "locked": { - "lastModified": 1649676176, - "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -360,14 +439,14 @@ }, "flake-utils_9": { "inputs": { - "systems": "systems_7" + "systems": "systems_8" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1687709756, + "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", "type": "github" }, "original": { @@ -417,10 +496,10 @@ "heracles-flake": { "inputs": { "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_6", "naersk": "naersk_3", - "nixpkgs": "nixpkgs_5", - "rust-overlay": "rust-overlay_2" + "nixpkgs": "nixpkgs_7", + "rust-overlay": "rust-overlay_3" }, "locked": { "lastModified": 1716397295, @@ -493,7 +572,7 @@ }, "naersk_2": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1671096816, @@ -511,7 +590,7 @@ }, "naersk_3": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1698420672, @@ -529,7 +608,7 @@ }, "naersk_4": { "inputs": { - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_12" }, "locked": { "lastModified": 1650101877, @@ -546,6 +625,22 @@ } }, "neogit-src": { + "flake": false, + "locked": { + "lastModified": 1728420708, + "narHash": "sha256-8tnWF7gmIzuXN4W/Z3Xy4ID6Y+lMU14UfrZdXYoYSXo=", + "owner": "NeogitOrg", + "repo": "neogit", + "rev": "a8dd1509a7fc6bf92ca60f21e33393f685ab70aa", + "type": "github" + }, + "original": { + "owner": "NeogitOrg", + "repo": "neogit", + "type": "github" + } + }, + "neogit-src_2": { "flake": false, "locked": { "lastModified": 1717188866, @@ -563,8 +658,8 @@ }, "neovim-flake": { "inputs": { - "flake-utils": "flake-utils_6", - "nixpkgs": "nixpkgs_6" + "flake-utils": "flake-utils_8", + "nixpkgs": "nixpkgs_8" }, "locked": { "dir": "contrib", @@ -585,9 +680,29 @@ }, "nil-flake": { "inputs": { - "flake-utils": "flake-utils_7", - "nixpkgs": "nixpkgs_7", - "rust-overlay": "rust-overlay_3" + "flake-utils": "flake-utils_4", + "nixpkgs": "nixpkgs_3", + "rust-overlay": "rust-overlay_2" + }, + "locked": { + "lastModified": 1726716330, + "narHash": "sha256-mIuOP4I51eFLquRaxMKx67pHmhatZrcVPjfHL98v/M8=", + "owner": "oxalica", + "repo": "nil", + "rev": "c8e8ce72442a164d89d3fdeaae0bcc405f8c015a", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "nil", + "type": "github" + } + }, + "nil-flake_2": { + "inputs": { + "flake-utils": "flake-utils_9", + "nixpkgs": "nixpkgs_9", + "rust-overlay": "rust-overlay_4" }, "locked": { "lastModified": 1694177726, @@ -636,6 +751,38 @@ } }, "nixpkgs_10": { + "locked": { + "lastModified": 1717179513, + "narHash": "sha256-vboIEwIQojofItm2xGCdZCzW96U85l9nDW3ifMuAIdM=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "63dacb46bf939521bdc93981b4cbb7ecb58427a0", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { + "locked": { + "lastModified": 1689850295, + "narHash": "sha256-fUYf6WdQlhd2H+3aR8jST5dhFH1d0eE22aes8fNIfyk=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "5df4d78d54f7a34e9ea1f84a22b4fd9baebc68d0", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_12": { "locked": { "lastModified": 1650109093, "narHash": "sha256-tqlnKrAdJktRLXTou9le0oTqrYBAFpGscV5RADdpArU=", @@ -649,7 +796,7 @@ "type": "indirect" } }, - "nixpkgs_11": { + "nixpkgs_13": { "locked": { "lastModified": 1682109806, "narHash": "sha256-d9g7RKNShMLboTWwukM+RObDWWpHKaqTYXB48clBWXI=", @@ -680,6 +827,38 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1726481836, + "narHash": "sha256-MWTBH4dd5zIz2iatDb8IkqSjIeFum9jAqkFxgHLdzO4=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "20f9370d5f588fb8c72e844c54511cab054b5f40", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1708296515, + "narHash": "sha256-FyF489fYNAUy7b6dkYV6rGPyzp+4tThhr80KNAaF/yY=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "b98a4e1746acceb92c509bc496ef3d0e5ad8d4aa", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { "locked": { "lastModified": 1678724065, "narHash": "sha256-MjeRjunqfGTBGU401nxIjs7PC9PZZ1FBCZp/bRB3C2M=", @@ -693,35 +872,35 @@ "type": "indirect" } }, - "nixpkgs_4": { - "locked": { - "lastModified": 1708151420, - "narHash": "sha256-MGT/4aGCWQPQiu6COqJdCj9kSpLPiShgbwpbC38YXC8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6e2f00c83911461438301db0dba5281197fe4b3a", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1708151420, - "narHash": "sha256-MGT/4aGCWQPQiu6COqJdCj9kSpLPiShgbwpbC38YXC8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6e2f00c83911461438301db0dba5281197fe4b3a", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, "nixpkgs_6": { + "locked": { + "lastModified": 1708151420, + "narHash": "sha256-MGT/4aGCWQPQiu6COqJdCj9kSpLPiShgbwpbC38YXC8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "6e2f00c83911461438301db0dba5281197fe4b3a", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_7": { + "locked": { + "lastModified": 1708151420, + "narHash": "sha256-MGT/4aGCWQPQiu6COqJdCj9kSpLPiShgbwpbC38YXC8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "6e2f00c83911461438301db0dba5281197fe4b3a", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_8": { "locked": { "lastModified": 1715787315, "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=", @@ -737,7 +916,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_9": { "locked": { "lastModified": 1690441914, "narHash": "sha256-Ac+kJQ5z9MDAMyzSc0i0zJDx2i3qi9NjlW5Lz285G/I=", @@ -753,41 +932,27 @@ "type": "github" } }, - "nixpkgs_8": { - "locked": { - "lastModified": 1717179513, - "narHash": "sha256-vboIEwIQojofItm2xGCdZCzW96U85l9nDW3ifMuAIdM=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "63dacb46bf939521bdc93981b4cbb7ecb58427a0", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_9": { - "locked": { - "lastModified": 1689850295, - "narHash": "sha256-fUYf6WdQlhd2H+3aR8jST5dhFH1d0eE22aes8fNIfyk=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "5df4d78d54f7a34e9ea1f84a22b4fd9baebc68d0", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nurl-flake": { "inputs": { - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_4" + }, + "locked": { + "lastModified": 1726505596, + "narHash": "sha256-WAFqmlsShuQngk6LMFlgz7Oyc41TAQeTa/49phhRizY=", + "owner": "nix-community", + "repo": "nurl", + "rev": "3a3ba7f0d14d92e1266395d826c6e229797d0044", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nurl", + "type": "github" + } + }, + "nurl-flake_2": { + "inputs": { + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1701273941, @@ -807,26 +972,44 @@ "inputs": { "agenix-flake": "agenix-flake", "clio-flake": "clio-flake", - "d2-vim-src": "d2-vim-src", + "custom-flakes": "custom-flakes", + "d2-vim-src": "d2-vim-src_2", "darwin": "darwin_2", "durnitisp-flake": "durnitisp-flake", "harpoon-src": "harpoon-src", "heracles-flake": "heracles-flake", - "neogit-src": "neogit-src", + "neogit-src": "neogit-src_2", "neovim-flake": "neovim-flake", - "nil-flake": "nil-flake", - "nixpkgs": "nixpkgs_8", + "nil-flake": "nil-flake_2", + "nixpkgs": "nixpkgs_10", "nixpkgs-darwin": "nixpkgs-darwin", - "nurl-flake": "nurl-flake", - "roslyn-lsp": "roslyn-lsp", + "nurl-flake": "nurl-flake_2", + "roslyn-lsp": "roslyn-lsp_2", "runwhen-flake": "runwhen-flake", "rust-overlay-flake": "rust-overlay-flake", "sile-flake": "sile-flake", - "treesitter-context": "treesitter-context", + "treesitter-context": "treesitter-context_2", "unstable": "unstable" } }, "roslyn-lsp": { + "flake": false, + "locked": { + "lastModified": 1715956271, + "narHash": "sha256-Oavfpsn8ftoZURoirKBseuHkQHOHFxMY9LxdjwjV6Vc=", + "owner": "zaphar", + "repo": "roslyn.nvim", + "rev": "dc6bcd9ddd846b123cd1c1f34b0d95a487a4ef85", + "type": "github" + }, + "original": { + "owner": "zaphar", + "ref": "main", + "repo": "roslyn.nvim", + "type": "github" + } + }, + "roslyn-lsp_2": { "flake": false, "locked": { "lastModified": 1715955799, @@ -846,7 +1029,7 @@ "runwhen-flake": { "inputs": { "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_8", + "flake-utils": "flake-utils_10", "naersk": "naersk_4" }, "locked": { @@ -888,7 +1071,7 @@ }, "rust-overlay-flake": { "inputs": { - "flake-utils": "flake-utils_9", + "flake-utils": "flake-utils_11", "nixpkgs": [ "nixpkgs" ] @@ -909,7 +1092,29 @@ }, "rust-overlay_2": { "inputs": { - "flake-utils": "flake-utils_5", + "nixpkgs": [ + "custom-flakes", + "nil-flake", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1726453838, + "narHash": "sha256-pupsow4L79SBfNwT6vh/5RAbVZuhngIA0RTCZksXmZY=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "ca2e79cd22625d214b8437c2c4080ce79bd9f7d2", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_3": { + "inputs": { + "flake-utils": "flake-utils_7", "nixpkgs": [ "heracles-flake", "nixpkgs" @@ -930,7 +1135,7 @@ "type": "github" } }, - "rust-overlay_3": { + "rust-overlay_4": { "inputs": { "flake-utils": [ "nil-flake", @@ -958,10 +1163,10 @@ "sile-flake": { "inputs": { "flake-compat": "flake-compat_5", - "flake-utils": "flake-utils_10", + "flake-utils": "flake-utils_12", "gitignore": "gitignore", "libtexpdf-src": "libtexpdf-src", - "nixpkgs": "nixpkgs_11" + "nixpkgs": "nixpkgs_13" }, "locked": { "lastModified": 1694595810, @@ -992,6 +1197,21 @@ "type": "github" } }, + "systems_10": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -1097,6 +1317,21 @@ "type": "github" } }, + "systems_9": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "treesitter-context": { "flake": false, "locked": { @@ -1114,6 +1349,23 @@ "type": "github" } }, + "treesitter-context_2": { + "flake": false, + "locked": { + "lastModified": 1693236978, + "narHash": "sha256-B6BXeFEWxTFf46JrlatsxEQcC6+/hPIDBb5cIcJpLZg=", + "owner": "nvim-treesitter", + "repo": "nvim-treesitter-context", + "rev": "e6b743ccd4e780bc9cd85b707de67df72eea1a23", + "type": "github" + }, + "original": { + "owner": "nvim-treesitter", + "repo": "nvim-treesitter-context", + "rev": "e6b743ccd4e780bc9cd85b707de67df72eea1a23", + "type": "github" + } + }, "unstable": { "locked": { "lastModified": 1728279793, diff --git a/nix/base-system/flake.nix b/nix/base-system/flake.nix index e1b54ce..b9ab578 100644 --- a/nix/base-system/flake.nix +++ b/nix/base-system/flake.nix @@ -36,6 +36,10 @@ #inputs.nixpkgs.follows = "nixpkgs"; }; + custom-flakes = { + url = "github:zaphar/nix-flakes"; + inputs.nixpkgs.follows = "nixpkgs"; + }; harpoon-src = { url = "github:ThePrimeagen/harpoon/harpoon2"; flake = false; @@ -70,11 +74,7 @@ nil-flake, nurl-flake, harpoon-src, - neogit-src, - d2-vim-src, - treesitter-context, - roslyn-lsp, - #lean4-flake, + custom-flakes, unstable, heracles-flake, neovim-flake, @@ -96,24 +96,10 @@ version = "2024-01-28"; src = harpoon-src; }; - neogit-nvim = pkgs.vimUtils.buildVimPlugin { - pname = "neogit"; - version = "2024-05-16"; - src = neogit-src; - }; - d2-vim = pkgs.vimUtils.buildVimPlugin { - pname = "d2-nvim"; - version = "2024-01-28"; - src = d2-vim-src; - }; - nvim-treesitter-context = pkgs.vimUtils.buildVimPlugin { - name = "nvim-treesitter-context"; - src = treesitter-context; - }; - roslyn-nvim = pkgs.vimUtils.buildVimPlugin { - name = "roslyn-nvim"; - src = roslyn-lsp; - }; + neogit-nvim = custom-flakes.packages."${system}".neogit-nvim; + d2-vim = custom-flakes.packages."${system}".d2-vim; + nvim-treesitter-context = custom-flakes.packages."${system}".nvim-treesitter-context; + roslyn-nvim = custom-flakes.packages."${system}".roslyn-nvim; nvim = neovim-flake.packages."${system}".neovim; # TODO(jwall): When this actually builds we should use it. #nvim-treesitter-powershell = pkgs.callPackage ./nvim-powershell.nix {