From f61697da02abce25f2947beef3563906e51a97c6 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Sat, 22 Jul 2023 08:45:01 +0100
Subject: [PATCH] chore(nvim): switch to stable
---
flake.lock | 277 +-------------------------------
flake.nix | 12 +-
home-manager/modules/common.nix | 1 -
3 files changed, 8 insertions(+), 282 deletions(-)
diff --git a/flake.lock b/flake.lock
index 87eb858..33f50b4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,21 +1,5 @@
{
"nodes": {
- "flake-compat": {
- "flake": false,
- "locked": {
- "lastModified": 1673956053,
- "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
- "owner": "edolstra",
- "repo": "flake-compat",
- "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
- "type": "github"
- },
- "original": {
- "owner": "edolstra",
- "repo": "flake-compat",
- "type": "github"
- }
- },
"flake-parts": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
@@ -33,143 +17,6 @@
"type": "indirect"
}
},
- "flake-parts_2": {
- "inputs": {
- "nixpkgs-lib": [
- "neovim-nightly",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1688466019,
- "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=",
- "owner": "hercules-ci",
- "repo": "flake-parts",
- "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec",
- "type": "github"
- },
- "original": {
- "owner": "hercules-ci",
- "repo": "flake-parts",
- "type": "github"
- }
- },
- "flake-parts_3": {
- "inputs": {
- "nixpkgs-lib": "nixpkgs-lib_2"
- },
- "locked": {
- "lastModified": 1688466019,
- "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=",
- "owner": "hercules-ci",
- "repo": "flake-parts",
- "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec",
- "type": "github"
- },
- "original": {
- "id": "flake-parts",
- "type": "indirect"
- }
- },
- "flake-parts_4": {
- "inputs": {
- "nixpkgs-lib": [
- "neovim-nightly",
- "hercules-ci-effects",
- "hercules-ci-agent",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1688466019,
- "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=",
- "owner": "hercules-ci",
- "repo": "flake-parts",
- "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec",
- "type": "github"
- },
- "original": {
- "owner": "hercules-ci",
- "repo": "flake-parts",
- "type": "github"
- }
- },
- "flake-utils": {
- "inputs": {
- "systems": "systems"
- },
- "locked": {
- "lastModified": 1685518550,
- "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "flake-utils",
- "type": "github"
- }
- },
- "haskell-flake": {
- "locked": {
- "lastModified": 1684780604,
- "narHash": "sha256-2uMZsewmRn7rRtAnnQNw1lj0uZBMh4m6Cs/7dV5YF08=",
- "owner": "srid",
- "repo": "haskell-flake",
- "rev": "74210fa80a49f1b6f67223debdbf1494596ff9f2",
- "type": "github"
- },
- "original": {
- "owner": "srid",
- "ref": "0.3.0",
- "repo": "haskell-flake",
- "type": "github"
- }
- },
- "hercules-ci-agent": {
- "inputs": {
- "flake-parts": "flake-parts_4",
- "haskell-flake": "haskell-flake",
- "nixpkgs": "nixpkgs"
- },
- "locked": {
- "lastModified": 1688568579,
- "narHash": "sha256-ON0M56wtY/TIIGPkXDlJboAmuYwc73Hi8X9iJGtxOhM=",
- "owner": "hercules-ci",
- "repo": "hercules-ci-agent",
- "rev": "367dd8cd649b57009a6502e878005a1e54ad78c5",
- "type": "github"
- },
- "original": {
- "id": "hercules-ci-agent",
- "type": "indirect"
- }
- },
- "hercules-ci-effects": {
- "inputs": {
- "flake-parts": "flake-parts_3",
- "hercules-ci-agent": "hercules-ci-agent",
- "nixpkgs": [
- "neovim-nightly",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1689397210,
- "narHash": "sha256-fVxZnqxMbsDkB4GzGAs/B41K0wt/e+B/fLxmTFF/S20=",
- "owner": "hercules-ci",
- "repo": "hercules-ci-effects",
- "rev": "0a63bfa3f00a3775ea3a6722b247880f1ffe91ce",
- "type": "github"
- },
- "original": {
- "owner": "hercules-ci",
- "repo": "hercules-ci-effects",
- "type": "github"
- }
- },
"home-manager": {
"inputs": {
"nixpkgs": [
@@ -190,63 +37,17 @@
"type": "github"
}
},
- "neovim-flake": {
- "inputs": {
- "flake-utils": "flake-utils",
- "nixpkgs": [
- "neovim-nightly",
- "nixpkgs"
- ]
- },
- "locked": {
- "dir": "contrib",
- "lastModified": 1689836628,
- "narHash": "sha256-CDbbn0N6eiknKa4KrYc6+4LAb4za2IYSw/YGy5BPdcQ=",
- "owner": "neovim",
- "repo": "neovim",
- "rev": "63b3408551561127f7845470eb51404bcd6f547b",
- "type": "github"
- },
- "original": {
- "dir": "contrib",
- "owner": "neovim",
- "repo": "neovim",
- "type": "github"
- }
- },
- "neovim-nightly": {
- "inputs": {
- "flake-compat": "flake-compat",
- "flake-parts": "flake-parts_2",
- "hercules-ci-effects": "hercules-ci-effects",
- "neovim-flake": "neovim-flake",
- "nixpkgs": "nixpkgs_2"
- },
- "locked": {
- "lastModified": 1689897867,
- "narHash": "sha256-qr3jIEZh6k83i5JBfJ1GuwSTybekrioSnd3iaZACr5g=",
- "owner": "nix-community",
- "repo": "neovim-nightly-overlay",
- "rev": "258dfdf8fec67a1cea88a71d7613584300e062a0",
- "type": "github"
- },
- "original": {
- "owner": "nix-community",
- "repo": "neovim-nightly-overlay",
- "type": "github"
- }
- },
"nixpkgs": {
"locked": {
- "lastModified": 1688322751,
- "narHash": "sha256-eW62dC5f33oKZL7VWlomttbUnOTHrAbte9yNUNW8rbk=",
- "owner": "NixOS",
+ "lastModified": 1689940971,
+ "narHash": "sha256-397xShPnFqPC59Bmpo3lS+/Aw0yoDRMACGo1+h2VJMo=",
+ "owner": "nixos",
"repo": "nixpkgs",
- "rev": "0fbe93c5a7cac99f90b60bdf5f149383daaa615f",
+ "rev": "9ca785644d067445a4aa749902b29ccef61f7476",
"type": "github"
},
"original": {
- "owner": "NixOS",
+ "owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
@@ -270,77 +71,11 @@
"type": "github"
}
},
- "nixpkgs-lib_2": {
- "locked": {
- "dir": "lib",
- "lastModified": 1688049487,
- "narHash": "sha256-100g4iaKC9MalDjUW9iN6Jl/OocTDtXdeAj7pEGIRh4=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "4bc72cae107788bf3f24f30db2e2f685c9298dc9",
- "type": "github"
- },
- "original": {
- "dir": "lib",
- "owner": "NixOS",
- "ref": "nixos-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs_2": {
- "locked": {
- "lastModified": 1689844446,
- "narHash": "sha256-ud/6XYWbXFAJuTTApWyYlFtlc54NAxChS1T9Ns+qT7M=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "2d82894fa1e2d23a22f40275a78bfbb09b92ffde",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixpkgs-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs_3": {
- "locked": {
- "lastModified": 1689850295,
- "narHash": "sha256-fUYf6WdQlhd2H+3aR8jST5dhFH1d0eE22aes8fNIfyk=",
- "owner": "nixos",
- "repo": "nixpkgs",
- "rev": "5df4d78d54f7a34e9ea1f84a22b4fd9baebc68d0",
- "type": "github"
- },
- "original": {
- "owner": "nixos",
- "ref": "nixos-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
"root": {
"inputs": {
"flake-parts": "flake-parts",
"home-manager": "home-manager",
- "neovim-nightly": "neovim-nightly",
- "nixpkgs": "nixpkgs_3"
- }
- },
- "systems": {
- "locked": {
- "lastModified": 1681028828,
- "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
- "owner": "nix-systems",
- "repo": "default",
- "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
- "type": "github"
- },
- "original": {
- "owner": "nix-systems",
- "repo": "default",
- "type": "github"
+ "nixpkgs": "nixpkgs"
}
}
},
diff --git a/flake.nix b/flake.nix
index e906fdb..cde12e8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,14 +1,10 @@
{
inputs.home-manager.inputs.nixpkgs.follows = "nixpkgs";
inputs.home-manager.url = "github:nix-community/home-manager";
- inputs.neovim-nightly.url = "github:nix-community/neovim-nightly-overlay";
inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
outputs =
- inputs@{ flake-parts, home-manager, neovim-nightly, nixpkgs, self, ... }:
- let
- overlays = [ neovim-nightly.overlay ];
- in
+ inputs@{ flake-parts, home-manager, nixpkgs, self, ... }:
flake-parts.lib.mkFlake { inherit inputs; } {
systems = [ "x86_64-linux" ];
@@ -22,8 +18,6 @@
nixosConfigurations = {
apollo = nixpkgs.lib.nixosSystem {
modules = [
- { nixpkgs.overlays = overlays; }
-
./system/nixos/apollo/configuration.nix
home-manager.nixosModules.home-manager
@@ -37,8 +31,6 @@
nixedo = nixpkgs.lib.nixosSystem {
modules = [
- { nixpkgs.overlays = overlays; }
-
./system/nixos/nixedo/configuration.nix
home-manager.nixosModules.home-manager
@@ -53,7 +45,7 @@
homeConfigurations = {
wsl2 = home-manager.lib.homeManagerConfiguration {
- modules = [{ nixpkgs.overlays = overlays; } ./system/wsl2.nix];
+ modules = [ ./system/wsl2.nix ];
pkgs = nixpkgs.legacyPackages.x86_64-linux;
};
};
diff --git a/home-manager/modules/common.nix b/home-manager/modules/common.nix
index 20d86af..6f9ce6c 100644
--- a/home-manager/modules/common.nix
+++ b/home-manager/modules/common.nix
@@ -102,7 +102,6 @@ in
programs.neovim = {
enable = true;
- package = pkgs.neovim-nightly;
viAlias = true;
vimAlias = true;