From 5ce07a047a605a2ffe4949471d950d5064dbc84e Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 5 Jul 2021 10:40:52 +0700 Subject: [PATCH] use neovim nightly --- flake.lock | 77 ++++++++++++++++++++++++++++++++++++++++++++ flake.nix | 5 ++- users/rin/neovim.nix | 1 + 3 files changed, 82 insertions(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index 9b3aaa2..db42f85 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,36 @@ { "nodes": { + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1606424373, + "narHash": "sha256-oq8d4//CJOrVj+EcOaSXvMebvuTkmBJuT5tzlfewUnQ=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "99f1c2157fba4bfe6211a321fd0ee43199025dbf", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-utils": { + "locked": { + "lastModified": 1610051610, + "narHash": "sha256-U9rPz/usA1/Aohhk7Cmc2gBrEEKRzcW4nwPWMPwja4Y=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3982c9903e93927c2164caa727cd3f6a0e6d14cc", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -20,6 +51,51 @@ "type": "github" } }, + "neovim-flake": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "dir": "contrib", + "lastModified": 1625382879, + "narHash": "sha256-pi9EfFYaAdzCJuar24CT+nhkS29FCg2nufai1Qb0mZA=", + "owner": "neovim", + "repo": "neovim", + "rev": "490615612ed5ec587c8023de28db495b3181de30", + "type": "github" + }, + "original": { + "dir": "contrib", + "owner": "neovim", + "repo": "neovim", + "type": "github" + } + }, + "neovim-nightly": { + "inputs": { + "flake-compat": "flake-compat", + "neovim-flake": "neovim-flake", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1625386273, + "narHash": "sha256-72a9jmmR5LDU68jiDzQuwme8DuwGgbfCoco0wIjzCq4=", + "owner": "nix-community", + "repo": "neovim-nightly-overlay", + "rev": "85ac1e60a0d8ec5bff474219bf64f2c4b320f9c1", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "neovim-nightly-overlay", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1625281901, @@ -39,6 +115,7 @@ "root": { "inputs": { "home-manager": "home-manager", + "neovim-nightly": "neovim-nightly", "nixpkgs": "nixpkgs", "secrets": "secrets" } diff --git a/flake.nix b/flake.nix index 17a28b4..b184ea7 100644 --- a/flake.nix +++ b/flake.nix @@ -2,9 +2,11 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; home-manager.url = "github:nix-community/home-manager"; + neovim-nightly.url = "github:nix-community/neovim-nightly-overlay"; secrets.url = "github:LavaDesu/flakes-secrets"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; + neovim-nightly.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = inputs: with inputs; @@ -27,7 +29,8 @@ (path: nixpkgs.lib.hasSuffix ".nix" path) # Checks file extension (getPaths ./overlays) ) - ) ++ [(self: super: customPackages super)]; + ) ++ [(self: super: customPackages super)] + ++ [inputs.neovim-nightly.overlay]; revCount = "299942"; base = { config, ... }: { diff --git a/users/rin/neovim.nix b/users/rin/neovim.nix index 33ad5de..d9bd639 100644 --- a/users/rin/neovim.nix +++ b/users/rin/neovim.nix @@ -15,6 +15,7 @@ in { viAlias = true; vimAlias = true; vimdiffAlias = true; + package = pkgs.neovim-nightly; plugins = with pkgs.vimPlugins; [ coc-nvim