From 88b23048967f785227bfbe680510da8da1b254a2 Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Fri, 30 Sep 2022 22:06:01 -0400 Subject: [PATCH] Update inputs, and use upstream nvim --- flake.lock | 129 +++++------------------------------------------- flake.nix | 7 --- home/neovim.nix | 4 -- 3 files changed, 12 insertions(+), 128 deletions(-) diff --git a/flake.lock b/flake.lock index d27b628..1d3436f 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1663677921, - "narHash": "sha256-NfQnUfRrjv8DXeugdbQC5El+MMhShP42ohc8iM+UAdM=", + "lastModified": 1664210064, + "narHash": "sha256-df6nKVZe/yAhmJ9csirTPahc0dldwm3HBhCVNA6qWr0=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "088c98a584a38b5f844bb9e9cd32eb28479ca6d7", + "rev": "02d2551c927b7d65ded1b3c7cd13da5cc7ae3fcf", "type": "github" }, "original": { @@ -76,22 +76,6 @@ "type": "github" } }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs": [ @@ -143,21 +127,6 @@ "type": "github" } }, - "flake-utils_3": { - "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "hercules-ci-agent": { "inputs": { "flake-parts": "flake-parts", @@ -188,11 +157,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1663835995, - "narHash": "sha256-XNHQ+mdHbjNR1Oit00SFAEcrAZoCS08E7uAFcVMtwhM=", + "lastModified": 1664561282, + "narHash": "sha256-banZeWgqCjJ0NqDv+CmhmPCHi3GNTdmCys4gieMZOXM=", "owner": "nix-community", "repo": "home-manager", - "rev": "bd83eab6220226085c82e637931a7ae3863d9893", + "rev": "5c5a5b9b45ee92995909b7944eefc4284af93849", "type": "github" }, "original": { @@ -223,47 +192,6 @@ "type": "github" } }, - "neovim-flake": { - "inputs": { - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "dir": "contrib", - "lastModified": 1650022724, - "narHash": "sha256-eYYaHpfSaYYrLkcD81Y4rsAMYDP1IJ7fLJJepkACkA8=", - "owner": "neovim", - "repo": "neovim", - "rev": "333ba6569d833e22c0d291547d740d4bbfa3fdab", - "type": "github" - }, - "original": { - "dir": "contrib", - "owner": "neovim", - "repo": "neovim", - "type": "github" - } - }, - "neovim-nightly-overlay": { - "inputs": { - "flake-compat": "flake-compat_2", - "neovim-flake": "neovim-flake", - "nixpkgs": "nixpkgs_3" - }, - "locked": { - "lastModified": 1656922590, - "narHash": "sha256-m8SRuH6NgQ8AB7W+Oev/ip7O56YzGHHV7DMjw+bT+aM=", - "owner": "nix-community", - "repo": "neovim-nightly-overlay", - "rev": "61ce522387dc8219b1efe4315fb65ddbadae2b60", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "neovim-nightly-overlay", - "type": "github" - } - }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -303,7 +231,7 @@ }, "nixos-shell": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1646257415, @@ -352,38 +280,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1656753965, - "narHash": "sha256-BCrB3l0qpJokOnIVc3g2lHiGhnjUi0MoXiw6t1o8H1E=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "0ea7a8f1b939d74e5df8af9a8f7342097cdf69eb", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1656753965, - "narHash": "sha256-BCrB3l0qpJokOnIVc3g2lHiGhnjUi0MoXiw6t1o8H1E=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "0ea7a8f1b939d74e5df8af9a8f7342097cdf69eb", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1628465643, "narHash": "sha256-QSNw9bDq9uGUniQQtakRuw4m21Jxugm23SXLVgEV4DM=", @@ -398,13 +294,13 @@ "type": "indirect" } }, - "nixpkgs_5": { + "nixpkgs_3": { "locked": { - "lastModified": 1663761423, - "narHash": "sha256-bDLXl2BVq7eIQz/8CduZI1SLyhG9u/CrckHd6f7bwPE=", + "lastModified": 1664370076, + "narHash": "sha256-NDnIo0nxJozLwEw0VPM+RApMA90uTfbvaNNtC5eB7Os=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d6490a0bd9dfb298fcd8382d3363b86870dc7340", + "rev": "854fdc68881791812eddd33b2fed94b954979a8e", "type": "github" }, "original": { @@ -445,11 +341,10 @@ "flake-utils": "flake-utils", "hercules-ci-agent": "hercules-ci-agent", "home-manager": "home-manager", - "neovim-nightly-overlay": "neovim-nightly-overlay", "nixos-hardware": "nixos-hardware", "nixos-shell": "nixos-shell", "nixos-vscode-server": "nixos-vscode-server", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_3", "zk-nvim": "zk-nvim" } }, diff --git a/flake.nix b/flake.nix index 774f450..e2050d2 100644 --- a/flake.nix +++ b/flake.nix @@ -22,8 +22,6 @@ comma.inputs.nixpkgs.follows = "nixpkgs"; # Vim & its plugins (not in nixpkgs) - neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay"; - neovim-nightly-overlay.inputs.neovim-flake.url = "github:neovim/neovim/v0.7.0?dir=contrib"; zk-nvim.url = "github:mickael-menu/zk-nvim"; zk-nvim.flake = false; coc-rust-analyzer.url = "github:fannheyward/coc-rust-analyzer"; @@ -35,11 +33,6 @@ userName = "srid"; platformIndependentModules = [ ./nixos/caches - { - nixpkgs.overlays = [ - (inputs.neovim-nightly-overlay.overlay) - ]; - } ]; in { diff --git a/home/neovim.nix b/home/neovim.nix index 2499689..ea8679c 100644 --- a/home/neovim.nix +++ b/home/neovim.nix @@ -1,7 +1,4 @@ { pkgs, inputs, system, ... }: -let - nvim = inputs.neovim-nightly-overlay.packages.${system}.neovim; -in { imports = [ ./neovim/telescope.nix @@ -15,7 +12,6 @@ in ]; programs.neovim = { enable = true; - package = nvim; extraPackages = [ pkgs.lazygit