From 26afa49879ef5457dc8e3a7850826fd455fdbef0 Mon Sep 17 00:00:00 2001 From: Noah Masur <7386960+nmasur@users.noreply.github.com> Date: Sat, 27 Jan 2024 21:46:40 -0700 Subject: [PATCH] bump neovim plugins and remove unnecessary overlays clean checkhealth but some possible bugs in bufferline --- flake.lock | 165 ++++++------------------ flake.nix | 31 ++--- modules/common/neovim/config/syntax.nix | 3 +- overlays/age.nix | 9 -- overlays/neovim-plugins.nix | 1 - overlays/tree-sitter.nix | 5 + 6 files changed, 61 insertions(+), 153 deletions(-) delete mode 100644 overlays/age.nix diff --git a/flake.lock b/flake.lock index 545a81d..d8c0523 100644 --- a/flake.lock +++ b/flake.lock @@ -17,23 +17,6 @@ "type": "github" } }, - "age": { - "flake": false, - "locked": { - "lastModified": 1672087018, - "narHash": "sha256-LRxxJQLQkzoCNYGS/XBixVmYXoZ1mPHKvFicPGXYLcw=", - "owner": "FiloSottile", - "repo": "age", - "rev": "c6dcfa1efcaa27879762a934d5bea0d1b83a894c", - "type": "github" - }, - "original": { - "owner": "FiloSottile", - "ref": "v1.1.1", - "repo": "age", - "type": "github" - } - }, "baleia-nvim-src": { "flake": false, "locked": { @@ -53,16 +36,16 @@ "bufferline-nvim-src": { "flake": false, "locked": { - "lastModified": 1695205521, - "narHash": "sha256-MQMpXMgUpZA0E9TunzjXeOQxDWSCTogXbvi9VJnv4Kw=", + "lastModified": 1706180994, + "narHash": "sha256-/iGzUDJaodkUyWpwim8UtwaRuarfu/Nk6wxVApk+QxY=", "owner": "akinsho", "repo": "bufferline.nvim", - "rev": "6ecd37e0fa8b156099daedd2191130e083fb1490", + "rev": "d6cb9b7cac52887bcac65f8698e67479553c0748", "type": "github" }, "original": { "owner": "akinsho", - "ref": "v4.4.0", + "ref": "v4.5.0", "repo": "bufferline.nvim", "type": "github" } @@ -143,16 +126,16 @@ "fidget-nvim-src": { "flake": false, "locked": { - "lastModified": 1702031048, - "narHash": "sha256-wbjQuOFd/2339TIrUA97PYsV8N3PZsS+xbyMsyZmki8=", + "lastModified": 1704696337, + "narHash": "sha256-uAX/RGfOmsUIUaDepNwUpK8MBaTMBJ4rLZ69y0MwpNE=", "owner": "j-hui", "repo": "fidget.nvim", - "rev": "300018af4abd00610a345e382ca1f4b7ba420f77", + "rev": "3a93300c076109d86c7ce35ec67a8034ae6ba9db", "type": "github" }, "original": { "owner": "j-hui", - "ref": "v1.1.0", + "ref": "v1.2.0", "repo": "fidget.nvim", "type": "github" } @@ -197,24 +180,6 @@ "inputs": { "systems": "systems" }, - "locked": { - "lastModified": 1687709756, - "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, "locked": { "lastModified": 1705309234, "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", @@ -229,9 +194,9 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_2": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1705309234, @@ -336,32 +301,9 @@ "url": "https://snappymail.eu/repository/nextcloud/snappymail-2.32.0-nextcloud.tar.gz" } }, - "nil": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1691372739, - "narHash": "sha256-fZ8KfBMcIFO/R7xaWtB85SFeuUjb9SCH8fxYBnY8068=", - "owner": "oxalica", - "repo": "nil", - "rev": "97abe7d3d48721d4e0fcc1876eea83bb4247825b", - "type": "github" - }, - "original": { - "owner": "oxalica", - "ref": "2023-08-09", - "repo": "nil", - "type": "github" - } - }, "nix2vim": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" ] @@ -466,16 +408,16 @@ "nvim-lspconfig-src": { "flake": false, "locked": { - "lastModified": 1675639052, - "narHash": "sha256-B8IgpypxzCACZ5VcqM6KiWyClaN+KrmemtkwMznmj5Y=", + "lastModified": 1701687137, + "narHash": "sha256-qFjFofA2LoD4yRfx4KGfSCpR3mDkpFaagcm+TVNPqco=", "owner": "neovim", "repo": "nvim-lspconfig", - "rev": "255e07ce2a05627d482d2de77308bba51b90470c", + "rev": "cf3dd4a290084a868fac0e2e876039321d57111c", "type": "github" }, "original": { "owner": "neovim", - "ref": "v0.1.6", + "ref": "v0.1.7", "repo": "nvim-lspconfig", "type": "github" } @@ -529,7 +471,6 @@ "root": { "inputs": { "Comment-nvim-src": "Comment-nvim-src", - "age": "age", "baleia-nvim-src": "baleia-nvim-src", "bufferline-nvim-src": "bufferline-nvim-src", "bypass-paywalls-clean": "bypass-paywalls-clean", @@ -544,7 +485,6 @@ "nextcloud-external": "nextcloud-external", "nextcloud-news": "nextcloud-news", "nextcloud-snappymail": "nextcloud-snappymail", - "nil": "nil", "nix2vim": "nix2vim", "nixos-generators": "nixos-generators", "nixpkgs": "nixpkgs", @@ -563,36 +503,12 @@ "tree-sitter-puppet": "tree-sitter-puppet", "tree-sitter-python": "tree-sitter-python", "tree-sitter-rasi": "tree-sitter-rasi", + "tree-sitter-vimdoc": "tree-sitter-vimdoc", "wallpapers": "wallpapers", "wsl": "wsl", "zenyd-mpv-scripts": "zenyd-mpv-scripts" } }, - "rust-overlay": { - "inputs": { - "flake-utils": [ - "nil", - "flake-utils" - ], - "nixpkgs": [ - "nil", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1688783586, - "narHash": "sha256-HHaM2hk2azslv1kH8zmQxXo2e7i5cKgzNIuK4yftzB0=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "7a29283cc242c2486fc67f60b431ef708046d176", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -623,34 +539,19 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "telescope-nvim-src": { "flake": false, "locked": { - "lastModified": 1697004956, - "narHash": "sha256-7SqYFnfCjotOBhuX6Wx1IOhgMKoxaoI1a4SKz1d5RVM=", + "lastModified": 1701167040, + "narHash": "sha256-H5RpyWMluE+Yxg7xFX43AZTVW+Yg70DF3FmEGXBUSNg=", "owner": "nvim-telescope", "repo": "telescope.nvim", - "rev": "7011eaae0ac1afe036e30c95cf80200b8dc3f21a", + "rev": "d90956833d7c27e73c621a61f20b29fdb7122709", "type": "github" }, "original": { "owner": "nvim-telescope", - "ref": "0.1.4", + "ref": "0.1.5", "repo": "telescope.nvim", "type": "github" } @@ -674,16 +575,16 @@ "toggleterm-nvim-src": { "flake": false, "locked": { - "lastModified": 1695636777, - "narHash": "sha256-o8xzoo7OuYrPnKlfrupQ24Ja9hZy1qQVnvwO0FO+4zM=", + "lastModified": 1701858874, + "narHash": "sha256-vJApw7XY2wOX9InfWcah+hkNxBfS1+kQUWr4ITxRmgA=", "owner": "akinsho", "repo": "toggleterm.nvim", - "rev": "faee9d60428afc7857e0927fdc18daa6c409fa64", + "rev": "cbd041d91b90cd3c02df03fe6133208888f8e008", "type": "github" }, "original": { "owner": "akinsho", - "ref": "v2.8.0", + "ref": "v2.9.0", "repo": "toggleterm.nvim", "type": "github" } @@ -787,6 +688,22 @@ "type": "github" } }, + "tree-sitter-vimdoc": { + "flake": false, + "locked": { + "lastModified": 1705491128, + "narHash": "sha256-q5Ln8WPFrtKBfZnaAAlMh3Q/eczEt6wCMZAtx+ISCKg=", + "owner": "neovim", + "repo": "tree-sitter-vimdoc", + "rev": "ed8695ad8de39c3f073da130156f00b1148e2891", + "type": "github" + }, + "original": { + "owner": "neovim", + "repo": "tree-sitter-vimdoc", + "type": "github" + } + }, "wallpapers": { "flake": false, "locked": { @@ -806,7 +723,7 @@ "wsl": { "inputs": { "flake-compat": "flake-compat", - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" ] diff --git a/flake.nix b/flake.nix index 4ea66f5..a1777f8 100644 --- a/flake.nix +++ b/flake.nix @@ -59,16 +59,10 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - # Nix language server - nil = { - url = "github:oxalica/nil/2023-08-09"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - # Neovim plugins nvim-lspconfig-src = { # https://github.com/neovim/nvim-lspconfig/tags - url = "github:neovim/nvim-lspconfig/v0.1.6"; + url = "github:neovim/nvim-lspconfig/v0.1.7"; flake = false; }; cmp-nvim-lsp-src = { @@ -85,6 +79,7 @@ flake = false; }; Comment-nvim-src = { + # https://github.com/numToStr/Comment.nvim/releases url = "github:numToStr/Comment.nvim/v0.8.0"; flake = false; }; @@ -94,7 +89,8 @@ flake = false; }; telescope-nvim-src = { - url = "github:nvim-telescope/telescope.nvim/0.1.4"; + # https://github.com/nvim-telescope/telescope.nvim/releases + url = "github:nvim-telescope/telescope.nvim/0.1.5"; flake = false; }; telescope-project-nvim-src = { @@ -102,11 +98,13 @@ flake = false; }; toggleterm-nvim-src = { - url = "github:akinsho/toggleterm.nvim/v2.8.0"; + # https://github.com/akinsho/toggleterm.nvim/tags + url = "github:akinsho/toggleterm.nvim/v2.9.0"; flake = false; }; bufferline-nvim-src = { - url = "github:akinsho/bufferline.nvim/v4.4.0"; + # https://github.com/akinsho/bufferline.nvim/releases + url = "github:akinsho/bufferline.nvim/v4.5.0"; flake = false; }; nvim-tree-lua-src = { @@ -119,7 +117,7 @@ }; fidget-nvim-src = { # https://github.com/j-hui/fidget.nvim/tags - url = "github:j-hui/fidget.nvim/v1.1.0"; + url = "github:j-hui/fidget.nvim/v1.2.0"; flake = false; }; @@ -148,6 +146,10 @@ url = "github:Fymyte/tree-sitter-rasi"; flake = false; }; + tree-sitter-vimdoc = { + url = "github:neovim/tree-sitter-vimdoc"; + flake = false; + }; # MPV Scripts zenyd-mpv-scripts = { @@ -155,12 +157,6 @@ flake = false; }; - # Age encryption (pin because of failed builds) - age = { - url = "github:FiloSottile/age/v1.1.1"; - flake = false; - }; - # GE version of Proton for game compatibility # Alternatively, could consider using https://github.com/fufexan/nix-gaming proton-ge = { @@ -246,7 +242,6 @@ (import ./overlays/mpv-scripts.nix inputs) (import ./overlays/nextcloud-apps.nix inputs) (import ./overlays/betterlockscreen.nix) - (import ./overlays/age.nix inputs) (import ./overlays/proton-ge.nix inputs) (import ./overlays/gh-collaborators.nix) (import ./overlays/bypass-paywalls-clean.nix inputs) diff --git a/modules/common/neovim/config/syntax.nix b/modules/common/neovim/config/syntax.nix index 872ad8d..5e6c6e7 100644 --- a/modules/common/neovim/config/syntax.nix +++ b/modules/common/neovim/config/syntax.nix @@ -4,7 +4,7 @@ (pkgs.vimPlugins.nvim-treesitter.withPlugins (_plugins: with pkgs.tree-sitter-grammars; [ tree-sitter-bash - # tree-sitter-c + tree-sitter-c tree-sitter-fish tree-sitter-hcl tree-sitter-ini @@ -17,6 +17,7 @@ tree-sitter-python tree-sitter-rasi tree-sitter-toml + tree-sitter-vimdoc tree-sitter-yaml ])) pkgs.vimPlugins.vim-matchup # Better % jumping in languages diff --git a/overlays/age.nix b/overlays/age.nix deleted file mode 100644 index 4092dee..0000000 --- a/overlays/age.nix +++ /dev/null @@ -1,9 +0,0 @@ -# Pin age because it is failing to build -# https://github.com/NixOS/nixpkgs/pull/265753 - -inputs: _final: prev: { - age = prev.age.overrideAttrs (old: { - src = inputs.age; - doCheck = false; # https://github.com/FiloSottile/age/issues/517 - }); -} diff --git a/overlays/neovim-plugins.nix b/overlays/neovim-plugins.nix index 3f0a460..86217dd 100644 --- a/overlays/neovim-plugins.nix +++ b/overlays/neovim-plugins.nix @@ -16,7 +16,6 @@ let in { - nil = inputs.nil.packages.${prev.system}.nil; nvim-lspconfig = withSrc prev.vimPlugins.nvim-lspconfig inputs.nvim-lspconfig; cmp-nvim-lsp = withSrc prev.vimPlugins.cmp-nvim-lsp inputs.cmp-nvim-lsp; null-ls-nvim = withSrc prev.vimPlugins.null-ls-nvim inputs.null-ls-nvim; diff --git a/overlays/tree-sitter.nix b/overlays/tree-sitter.nix index 7b597dd..d84e55d 100644 --- a/overlays/tree-sitter.nix +++ b/overlays/tree-sitter.nix @@ -32,6 +32,11 @@ inputs: _final: prev: { version = "0.1.1"; src = inputs.tree-sitter-rasi; }; + tree-sitter-vimdoc = prev.tree-sitter.buildGrammar { + language = "vimdoc"; + version = "2.1.0"; + src = inputs.tree-sitter-vimdoc; + }; }; }