diff options
| -rw-r--r-- | flake.lock | 117 | ||||
| -rw-r--r-- | flake.nix | 4 | ||||
| -rw-r--r-- | home/default.nix | 7 | ||||
| -rw-r--r-- | home/profiles/base/default.nix | 2 |
4 files changed, 117 insertions, 13 deletions
diff --git a/flake.lock b/flake.lock index d8added..8e00501 100644 --- a/flake.lock +++ b/flake.lock @@ -46,6 +46,64 @@ "type": "github" } }, + "flake-compat_2": { + "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": [ + "neovim-nightly", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1698882062, + "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "neovim-nightly", + "hercules-ci-effects", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1696343447, + "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", + "type": "github" + }, + "original": { + "id": "flake-parts", + "type": "indirect" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -125,6 +183,28 @@ "type": "github" } }, + "hercules-ci-effects": { + "inputs": { + "flake-parts": "flake-parts_2", + "nixpkgs": [ + "neovim-nightly", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1699381651, + "narHash": "sha256-mZlQ54xJs3j5+SJrLhzePPMXzS+Czbx7gNyOnOAQrHA=", + "owner": "hercules-ci", + "repo": "hercules-ci-effects", + "rev": "0bd99f5ab7ec7a74c11238bd02bb29e709c14328", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "hercules-ci-effects", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -160,20 +240,21 @@ "type": "github" } }, - "neovim": { + "neovim-flake": { "inputs": { "flake-utils": "flake-utils_2", "nixpkgs": [ - "unstable" + "neovim-nightly", + "nixpkgs" ] }, "locked": { "dir": "contrib", - "lastModified": 1697844079, - "narHash": "sha256-IJb1Xo5GdtCg0/CiWx+eq1R8r83oW9Gl5i88IdkWGa4=", + "lastModified": 1699746685, + "narHash": "sha256-/BeNzxL3Frp/7uYIQLM47LSmGawlUB/jeqequyXTpjc=", "owner": "neovim", "repo": "neovim", - "rev": "7a6e27958a80b3aebb1335b78aa81c26c79b7f37", + "rev": "c23dd7c9eff035d92830bb33eb9644d946a65d92", "type": "github" }, "original": { @@ -183,6 +264,30 @@ "type": "github" } }, + "neovim-nightly": { + "inputs": { + "flake-compat": "flake-compat_2", + "flake-parts": "flake-parts", + "hercules-ci-effects": "hercules-ci-effects", + "neovim-flake": "neovim-flake", + "nixpkgs": [ + "unstable" + ] + }, + "locked": { + "lastModified": 1699747456, + "narHash": "sha256-oKPRFBSiK5yRtxrbao2OfRNtXnHfymFYYByp7QwrOQ8=", + "owner": "nix-community", + "repo": "neovim-nightly-overlay", + "rev": "8424f4f46b53c3f868fd29df98c9c2f3b45dbf7a", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "neovim-nightly-overlay", + "type": "github" + } + }, "nixpkgs-2211": { "locked": { "lastModified": 1688392541, @@ -220,7 +325,7 @@ "helix": "helix", "home-manager": "home-manager", "impermanence": "impermanence", - "neovim": "neovim", + "neovim-nightly": "neovim-nightly", "nixpkgs-2211": "nixpkgs-2211", "rust": "rust", "sops-nix": "sops-nix", diff --git a/flake.nix b/flake.nix index 0dcca80..cedcda4 100644 --- a/flake.nix +++ b/flake.nix @@ -14,8 +14,8 @@ sops-nix.url = "github:Mic92/sops-nix"; sops-nix.inputs.nixpkgs.follows = "unstable"; - neovim.url = "github:neovim/neovim?dir=contrib"; - neovim.inputs.nixpkgs.follows = "unstable"; + neovim-nightly.url = "github:nix-community/neovim-nightly-overlay"; + neovim-nightly.inputs.nixpkgs.follows = "unstable"; helix.url = "github:helix-editor/helix"; helix.inputs.nixpkgs.follows = "unstable"; diff --git a/home/default.nix b/home/default.nix index 2f17aa8..6d51ce5 100644 --- a/home/default.nix +++ b/home/default.nix @@ -1,11 +1,10 @@ { self, unstable, ... } @ inputs: -# TODO See: https://github.com/neovim/neovim/pull/21711 { "sefidel@alpha" = self.lib.mkHome { username = "sefidel"; hostname = "alpha"; - pkgs = import unstable { system = "x86_64-linux"; overlays = with inputs; [ rust.overlays.default neovim.overlay helix.overlays.default ]; }; + pkgs = import unstable { system = "x86_64-linux"; overlays = with inputs; [ rust.overlays.default neovim-nightly.overlay helix.overlays.default ]; }; extraModules = [ ./profiles/populate.nix @@ -29,7 +28,7 @@ "sefidel@haruka" = self.lib.mkHome { username = "sefidel"; hostname = "haruka"; - pkgs = import unstable { system = "x86_64-linux"; overlays = with inputs; [ rust.overlays.default neovim.overlay helix.overlays.default ]; }; + pkgs = import unstable { system = "x86_64-linux"; overlays = with inputs; [ rust.overlays.default neovim-nightly.overlay helix.overlays.default ]; }; extraModules = [ ./profiles/populate.nix @@ -53,7 +52,7 @@ "sefidel@cobalt" = self.lib.mkHome { username = "sefidel"; hostname = "cobalt"; - pkgs = import unstable { system = "x86_64-linux"; overlays = with inputs; [ rust.overlays.default neovim.overlay ]; }; + pkgs = import unstable { system = "x86_64-linux"; overlays = with inputs; [ rust.overlays.default neovim-nightly.overlay ]; }; extraModules = [ ./profiles/populate.nix diff --git a/home/profiles/base/default.nix b/home/profiles/base/default.nix index bab28a3..9189744 100644 --- a/home/profiles/base/default.nix +++ b/home/profiles/base/default.nix @@ -48,7 +48,7 @@ in pkgs.procs pkgs.sops pkgs.tree - pkgs.neovim + pkgs.neovim-nightly # Common build tools (pkgs.rust-bin.selectLatestNightlyWith (toolchain: toolchain.default.override { extensions = [ "rust-src" ]; })) |