From dedf83a78f27fc49a4a507ac5b5d39aff4b9b30b Mon Sep 17 00:00:00 2001 From: jacekpoz Date: Mon, 9 Sep 2024 09:37:06 +0200 Subject: [PATCH] stop using nvim nightly (thanks raf) --- flake.lock | 327 ++++++++-------------------------- flake.nix | 2 - modules/tui/neovim/config.nix | 1 - 3 files changed, 72 insertions(+), 258 deletions(-) diff --git a/flake.lock b/flake.lock index cf5a1ca..bb45fff 100644 --- a/flake.lock +++ b/flake.lock @@ -332,11 +332,11 @@ "flake-compat_3": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "type": "github" }, "original": { @@ -362,38 +362,6 @@ } }, "flake-compat_5": { - "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-compat_6": { - "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-compat_7": { "flake": false, "locked": { "lastModified": 1696426674, @@ -409,7 +377,7 @@ "type": "github" } }, - "flake-compat_8": { + "flake-compat_6": { "flake": false, "locked": { "lastModified": 1696426674, @@ -449,7 +417,7 @@ "flake-parts_2": { "inputs": { "nixpkgs-lib": [ - "neovim-nightly-overlay", + "nixpak", "nixpkgs" ] }, @@ -468,48 +436,6 @@ } }, "flake-parts_3": { - "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-parts_4": { - "inputs": { - "nixpkgs-lib": [ - "nixpak", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1725234343, - "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_5": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, @@ -527,7 +453,7 @@ "type": "github" } }, - "flake-parts_6": { + "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "schizofox", @@ -548,7 +474,7 @@ "type": "github" } }, - "flake-parts_7": { + "flake-parts_5": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_2" }, @@ -654,12 +580,15 @@ } }, "flake-utils_6": { + "inputs": { + "systems": "systems_12" + }, "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "type": "github" }, "original": { @@ -670,7 +599,7 @@ }, "flake-utils_7": { "inputs": { - "systems": "systems_13" + "systems": "systems_14" }, "locked": { "lastModified": 1710146030, @@ -686,55 +615,6 @@ "type": "github" } }, - "git-hooks": { - "inputs": { - "flake-compat": "flake-compat_4", - "gitignore": "gitignore", - "nixpkgs": [ - "neovim-nightly-overlay", - "nixpkgs" - ], - "nixpkgs-stable": [ - "neovim-nightly-overlay", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1725513492, - "narHash": "sha256-tyMUA6NgJSvvQuzB7A1Sf8+0XCHyfSPRx/b00o6K0uo=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "7570de7b9b504cfe92025dd1be797bf546f66528", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "neovim-nightly-overlay", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "helix": { "inputs": { "crane": "crane_3", @@ -757,28 +637,6 @@ } }, "hercules-ci-effects": { - "inputs": { - "flake-parts": "flake-parts_3", - "nixpkgs": [ - "neovim-nightly-overlay", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1724947644, - "narHash": "sha256-MHHrHasTngp7EYQOObHJ1a/IsRF+wodHqOckhH6uZbk=", - "owner": "hercules-ci", - "repo": "hercules-ci-effects", - "rev": "dba4367b9a9d9615456c430a6d6af716f6e84cef", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "hercules-ci-effects", - "type": "github" - } - }, - "hercules-ci-effects_2": { "inputs": { "flake-parts": [ "nixpak", @@ -1306,45 +1164,6 @@ "type": "github" } }, - "neovim-nightly-overlay": { - "inputs": { - "flake-compat": "flake-compat_3", - "flake-parts": "flake-parts_2", - "git-hooks": "git-hooks", - "hercules-ci-effects": "hercules-ci-effects", - "neovim-src": "neovim-src", - "nixpkgs": "nixpkgs_8" - }, - "locked": { - "lastModified": 1725778896, - "narHash": "sha256-9Xy+S+Bd/T7baJRLsyHHIxlJJwnBtju5G0+A+YRReQg=", - "owner": "nix-community", - "repo": "neovim-nightly-overlay", - "rev": "0678b32987bb208ca7f45fa5309b2b9162458e0d", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "neovim-nightly-overlay", - "type": "github" - } - }, - "neovim-src": { - "flake": false, - "locked": { - "lastModified": 1725745304, - "narHash": "sha256-JvIg7XpeceyeqOmHnL49isxrHuonykr9ui7lT1Vb+HM=", - "owner": "neovim", - "repo": "neovim", - "rev": "b40ec083ae30eb64ddfec2b238c909116e936e99", - "type": "github" - }, - "original": { - "owner": "neovim", - "repo": "neovim", - "type": "github" - } - }, "nh": { "inputs": { "nixpkgs": [ @@ -1423,9 +1242,9 @@ }, "nix-minecraft": { "inputs": { - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_3", "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1725760053, @@ -1443,8 +1262,8 @@ }, "nixpak": { "inputs": { - "flake-parts": "flake-parts_4", - "hercules-ci-effects": "hercules-ci-effects_2", + "flake-parts": "flake-parts_2", + "hercules-ci-effects": "hercules-ci-effects", "nixpkgs": [ "nixpkgs" ] @@ -1526,22 +1345,6 @@ } }, "nixpkgs_10": { - "locked": { - "lastModified": 1725634671, - "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { "locked": { "lastModified": 1656753965, "narHash": "sha256-BCrB3l0qpJokOnIVc3g2lHiGhnjUi0MoXiw6t1o8H1E=", @@ -1557,23 +1360,23 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_11": { "locked": { - "lastModified": 1702350026, - "narHash": "sha256-A+GNZFZdfl4JdDphYKBJ5Ef1HOiFsP18vQe9mqjmUis=", + "lastModified": 1708161998, + "narHash": "sha256-6KnemmUorCvlcAvGziFosAVkrlWZGIc6UNT9GUYr0jQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9463103069725474698139ab10f17a9d125da859", + "rev": "84d981bae8b5e783b3b548de505b22880559515f", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_12": { "locked": { "lastModified": 1682809678, "narHash": "sha256-jqR8t82mWotOSgnWZvr6xXCO/tc3fCPTLMPvI7Jo5rA=", @@ -1589,7 +1392,7 @@ "type": "github" } }, - "nixpkgs_14": { + "nixpkgs_13": { "locked": { "lastModified": 1722185531, "narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=", @@ -1702,22 +1505,6 @@ } }, "nixpkgs_8": { - "locked": { - "lastModified": 1725534445, - "narHash": "sha256-Yd0FK9SkWy+ZPuNqUgmVPXokxDgMJoGuNpMEtkfcf84=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9bb1e7571aadf31ddb4af77fc64b2d59580f9a39", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_9": { "locked": { "lastModified": 1715266358, "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", @@ -1733,6 +1520,22 @@ "type": "github" } }, + "nixpkgs_9": { + "locked": { + "lastModified": 1725634671, + "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nmd": { "flake": false, "locked": { @@ -1787,7 +1590,7 @@ }, "nvf": { "inputs": { - "flake-parts": "flake-parts_5", + "flake-parts": "flake-parts_3", "flake-utils": "flake-utils_5", "mnw": "mnw", "nil": "nil", @@ -3558,7 +3361,7 @@ "rnix-lsp": { "inputs": { "naersk": "naersk", - "nixpkgs": "nixpkgs_11", + "nixpkgs": "nixpkgs_10", "utils": "utils" }, "locked": { @@ -3589,11 +3392,10 @@ "hyprland-plugins": "hyprland-plugins", "hyprlock": "hyprlock", "iio-hyprland": "iio-hyprland", - "neovim-nightly-overlay": "neovim-nightly-overlay", "nh": "nh", "nix-minecraft": "nix-minecraft", "nixpak": "nixpak", - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_9", "nur": "nur", "nvf": "nvf", "pozsite": "pozsite", @@ -3694,8 +3496,8 @@ }, "schizofox": { "inputs": { - "flake-compat": "flake-compat_7", - "flake-parts": "flake-parts_6", + "flake-compat": "flake-compat_5", + "flake-parts": "flake-parts_4", "home-manager": "home-manager_3", "nixpak": [ "nixpak" @@ -3704,7 +3506,7 @@ "nixpkgs" ], "searx-randomizer": "searx-randomizer", - "systems": "systems_12" + "systems": "systems_13" }, "locked": { "lastModified": 1725210690, @@ -3723,7 +3525,7 @@ "searx-randomizer": { "inputs": { "crane": "crane_4", - "flake-parts": "flake-parts_7", + "flake-parts": "flake-parts_5", "nixpkgs": [ "schizofox", "nixpkgs" @@ -3746,7 +3548,7 @@ "shadower": { "inputs": { "naersk": "naersk_2", - "nixpkgs": "nixpkgs_13" + "nixpkgs": "nixpkgs_12" }, "locked": { "lastModified": 1721405001, @@ -3829,6 +3631,21 @@ } }, "systems_12": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_13": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -3843,7 +3660,7 @@ "type": "github" } }, - "systems_13": { + "systems_14": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -3995,8 +3812,8 @@ }, "waybar": { "inputs": { - "flake-compat": "flake-compat_8", - "nixpkgs": "nixpkgs_14" + "flake-compat": "flake-compat_6", + "nixpkgs": "nixpkgs_13" }, "locked": { "lastModified": 1724670643, @@ -4081,16 +3898,16 @@ }, "zig": { "inputs": { - "flake-compat": "flake-compat_6", + "flake-compat": "flake-compat_4", "flake-utils": "flake-utils_6", - "nixpkgs": "nixpkgs_12" + "nixpkgs": "nixpkgs_11" }, "locked": { - "lastModified": 1716725305, - "narHash": "sha256-LIz08gALt2wlutGXAEhNroEoIuPV5ePQB8LI4WzXcy8=", + "lastModified": 1725841764, + "narHash": "sha256-mSyqA+Akv6ZLwiRScMvkEX7NSImR4BDaU4wgskuT5ww=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "93b02a697561ecd438cfa5779727b5a1c300cb4c", + "rev": "42d8c97255e8dda2938bbd4b28de3ba3fa00d02c", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ce18f8e..0511241 100644 --- a/flake.nix +++ b/flake.nix @@ -76,8 +76,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay"; - helix.url = "github:helix-editor/helix"; agenix.url = "github:ryantm/agenix"; diff --git a/modules/tui/neovim/config.nix b/modules/tui/neovim/config.nix index 0242dd9..5d93b9c 100644 --- a/modules/tui/neovim/config.nix +++ b/modules/tui/neovim/config.nix @@ -31,7 +31,6 @@ in { programs.nvf = { enable = true; settings.vim = { - package = inputs.neovim-nightly-overlay.packages.${pkgs.system}.neovim; viAlias = false; vimAlias = false; enableLuaLoader = true;