From f860dbb4cf85968357d200b7bbfdf4f4333ca578 Mon Sep 17 00:00:00 2001 From: Will Ruggiano Date: Fri, 24 May 2024 15:38:38 -0600 Subject: [PATCH] feat: switch to neovim-nightly-overlay --- flake.lock | 289 +++++++++++++++++++++++++++++++++++++++++++---------- flake.nix | 10 +- 2 files changed, 240 insertions(+), 59 deletions(-) diff --git a/flake.lock b/flake.lock index 17db289..7424128 100644 --- a/flake.lock +++ b/flake.lock @@ -163,7 +163,7 @@ }, "dream2nix_2": { "inputs": { - "nixpkgs": "nixpkgs_12", + "nixpkgs": "nixpkgs_13", "purescript-overlay": "purescript-overlay", "pyproject-nix": "pyproject-nix" }, @@ -230,6 +230,38 @@ } }, "flake-compat_4": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_5": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_6": { "flake": false, "locked": { "lastModified": 1673956053, @@ -245,7 +277,7 @@ "type": "github" } }, - "flake-compat_5": { + "flake-compat_7": { "flake": false, "locked": { "lastModified": 1673956053, @@ -261,7 +293,7 @@ "type": "github" } }, - "flake-compat_6": { + "flake-compat_8": { "flake": false, "locked": { "lastModified": 1673956053, @@ -295,6 +327,48 @@ } }, "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "neovim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1715865404, + "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_3": { + "inputs": { + "nixpkgs-lib": [ + "neovim", + "hercules-ci-effects", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "type": "github" + }, + "original": { + "id": "flake-parts", + "type": "indirect" + } + }, + "flake-parts_4": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_3" }, @@ -493,6 +567,28 @@ } }, "gitignore_2": { + "inputs": { + "nixpkgs": [ + "neovim", + "pre-commit-hooks", + "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" + } + }, + "gitignore_3": { "inputs": { "nixpkgs": [ "neovim-nix", @@ -514,7 +610,7 @@ "type": "github" } }, - "gitignore_3": { + "gitignore_4": { "inputs": { "nixpkgs": [ "sg-nvim", @@ -536,7 +632,7 @@ "type": "github" } }, - "gitignore_4": { + "gitignore_5": { "inputs": { "nixpkgs": [ "zls", @@ -557,6 +653,28 @@ "type": "github" } }, + "hercules-ci-effects": { + "inputs": { + "flake-parts": "flake-parts_3", + "nixpkgs": [ + "neovim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1713898448, + "narHash": "sha256-6q6ojsp/Z9P2goqnxyfCSzFOD92T3Uobmj8oVAicUOs=", + "owner": "hercules-ci", + "repo": "hercules-ci-effects", + "rev": "c0302ec12d569532a6b6bd218f698bc402e93adc", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "hercules-ci-effects", + "type": "github" + } + }, "langref": { "flake": false, "locked": { @@ -606,7 +724,7 @@ "crane": "crane", "dream2nix": "dream2nix", "mk-naked-shell": "mk-naked-shell", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_9", "parts": "parts", "rust-overlay": "rust-overlay_2", "treefmt": "treefmt" @@ -626,19 +744,25 @@ } }, "neovim": { - "flake": false, + "inputs": { + "flake-compat": "flake-compat_4", + "flake-parts": "flake-parts_2", + "hercules-ci-effects": "hercules-ci-effects", + "neovim-src": "neovim-src", + "nixpkgs": "nixpkgs_4", + "pre-commit-hooks": "pre-commit-hooks" + }, "locked": { - "lastModified": 1716180177, - "narHash": "sha256-C7xF6ifT9UJZuFVAxNHzAzqO4ay35ab1BFMkE8R/XfQ=", - "owner": "neovim", - "repo": "neovim", - "rev": "0e187fe038c76e822353e7fb0fd96e860e5ab3ef", + "lastModified": 1716561825, + "narHash": "sha256-v9V74Xd1/n0n/1eB3gZ+LqcOCurWqTfBum5azqjWMII=", + "owner": "nix-community", + "repo": "neovim-nightly-overlay", + "rev": "d83afee1f19108100bd2fef1f86d87d2942d734d", "type": "github" }, "original": { - "owner": "neovim", - "ref": "nightly", - "repo": "neovim", + "owner": "nix-community", + "repo": "neovim-nightly-overlay", "type": "github" } }, @@ -648,7 +772,7 @@ "flake-parts" ], "lazy-nvim": "lazy-nvim", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "pre-commit-nix": "pre-commit-nix" }, "locked": { @@ -665,10 +789,26 @@ "type": "github" } }, + "neovim-src": { + "flake": false, + "locked": { + "lastModified": 1716585586, + "narHash": "sha256-fVzSBv4xoD+cfTxcHbkOEco8pS0jWe3TWtvmDlCxabY=", + "owner": "neovim", + "repo": "neovim", + "rev": "06347a64cac5e33574713a59ace9d1d0ea4b6f82", + "type": "github" + }, + "original": { + "owner": "neovim", + "repo": "neovim", + "type": "github" + } + }, "nil": { "inputs": { "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "rust-overlay": "rust-overlay" }, "locked": { @@ -923,6 +1063,22 @@ } }, "nixpkgs_10": { + "locked": { + "lastModified": 1696419054, + "narHash": "sha256-EdR+dIKCfqL3voZUDYwcvgRDOektQB9KbhBVcE0/3Mo=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "7131f3c223a2d799568e4b278380cd9dac2b8579", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { "locked": { "lastModified": 1689261696, "narHash": "sha256-LzfUtFs9MQRvIoQ3MfgSuipBVMXslMPH/vZ+nM40LkA=", @@ -938,7 +1094,7 @@ "type": "github" } }, - "nixpkgs_11": { + "nixpkgs_12": { "locked": { "lastModified": 1681358109, "narHash": "sha256-eKyxW4OohHQx9Urxi7TQlFBTDWII+F+x2hklDOQPB50=", @@ -954,7 +1110,7 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_13": { "locked": { "lastModified": 1702272962, "narHash": "sha256-D+zHwkwPc6oYQ4G3A1HuadopqRwUY/JkMwHz1YF7j4Q=", @@ -970,7 +1126,7 @@ "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_14": { "locked": { "lastModified": 1715668745, "narHash": "sha256-xp62OkRkbUDNUc6VSqH02jB0FbOS+MsfMb7wL1RJOfA=", @@ -1019,6 +1175,22 @@ } }, "nixpkgs_4": { + "locked": { + "lastModified": 1716451822, + "narHash": "sha256-0lT5RVelqN+dgXWWneXvV5ufSksW0r0TDQi8O6U2+o8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3305b2b25e4ae4baee872346eae133cf6f611783", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3305b2b25e4ae4baee872346eae133cf6f611783", + "type": "github" + } + }, + "nixpkgs_5": { "locked": { "lastModified": 1706683685, "narHash": "sha256-FtPPshEpxH/ewBOsdKBNhlsL2MLEFv1hEnQ19f/bFsQ=", @@ -1034,7 +1206,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1671271357, "narHash": "sha256-xRJdLbWK4v2SewmSStYrcLa0YGJpleufl44A19XSW8k=", @@ -1050,7 +1222,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1714314149, "narHash": "sha256-yNAevSKF4krRWacmLUsLK7D7PlfuY3zF0lYnGYNi9vQ=", @@ -1066,7 +1238,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1716190602, "narHash": "sha256-xYRimrR0duWvokWQEvB87bSsICeCvvX9DxpUOzCfsDE=", @@ -1082,7 +1254,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1696193975, "narHash": "sha256-mnQjUcYgp9Guu3RNVAB2Srr1TqKcPpRXmJf4LJk6KRY=", @@ -1098,22 +1270,6 @@ "type": "github" } }, - "nixpkgs_9": { - "locked": { - "lastModified": 1696419054, - "narHash": "sha256-EdR+dIKCfqL3voZUDYwcvgRDOektQB9KbhBVcE0/3Mo=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "7131f3c223a2d799568e4b278380cd9dac2b8579", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "parts": { "inputs": { "nixpkgs-lib": [ @@ -1161,12 +1317,39 @@ "type": "github" } }, + "pre-commit-hooks": { + "inputs": { + "flake-compat": "flake-compat_5", + "gitignore": "gitignore_2", + "nixpkgs": [ + "neovim", + "nixpkgs" + ], + "nixpkgs-stable": [ + "neovim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1716213921, + "narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, "pre-commit-nix": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_6", "flake-utils": "flake-utils_2", - "gitignore": "gitignore_2", - "nixpkgs": "nixpkgs_5", + "gitignore": "gitignore_3", + "nixpkgs": "nixpkgs_6", "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { @@ -1185,10 +1368,10 @@ }, "pre-commit-nix_2": { "inputs": { - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_7", "flake-utils": "flake-utils_4", - "gitignore": "gitignore_3", - "nixpkgs": "nixpkgs_10", + "gitignore": "gitignore_4", + "nixpkgs": "nixpkgs_11", "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { @@ -1254,7 +1437,7 @@ "neovim-nix": "neovim-nix", "nil": "nil", "nix-colors": "nix-colors", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "sg-nvim": "sg-nvim", "vscode-js-debug": "vscode-js-debug", "zls": "zls" @@ -1304,7 +1487,7 @@ "rust-overlay_3": { "inputs": { "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_11" + "nixpkgs": "nixpkgs_12" }, "locked": { "lastModified": 1696558324, @@ -1322,9 +1505,9 @@ }, "sg-nvim": { "inputs": { - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts_4", "nci": "nci", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_10", "pre-commit-nix": "pre-commit-nix_2", "rust-overlay": "rust-overlay_3" }, @@ -1503,7 +1686,7 @@ }, "zig-overlay": { "inputs": { - "flake-compat": "flake-compat_6", + "flake-compat": "flake-compat_8", "flake-utils": "flake-utils_8", "nixpkgs": [ "zls", @@ -1527,9 +1710,9 @@ "zls": { "inputs": { "flake-utils": "flake-utils_7", - "gitignore": "gitignore_4", + "gitignore": "gitignore_5", "langref": "langref", - "nixpkgs": "nixpkgs_13", + "nixpkgs": "nixpkgs_14", "zig-overlay": "zig-overlay" }, "locked": { diff --git a/flake.nix b/flake.nix index 35b25ad..a8e43fd 100644 --- a/flake.nix +++ b/flake.nix @@ -6,11 +6,7 @@ url = "github:willruggiano/neovim.nix"; inputs.flake-parts.follows = "flake-parts"; }; - neovim = { - # https://github.com/nix-community/neovim-nightly-overlay/pull/483 - url = "github:neovim/neovim/nightly"; - flake = false; - }; + neovim.url = "github:nix-community/neovim-nightly-overlay"; nil.url = "github:oxalica/nil"; nix-colors.url = "github:misterio77/nix-colors"; nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; @@ -24,10 +20,12 @@ nixConfig = { extra-substituters = [ "https://devenv.cachix.org" + "https://nix-community.cachix.org" "https://willruggiano.cachix.org" ]; extra-trusted-public-keys = [ "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw=" + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "willruggiano.cachix.org-1:rz00ME8/uQfWe+tN3njwK5vc7P8GLWu9qbAjjJbLoSw=" ]; }; @@ -115,7 +113,7 @@ meta.mainProgram = "nvim"; }; luafun = pkgs.luajit.pkgs.callPackage ./pkgs/luafun.nix {}; - neovim-nightly = pkgs.callPackage ./pkgs/neovim {inherit inputs;}; + neovim-nightly = inputs'.neovim.packages.default; nvim = config.neovim.final; nvim-dbee = pkgs.callPackage ./pkgs/nvim-dbee.nix {}; nvim-treesitter = pkgs.callPackage ./pkgs/nvim-treesitter {};