From 1fff2c98acbc9ea9b3b1e663b354923c86e7a4e7 Mon Sep 17 00:00:00 2001 From: Daniel Kempkens Date: Wed, 12 Jun 2024 18:00:48 +0200 Subject: [PATCH] neovim: use nightly --- flake.lock | 107 ++++++++++++++++++++++++++++++++- flake.nix | 9 +++ home/programs/nvim/default.nix | 2 +- system/flakes/Styx.nix | 1 + system/flakes/argon.nix | 4 +- system/flakes/mediaserver.nix | 5 +- system/flakes/neon.nix | 5 +- system/flakes/tanker.nix | 4 +- 8 files changed, 125 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index d9686dc..3dd3d71 100644 --- a/flake.lock +++ b/flake.lock @@ -125,6 +125,22 @@ "type": "github" } }, + "flake-compat_3": { + "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-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -143,6 +159,27 @@ "type": "github" } }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "neovim-nightly-overlay", + "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-root": { "locked": { "lastModified": 1713493429, @@ -194,6 +231,28 @@ "type": "github" } }, + "hercules-ci-effects": { + "inputs": { + "flake-parts": "flake-parts_2", + "nixpkgs": [ + "neovim-nightly-overlay", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1718018037, + "narHash": "sha256-03rLBd/lKecgaKz0j5ESUf9lDn5R0SJatZTKLL5unWE=", + "owner": "hercules-ci", + "repo": "hercules-ci-effects", + "rev": "0ab08b23ce3c3f75fe9a5598756b6fb8bcf0b414", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "hercules-ci-effects", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -234,6 +293,51 @@ "type": "github" } }, + "neovim-nightly-overlay": { + "inputs": { + "flake-compat": "flake-compat_2", + "flake-parts": [ + "flake-parts" + ], + "git-hooks": [ + "pre-commit-hooks-nix" + ], + "hercules-ci-effects": "hercules-ci-effects", + "neovim-src": "neovim-src", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1718090902, + "narHash": "sha256-XlFgIhunVheMVT5hv+Ov7wkjFldqqOWsRleYQHrgWQY=", + "owner": "nix-community", + "repo": "neovim-nightly-overlay", + "rev": "60a8a1b221308566c51aa9a66e11145a3f141fc8", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "neovim-nightly-overlay", + "type": "github" + } + }, + "neovim-src": { + "flake": false, + "locked": { + "lastModified": 1718038388, + "narHash": "sha256-npcA3yWucHF5uKKqcrSLJAy0hk3tTxfVCo/Da/Z4OOM=", + "owner": "neovim", + "repo": "neovim", + "rev": "37bf4c572a8fa20dc4a8433524ecc8c8d68fe53c", + "type": "github" + }, + "original": { + "owner": "neovim", + "repo": "neovim", + "type": "github" + } + }, "nifoc-overlay": { "inputs": { "flake-parts": [ @@ -371,7 +475,7 @@ }, "pre-commit-hooks-nix": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "gitignore": "gitignore", "nixpkgs": [ "nixpkgs" @@ -401,6 +505,7 @@ "flake-root": "flake-root", "home-manager": "home-manager", "mkalias": "mkalias", + "neovim-nightly-overlay": "neovim-nightly-overlay", "nifoc-overlay": "nifoc-overlay", "nix-darwin": "nix-darwin", "nixos-hardware": "nixos-hardware", diff --git a/flake.nix b/flake.nix index 8fdddda..edf1bbd 100644 --- a/flake.nix +++ b/flake.nix @@ -53,6 +53,15 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + neovim-nightly-overlay = { + url = "github:nix-community/neovim-nightly-overlay"; + inputs = { + nixpkgs.follows = "nixpkgs"; + flake-parts.follows = "flake-parts"; + git-hooks.follows = "pre-commit-hooks-nix"; + }; + }; + nifoc-overlay = { url = "git+https://git.kempkens.io/daniel/nix-overlay"; inputs = { diff --git a/home/programs/nvim/default.nix b/home/programs/nvim/default.nix index 894afe1..7302c38 100644 --- a/home/programs/nvim/default.nix +++ b/home/programs/nvim/default.nix @@ -7,7 +7,7 @@ in { programs.neovim = { enable = true; - package = pkgs.neovim-unwrapped; + package = pkgs.neovim; defaultEditor = true; diff --git a/system/flakes/Styx.nix b/system/flakes/Styx.nix index 1cbb48c..44bb4d8 100644 --- a/system/flakes/Styx.nix +++ b/system/flakes/Styx.nix @@ -10,6 +10,7 @@ let overlays = [ overlay-x86 agenix.overlays.default + inputs.neovim-nightly-overlay.overlays.default inputs.nifoc-overlay.overlay overlay-mkalias ]; diff --git a/system/flakes/argon.nix b/system/flakes/argon.nix index 2471d84..ff88e21 100644 --- a/system/flakes/argon.nix +++ b/system/flakes/argon.nix @@ -3,11 +3,11 @@ let default-system = "aarch64-linux"; - overlay-nifoc = inputs.nifoc-overlay.overlay; nixpkgsConfig = { overlays = [ - overlay-nifoc + inputs.neovim-nightly-overlay.overlays.default + inputs.nifoc-overlay.overlay ]; config = { diff --git a/system/flakes/mediaserver.nix b/system/flakes/mediaserver.nix index f84fb61..5d927e3 100644 --- a/system/flakes/mediaserver.nix +++ b/system/flakes/mediaserver.nix @@ -3,11 +3,10 @@ let default-system = "x86_64-linux"; - overlay-nifoc = inputs.nifoc-overlay.overlay; - nixpkgsConfig = { overlays = [ - overlay-nifoc + inputs.neovim-nightly-overlay.overlays.default + inputs.nifoc-overlay.overlay ]; config = { diff --git a/system/flakes/neon.nix b/system/flakes/neon.nix index 680e39b..fbc084e 100644 --- a/system/flakes/neon.nix +++ b/system/flakes/neon.nix @@ -3,11 +3,10 @@ let default-system = "aarch64-linux"; - overlay-nifoc = inputs.nifoc-overlay.overlay; - nixpkgsConfig = { overlays = [ - overlay-nifoc + inputs.neovim-nightly-overlay.overlays.default + inputs.nifoc-overlay.overlay ]; config = { diff --git a/system/flakes/tanker.nix b/system/flakes/tanker.nix index e82e9ff..dba3a38 100644 --- a/system/flakes/tanker.nix +++ b/system/flakes/tanker.nix @@ -5,13 +5,13 @@ let # overlay-master = _: _: { pkgs-master = import inputs.nixpkgs-master { system = default-system; }; }; # overlay-unstable = _: _: { pkgs-unstable = import inputs.nixpkgs { system = default-system; }; }; - overlay-nifoc = inputs.nifoc-overlay.overlay; nixpkgsConfig = { overlays = [ # overlay-master # overlay-unstable - overlay-nifoc + inputs.neovim-nightly-overlay.overlays.default + inputs.nifoc-overlay.overlay ]; config = {