diff --git a/flake.lock b/flake.lock index 09ee453..30b552d 100644 --- a/flake.lock +++ b/flake.lock @@ -101,7 +101,7 @@ "nur-ataraxiasjel", "devenv" ], - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1744206633, @@ -205,10 +205,10 @@ "devenv": { "inputs": { "cachix": "cachix", - "flake-compat": "flake-compat_4", - "git-hooks": "git-hooks", + "flake-compat": "flake-compat_6", + "git-hooks": "git-hooks_2", "nix": "nix", - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1748273445, @@ -305,6 +305,38 @@ } }, "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_4": { + "flake": false, + "locked": { + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_5": { "flake": false, "locked": { "lastModified": 1746162366, @@ -320,7 +352,7 @@ "type": "github" } }, - "flake-compat_4": { + "flake-compat_6": { "flake": false, "locked": { "lastModified": 1733328505, @@ -376,6 +408,48 @@ } }, "flake-parts_3": { + "inputs": { + "nixpkgs-lib": [ + "neovim-nightly", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1754487366, + "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_4": { + "inputs": { + "nixpkgs-lib": [ + "neovim-nightly", + "hercules-ci-effects", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1751413152, + "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", + "type": "github" + }, + "original": { + "id": "flake-parts", + "type": "indirect" + } + }, + "flake-parts_5": { "inputs": { "nixpkgs-lib": [ "nixvim", @@ -396,7 +470,7 @@ "type": "github" } }, - "flake-parts_4": { + "flake-parts_6": { "inputs": { "nixpkgs-lib": [ "nur", @@ -417,7 +491,7 @@ "type": "github" } }, - "flake-parts_5": { + "flake-parts_7": { "inputs": { "nixpkgs-lib": [ "nur-ataraxiasjel", @@ -440,7 +514,7 @@ "type": "github" } }, - "flake-parts_6": { + "flake-parts_8": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_2" }, @@ -540,12 +614,35 @@ } }, "git-hooks": { + "inputs": { + "flake-compat": "flake-compat_4", + "gitignore": "gitignore_2", + "nixpkgs": [ + "neovim-nightly", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1754416808, + "narHash": "sha256-c6yg0EQ9xVESx6HGDOCMcyRSjaTpNJP10ef+6fRcofA=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "9c52372878df6911f9afc1e2a1391f55e4dfc864", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "git-hooks_2": { "inputs": { "flake-compat": [ "nur-ataraxiasjel", "devenv" ], - "gitignore": "gitignore_2", + "gitignore": "gitignore_3", "nixpkgs": [ "nur-ataraxiasjel", "devenv", @@ -589,6 +686,28 @@ } }, "gitignore_2": { + "inputs": { + "nixpkgs": [ + "neovim-nightly", + "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" + } + }, + "gitignore_3": { "inputs": { "nixpkgs": [ "nur-ataraxiasjel", @@ -650,6 +769,28 @@ "type": "github" } }, + "hercules-ci-effects": { + "inputs": { + "flake-parts": "flake-parts_4", + "nixpkgs": [ + "neovim-nightly", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1752595130, + "narHash": "sha256-CNBgr4OZSuklGtNOa9CnTNo9+Xceqn/EDAC1Tc43fH8=", + "owner": "hercules-ci", + "repo": "hercules-ci-effects", + "rev": "5f2e09654b2e70ba643e41609d9f9b6640f22113", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "hercules-ci-effects", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -821,6 +962,46 @@ "url": "https://git.lix.systems/lix-project/nixos-module" } }, + "neovim-nightly": { + "inputs": { + "flake-compat": "flake-compat_3", + "flake-parts": "flake-parts_3", + "git-hooks": "git-hooks", + "hercules-ci-effects": "hercules-ci-effects", + "neovim-src": "neovim-src", + "nixpkgs": "nixpkgs_3", + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1754641381, + "narHash": "sha256-eMoujl/X1lbdjRbC/HHCpZmUb5tqTAYSL1hocy+o7nc=", + "owner": "nix-community", + "repo": "neovim-nightly-overlay", + "rev": "83aaf3085f808dec9ea1b5d16b216875a8081b37", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "neovim-nightly-overlay", + "type": "github" + } + }, + "neovim-src": { + "flake": false, + "locked": { + "lastModified": 1754610154, + "narHash": "sha256-ORfF40X4BGiFxnLNQbdsQbUTW4TkUHfPqyZWHaYL5NE=", + "owner": "neovim", + "repo": "neovim", + "rev": "038eb01b41b66379f75164507571497929f8847c", + "type": "github" + }, + "original": { + "owner": "neovim", + "repo": "neovim", + "type": "github" + } + }, "niri-flake": { "inputs": { "niri-stable": "niri-stable", @@ -885,9 +1066,9 @@ "nur-ataraxiasjel", "devenv" ], - "flake-parts": "flake-parts_5", + "flake-parts": "flake-parts_7", "libgit2": "libgit2", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_9", "nixpkgs-23-11": [ "nur-ataraxiasjel", "devenv" @@ -941,8 +1122,8 @@ }, "nixos-cosmic": { "inputs": { - "flake-compat": "flake-compat_3", - "nixpkgs": "nixpkgs_3", + "flake-compat": "flake-compat_5", + "nixpkgs": "nixpkgs_4", "nixpkgs-stable": "nixpkgs-stable_3", "rust-overlay": "rust-overlay_4" }, @@ -1071,6 +1252,22 @@ } }, "nixpkgs_10": { + "locked": { + "lastModified": 1746807397, + "narHash": "sha256-zU2z0jlkJGWLhdNr/8AJSxqK8XD0IlQgHp3VZcP56Aw=", + "owner": "cachix", + "repo": "devenv-nixpkgs", + "rev": "c5208b594838ea8e6cca5997fbf784b7cca1ca90", + "type": "github" + }, + "original": { + "owner": "cachix", + "ref": "rolling", + "repo": "devenv-nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { "locked": { "lastModified": 1748190013, "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", @@ -1086,7 +1283,7 @@ "type": "github" } }, - "nixpkgs_11": { + "nixpkgs_12": { "locked": { "lastModified": 1747958103, "narHash": "sha256-qmmFCrfBwSHoWw7cVK4Aj+fns+c54EBP8cGqp/yK410=", @@ -1119,6 +1316,22 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1754393734, + "narHash": "sha256-fbnmAwTQkuXHKBlcL5Nq1sMAzd3GFqCOQgEQw6Hy0Ak=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a683adc19ff5228af548c6539dbc3440509bfed3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1751011381, "narHash": "sha256-krGXKxvkBhnrSC/kGBmg5MyupUUT5R6IBCLEzx9jhMM=", @@ -1134,7 +1347,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1752950548, "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=", @@ -1150,7 +1363,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1752077645, "narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=", @@ -1166,7 +1379,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1752950548, "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=", @@ -1182,7 +1395,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1733212471, "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", @@ -1198,7 +1411,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1717432640, "narHash": "sha256-+f9c4/ZX5MWDOuB1rKoWj+lBNm0z0rs4CK47HBLxy1o=", @@ -1214,26 +1427,10 @@ "type": "github" } }, - "nixpkgs_9": { - "locked": { - "lastModified": 1746807397, - "narHash": "sha256-zU2z0jlkJGWLhdNr/8AJSxqK8XD0IlQgHp3VZcP56Aw=", - "owner": "cachix", - "repo": "devenv-nixpkgs", - "rev": "c5208b594838ea8e6cca5997fbf784b7cca1ca90", - "type": "github" - }, - "original": { - "owner": "cachix", - "ref": "rolling", - "repo": "devenv-nixpkgs", - "type": "github" - } - }, "nixvim": { "inputs": { - "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_5", + "flake-parts": "flake-parts_5", + "nixpkgs": "nixpkgs_6", "nuschtosSearch": "nuschtosSearch", "systems": "systems_3" }, @@ -1253,8 +1450,8 @@ }, "nur": { "inputs": { - "flake-parts": "flake-parts_4", - "nixpkgs": "nixpkgs_6" + "flake-parts": "flake-parts_6", + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1753043887, @@ -1274,8 +1471,8 @@ "inputs": { "devenv": "devenv", "devenv-root": "devenv-root", - "flake-parts": "flake-parts_6", - "nixpkgs": "nixpkgs_10" + "flake-parts": "flake-parts_8", + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1752784378, @@ -1379,16 +1576,17 @@ "home-manager": "home-manager_2", "lanzaboote": "lanzaboote", "lix-module": "lix-module", + "neovim-nightly": "neovim-nightly", "niri-flake": "niri-flake", "nixos-cosmic": "nixos-cosmic", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nixvim": "nixvim", "nur": "nur", "nur-ataraxiasjel": "nur-ataraxiasjel", "sops-nix": "sops-nix", "stylix": "stylix", - "treefmt-nix": "treefmt-nix" + "treefmt-nix": "treefmt-nix_2" } }, "rust-overlay": { @@ -1674,7 +1872,28 @@ }, "treefmt-nix": { "inputs": { - "nixpkgs": "nixpkgs_11" + "nixpkgs": [ + "neovim-nightly", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1754492133, + "narHash": "sha256-B+3g9+76KlGe34Yk9za8AF3RL+lnbHXkLiVHLjYVOAc=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "1298185c05a56bff66383a20be0b41a307f52228", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_2": { + "inputs": { + "nixpkgs": "nixpkgs_12" }, "locked": { "lastModified": 1753006367, diff --git a/flake.nix b/flake.nix index baf23ae..342bcf5 100644 --- a/flake.nix +++ b/flake.nix @@ -194,6 +194,11 @@ owner = "nix-community"; repo = "nixvim"; }; + neovim-nightly = { + type = "github"; + owner = "nix-community"; + repo = "neovim-nightly-overlay"; + }; lanzaboote = { type = "github"; diff --git a/flake/perSystem.nix b/flake/perSystem.nix index 153026c..875c94a 100644 --- a/flake/perSystem.nix +++ b/flake/perSystem.nix @@ -40,6 +40,7 @@ srcs = self.callPackage (rootPath + "/_sources/generated.nix") {}; inherit (inputs'.nixvim.legacyPackages) makeNixvim makeNixvimWithModule; inherit (self'.legacyPackages) nixvimPlugins; + neovim_git = inputs'.neovim-nightly.packages.default; }); in lib.packagesFromDirectoryRecursive { diff --git a/pkgs/nixvim/package.nix b/pkgs/nixvim/package.nix index 848a75e..57a7c9a 100644 --- a/pkgs/nixvim/package.nix +++ b/pkgs/nixvim/package.nix @@ -3,6 +3,7 @@ pkgs, lib, nixvimPlugins, + neovim_git, }: makeNixvimWithModule { inherit pkgs; @@ -13,6 +14,7 @@ makeNixvimWithModule { imports = with lib; youthlic.loadImports' ./. (filter (name: !hasSuffix "/package.nix" (toString name))); enableMan = true; plugins.lualine.enable = true; + package = neovim_git; performance = { # combinePlugins = { # enable = true;