From 7d0f89f77a2622efe452a19c8e81f5941e91ba44 Mon Sep 17 00:00:00 2001 From: Patrick Neff Date: Sun, 1 Sep 2024 13:20:54 +0200 Subject: [PATCH] update nixpkgs, add flake for treesitter-grammars, enable neovim-nightly --- flake.lock | 180 +++++++++++++++++--------- flake.nix | 5 +- modules/nixvim/default.nix | 4 +- modules/nixvim/options.nix | 4 +- modules/nixvim/plugins/treesitter.nix | 3 +- 5 files changed, 129 insertions(+), 67 deletions(-) diff --git a/flake.lock b/flake.lock index 54c9cda..4781d84 100644 --- a/flake.lock +++ b/flake.lock @@ -162,11 +162,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1722555600, - "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", + "lastModified": 1725024810, + "narHash": "sha256-ODYRm8zHfLTH3soTFWE452ydPYz2iTvr9T8ftDMUQ3E=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", + "rev": "af510d4a62d071ea13925ce41c95e3dec816c01d", "type": "github" }, "original": { @@ -183,11 +183,11 @@ ] }, "locked": { - "lastModified": 1722555600, - "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", + "lastModified": 1725024810, + "narHash": "sha256-ODYRm8zHfLTH3soTFWE452ydPYz2iTvr9T8ftDMUQ3E=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", + "rev": "af510d4a62d071ea13925ce41c95e3dec816c01d", "type": "github" }, "original": { @@ -238,6 +238,27 @@ "type": "github" } }, + "flake-parts_5": { + "inputs": { + "nixpkgs-lib": [ + "treesitter-grammars", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1722555600, + "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": [ @@ -353,11 +374,11 @@ ] }, "locked": { - "lastModified": 1723202784, - "narHash": "sha256-qbhjc/NEGaDbyy0ucycubq4N3//gDFFH3DOmp1D3u1Q=", + "lastModified": 1724857454, + "narHash": "sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "c7012d0c18567c889b948781bc74a501e92275d1", + "rev": "4509ca64f1084e73bc7a721b20c669a8d4c5ebe6", "type": "github" }, "original": { @@ -383,11 +404,11 @@ ] }, "locked": { - "lastModified": 1723202784, - "narHash": "sha256-qbhjc/NEGaDbyy0ucycubq4N3//gDFFH3DOmp1D3u1Q=", + "lastModified": 1724857454, + "narHash": "sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "c7012d0c18567c889b948781bc74a501e92275d1", + "rev": "4509ca64f1084e73bc7a721b20c669a8d4c5ebe6", "type": "github" }, "original": { @@ -449,11 +470,11 @@ ] }, "locked": { - "lastModified": 1719226092, - "narHash": "sha256-YNkUMcCUCpnULp40g+svYsaH1RbSEj6s4WdZY/SHe38=", + "lastModified": 1724947644, + "narHash": "sha256-MHHrHasTngp7EYQOObHJ1a/IsRF+wodHqOckhH6uZbk=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "11e4b8dc112e2f485d7c97e1cee77f9958f498f5", + "rev": "dba4367b9a9d9615456c430a6d6af716f6e84cef", "type": "github" }, "original": { @@ -469,11 +490,11 @@ ] }, "locked": { - "lastModified": 1723399884, - "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=", + "lastModified": 1724435763, + "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", "owner": "nix-community", "repo": "home-manager", - "rev": "086f619dd991a4d355c07837448244029fc2d9ab", + "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", "type": "github" }, "original": { @@ -490,11 +511,11 @@ ] }, "locked": { - "lastModified": 1723015306, - "narHash": "sha256-jQnFEtH20/OsDPpx71ntZzGdRlpXhUENSQCGTjn//NA=", + "lastModified": 1724435763, + "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", "owner": "nix-community", "repo": "home-manager", - "rev": "b3d5ea65d88d67d4ec578ed11d4d2d51e3de525e", + "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", "type": "github" }, "original": { @@ -506,11 +527,11 @@ "neorg": { "flake": false, "locked": { - "lastModified": 1723147938, - "narHash": "sha256-EU9s8CbMmhUFcY7yo8bxiJODHgrQdsAes/+cBq3elAI=", + "lastModified": 1723939227, + "narHash": "sha256-emIQ0DtsCG3m8d7zEe5DDAz7b1I4wOnuXEClAXnWTlQ=", "owner": "nvim-neorg", "repo": "neorg", - "rev": "09deca2ba5adcf1a729d1e3abf64438d7ce4d7ee", + "rev": "85f15f033d8c56366ac1e6ae93c940db8ad067ca", "type": "github" }, "original": { @@ -533,11 +554,11 @@ "norg-meta": "norg-meta" }, "locked": { - "lastModified": 1723292774, - "narHash": "sha256-YiOaxFAbLYxAZGQ+JMcZRFZKgArt+65wUU9VppTmrCw=", + "lastModified": 1725128288, + "narHash": "sha256-bt1NkTK7ulJKNsAYh7PglkxkN/ensYnbR9lFXQZDqhI=", "owner": "nvim-neorg", "repo": "nixpkgs-neorg-overlay", - "rev": "a54a6abe971e935e0e7e91e5c5df52baea596e0e", + "rev": "1b803213a919d3254fb7b138d4826185cb9c9ed4", "type": "github" }, "original": { @@ -574,11 +595,11 @@ ] }, "locked": { - "lastModified": 1723325281, - "narHash": "sha256-Niml3QBS8LjFRYTTMlW2vmsx418+0VKjveeYDTS5FNU=", + "lastModified": 1725175954, + "narHash": "sha256-Evkcvdap5mlLnnV8LjbgIDPcGiZ9/pHf63O4z0Dwrc8=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "36f4ce24cf1eb4b8e427074ee80dde1d5ea70c21", + "rev": "521000bc008f3678539b8652c8d574fa90ceecb5", "type": "github" }, "original": { @@ -590,11 +611,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1723242951, - "narHash": "sha256-0ipIEZ6P612iDUqd/FIWow4jNY1SPeeTl7cTqkfBraI=", + "lastModified": 1725148629, + "narHash": "sha256-FlwPXl1lKtbMPvGMDL1KkgBZE9AL088D776l2Z0NM8k=", "owner": "neovim", "repo": "neovim", - "rev": "4e8efe002e976de1a22dcce6a1e800aeb6acad70", + "rev": "bfa365a8726788e0a6df85b8f9e620a0904fe529", "type": "github" }, "original": { @@ -630,11 +651,11 @@ ] }, "locked": { - "lastModified": 1722924007, - "narHash": "sha256-+CQDamNwqO33REJLft8c26NbUi2Td083hq6SvAm2xkU=", + "lastModified": 1724561770, + "narHash": "sha256-zv8C9RNa86CIpyHwPIVO/k+5TfM8ZbjGwOOpTe1grls=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "91010a5613ffd7ee23ee9263213157a1c422b705", + "rev": "ac5694a0b855a981e81b4d9f14052e3ff46ca39e", "type": "github" }, "original": { @@ -651,27 +672,26 @@ ] }, "locked": { - "lastModified": 1705794759, - "narHash": "sha256-jfyttJ23+WcGlW9zoBcQuUpXNCLEwZaygJClvtFTqWU=", + "lastModified": 1713543440, + "narHash": "sha256-lnzZQYG0+EXl/6NkGpyIz+FEOc/DSEG57AP1VsdeNrM=", "owner": "nix-community", "repo": "nixGL", - "rev": "9b4887dbf16933bdc124296434b3898d810b3608", + "rev": "310f8e49a149e4c9ea52f1adf70cdc768ec53f8a", "type": "github" }, "original": { "owner": "nix-community", "repo": "nixGL", - "rev": "9b4887dbf16933bdc124296434b3898d810b3608", "type": "github" } }, "nixos-hardware": { "locked": { - "lastModified": 1723310128, - "narHash": "sha256-IiH8jG6PpR4h9TxSGMYh+2/gQiJW9MwehFvheSb5rPc=", + "lastModified": 1724878143, + "narHash": "sha256-UjpKo92iZ25M05kgSOw/Ti6VZwpgdlOa73zHj8OcaDk=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "c54cf53e022b0b3c1d3b8207aa0f9b194c24f0cf", + "rev": "95c3dfe6ef2e96ddc1ccdd7194e3cda02ca9a8ef", "type": "github" }, "original": { @@ -689,11 +709,11 @@ ] }, "locked": { - "lastModified": 1723124175, - "narHash": "sha256-w+rlZdbj4kn70uPJl4WrPDFoGEy0A9oJqw684nvZ9dY=", + "lastModified": 1724664098, + "narHash": "sha256-4SgV4jCoN5RffR1Mtn3HI1cjgHmARh+rZrpVlBclj9U=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "be1a6b2e4ddc34b9b6a297e7df2f2a2ecee24690", + "rev": "345dfa06658a37873ca18aa205f409e4aaf1caa6", "type": "github" }, "original": { @@ -763,11 +783,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1723175592, - "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=", + "lastModified": 1724819573, + "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b", + "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", "type": "github" }, "original": { @@ -777,6 +797,22 @@ "type": "github" } }, + "nixpkgs_4": { + "locked": { + "lastModified": 1722062969, + "narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b73c2221a46c13557b1b3be9c2070cc42cf01eb3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "devshell": "devshell", @@ -792,11 +828,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1723442813, - "narHash": "sha256-Q9AzXnKsvYMDsxUU5BZ3SmhpieSiyJl8oogE/WL4Uz8=", + "lastModified": 1725179481, + "narHash": "sha256-iezP8ORF5b/QWkApBExQFJQFhzZqs2WwRth6DYZfodE=", "owner": "nix-community", "repo": "nixvim", - "rev": "d9055abe2044f4bf9e81f414215cca81c02cbd72", + "rev": "5241c9f83ea1bcec9879585b7bd2da572924f5e1", "type": "github" }, "original": { @@ -848,11 +884,11 @@ }, "nur": { "locked": { - "lastModified": 1723451839, - "narHash": "sha256-4etPYfCuOj1n9YihCKf/opgRVxqOCvcHBgtAZYO1/S0=", + "lastModified": 1725187494, + "narHash": "sha256-5j36zFDHOatM9hHbUxmbhJOXvjvUJLUgor0iuez3FNg=", "owner": "nix-community", "repo": "NUR", - "rev": "a2a45a362192fa32417a014b3174b423a5ea12be", + "rev": "02a3564a24bfae30f12fd8fd391ebcc152a5f3e5", "type": "github" }, "original": { @@ -870,11 +906,11 @@ ] }, "locked": { - "lastModified": 1723134722, - "narHash": "sha256-wknII7R6ewALIxIKYtqeahjUk/ZrFj1ZtSpNBaHDCyg=", + "lastModified": 1724584782, + "narHash": "sha256-7FfHv7b1jwMPSu9SPY9hdxStk8E6EeSwzqdvV69U4BM=", "owner": "NuschtOS", "repo": "search", - "rev": "1016f4620e321c12ff1dbcd464e9de889e302d1c", + "rev": "5a08d691de30b6fc28d58ce71a5e420f2694e087", "type": "github" }, "original": { @@ -898,7 +934,8 @@ "nixpkgs": "nixpkgs_3", "nixvim": "nixvim", "nur": "nur", - "systems": "systems_3" + "systems": "systems_3", + "treesitter-grammars": "treesitter-grammars" } }, "systems": { @@ -954,11 +991,11 @@ ] }, "locked": { - "lastModified": 1723303070, - "narHash": "sha256-krGNVA30yptyRonohQ+i9cnK+CfCpedg6z3qzqVJcTs=", + "lastModified": 1724833132, + "narHash": "sha256-F4djBvyNRAXGusJiNYInqR6zIMI3rvlp6WiKwsRISos=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "14c092e0326de759e16b37535161b3cb9770cea3", + "rev": "3ffd842a5f50f435d3e603312eefa4790db46af5", "type": "github" }, "original": { @@ -966,6 +1003,25 @@ "repo": "treefmt-nix", "type": "github" } + }, + "treesitter-grammars": { + "inputs": { + "flake-parts": "flake-parts_5", + "nixpkgs": "nixpkgs_4" + }, + "locked": { + "lastModified": 1724948040, + "narHash": "sha256-AaAPPNbxr3WTp13ZOpf7+RGJcKuMtfMUHsYp/I2vBhE=", + "owner": "viperML", + "repo": "tree-sitter", + "rev": "4c1e9ac76d967af0f67adfb89d58edcf7607d9ef", + "type": "github" + }, + "original": { + "owner": "viperML", + "repo": "tree-sitter", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 16d728d..8260ecf 100644 --- a/flake.nix +++ b/flake.nix @@ -36,6 +36,7 @@ inputs.nixvim.overlays.default inputs.nur.overlay inputs.nixgl.overlay + inputs.neovim-nightly-overlay.overlays.default outputs.overlays.kodi ]; in @@ -129,6 +130,8 @@ #nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; #nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + #nixpkgs.url = "github:nixos/nixpkgs/3969d739d8dc628af9eecb3ad9ee5b06fdc7f24d"; + treesitter-grammars.url = "github:viperML/tree-sitter"; nur.url = "github:nix-community/NUR"; nix-colors.url = "github:misterio77/nix-colors"; systems.url = "github:nix-systems/default"; @@ -139,7 +142,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; nixgl = { - url = "github:nix-community/nixGL/9b4887dbf16933bdc124296434b3898d810b3608"; + url = "github:nix-community/nixGL"; inputs.nixpkgs.follows = "nixpkgs"; }; nixvim = { diff --git a/modules/nixvim/default.nix b/modules/nixvim/default.nix index 5a8e5df..35f1073 100644 --- a/modules/nixvim/default.nix +++ b/modules/nixvim/default.nix @@ -1,4 +1,4 @@ -_: { +{inputs, pkgs, ...}: { imports = [ ./colorscheme.nix ./options.nix @@ -7,7 +7,9 @@ _: { ./plugins ]; + config = { + package = inputs.neovim-nightly-overlay.packages.${pkgs.system}.neovim; viAlias = true; vimAlias = true; }; diff --git a/modules/nixvim/options.nix b/modules/nixvim/options.nix index 64dce57..a6914e2 100644 --- a/modules/nixvim/options.nix +++ b/modules/nixvim/options.nix @@ -50,8 +50,8 @@ in { mousemoveevent = true; timeoutlen = 300; list = true; - spell = true; - spelllang = ["de" "en_us"]; + #spell = true; + #spelllang = ["de" "en_us"]; helplang = "de"; laststatus = 3; conceallevel = 0; diff --git a/modules/nixvim/plugins/treesitter.nix b/modules/nixvim/plugins/treesitter.nix index cd9be42..54110f5 100644 --- a/modules/nixvim/plugins/treesitter.nix +++ b/modules/nixvim/plugins/treesitter.nix @@ -1,4 +1,4 @@ -{ +{ inputs, pkgs, ... }: { plugins = { treesitter = { enable = true; @@ -6,6 +6,7 @@ indent.enable = true; }; folding = true; + grammarPackages = [ inputs.treesitter-grammars.packages.${pkgs.system}.nvim-grammar-bundle ]; }; treesitter-context.enable = true; ts-autotag.enable = true;