From 904a97ea5f6be9d040a305bd1e7a66b554e3ae87 Mon Sep 17 00:00:00 2001 From: Dmitriy Pleshevskiy Date: Fri, 3 Feb 2023 02:22:57 +0300 Subject: [PATCH] bump all plugins to latest version --- flake.lock | 114 ++++++++++++++------------------- flake.nix | 37 ++++++----- plugins/explorer/nvim-tree.lua | 21 ++++++ plugins/lsp/lspconfig.lua | 3 +- 4 files changed, 88 insertions(+), 87 deletions(-) diff --git a/flake.lock b/flake.lock index 912d167..32b123b 100644 --- a/flake.lock +++ b/flake.lock @@ -3,51 +3,48 @@ "cmp-luasnip": { "flake": false, "locked": { - "lastModified": 1651433493, - "narHash": "sha256-8ocJY5qeAJXFSuTnavXX6NvZyAB0EEn2Y+amrWp8B1Y=", + "lastModified": 1666943769, + "narHash": "sha256-Z5SPy3j2oHFxJ7bK8DP8Q/oRyLEMlnWyIfDaQcNVIS0=", "owner": "saadparwaiz1", "repo": "cmp_luasnip", - "rev": "a9de941bcbda508d0a45d28ae366bb3f08db2e36", + "rev": "18095520391186d634a0045dacaa346291096566", "type": "github" }, "original": { "owner": "saadparwaiz1", "repo": "cmp_luasnip", - "rev": "a9de941bcbda508d0a45d28ae366bb3f08db2e36", "type": "github" } }, "cmp-nvim-lsp": { "flake": false, "locked": { - "lastModified": 1652705110, - "narHash": "sha256-19Ka4EQhqo//IMjJ/DnXiHsevVWFy2M90oSjmBFfCO0=", + "lastModified": 1668566979, + "narHash": "sha256-Mqkp8IH/laUx0cK7S0BjusTT+OtOOJOamZM4+93RHdU=", "owner": "hrsh7th", "repo": "cmp-nvim-lsp", - "rev": "affe808a5c56b71630f17aa7c38e15c59fd648a8", + "rev": "59224771f91b86d1de12570b4070fe4ad7cd1eeb", "type": "github" }, "original": { "owner": "hrsh7th", "repo": "cmp-nvim-lsp", - "rev": "affe808a5c56b71630f17aa7c38e15c59fd648a8", "type": "github" } }, "editorconfig-nvim": { "flake": false, "locked": { - "lastModified": 1667312682, - "narHash": "sha256-Ylk1KdJtXHwR2ekEvIQSwHaAfxnMB2nL7Tw7EJZ56gw=", + "lastModified": 1673364897, + "narHash": "sha256-pR57tITdVGF4luEmmRYv/XFb35E3KDfcgYRijkPAc+Y=", "owner": "gpanders", "repo": "editorconfig.nvim", - "rev": "e72d2331b43e3f08d0ecca44cecded4e20c01fab", + "rev": "5b9e303e1d6f7abfe616ce4cc8d3fffc554790bf", "type": "github" }, "original": { "owner": "gpanders", "repo": "editorconfig.nvim", - "rev": "e72d2331b43e3f08d0ecca44cecded4e20c01fab", "type": "github" } }, @@ -69,34 +66,32 @@ "gitsigns-nvim": { "flake": false, "locked": { - "lastModified": 1663543397, - "narHash": "sha256-FgNSwvW7Bk+eKutMj0zqEorJ3+ijCALtOXs2OYiSX1I=", + "lastModified": 1674828861, + "narHash": "sha256-303GJvS7OI/RMpaeGeZs3ITpDs0Ztz7z02GAeGEn8S4=", "owner": "lewis6991", "repo": "gitsigns.nvim", - "rev": "f98c85e7c3d65a51f45863a34feb4849c82f240f", + "rev": "0d4fe37ba5285171f3729da955955205f3fa945b", "type": "github" }, "original": { "owner": "lewis6991", "repo": "gitsigns.nvim", - "rev": "f98c85e7c3d65a51f45863a34feb4849c82f240f", "type": "github" } }, "hop-nvim": { "flake": false, "locked": { - "lastModified": 1665333065, - "narHash": "sha256-eBWzvdwbPlwArx7M8Q5mQtXVHASxo8CC/4ZIhBHd0vg=", + "lastModified": 1667151642, + "narHash": "sha256-UZZlo5n1x8UfM9OP7RHfT3sFRfMpLkBLbEdcSO+SU6E=", "owner": "phaazon", "repo": "hop.nvim", - "rev": "6591b3656b75ff313cc38dc662a7ee8f75f1c165", + "rev": "90db1b2c61b820e230599a04fedcd2679e64bd07", "type": "github" }, "original": { "owner": "phaazon", "repo": "hop.nvim", - "rev": "6591b3656b75ff313cc38dc662a7ee8f75f1c165", "type": "github" } }, @@ -130,58 +125,54 @@ "original": { "owner": "arkav", "repo": "lualine-lsp-progress", - "rev": "56842d097245a08d77912edf5f2a69ba29f275d7", "type": "github" } }, "lualine-nvim": { "flake": false, "locked": { - "lastModified": 1662921346, - "narHash": "sha256-bGVozEoffFxjiLACTfnDGX11yIHGhLawQWn80Nbd6TM=", + "lastModified": 1673418538, + "narHash": "sha256-3I9og+/lVRFJSpDVFwp2AM5bMqeP1KF8XB8Nyfpwhok=", "owner": "nvim-lualine", "repo": "lualine.nvim", - "rev": "a52f078026b27694d2290e34efa61a6e4a690621", + "rev": "0050b308552e45f7128f399886c86afefc3eb988", "type": "github" }, "original": { "owner": "nvim-lualine", "repo": "lualine.nvim", - "rev": "a52f078026b27694d2290e34efa61a6e4a690621", "type": "github" } }, "luasnip": { "flake": false, "locked": { - "lastModified": 1663664003, - "narHash": "sha256-56x4Eke/7Cdn4/8T0SM73WpDqBSFq1vFY5VdkNlUBwI=", + "lastModified": 1675345625, + "narHash": "sha256-32ZEkJ4C8c2CJsV7hs8UHeadwJ3l+STJyxhc9pcaTW4=", "owner": "L3MON4D3", "repo": "LuaSnip", - "rev": "d36c063b7f6e701852f7880f1314656592a61b4f", + "rev": "d404ec306bfa4cdb0c3605dbb17e8a93a9597337", "type": "github" }, "original": { "owner": "L3MON4D3", "repo": "LuaSnip", - "rev": "d36c063b7f6e701852f7880f1314656592a61b4f", "type": "github" } }, "neoformat": { "flake": false, "locked": { - "lastModified": 1669936997, - "narHash": "sha256-GpUlWqIdZKDVAwGyzzy/OwjRrxfzYfmyxYYJwGXP0Qg=", + "lastModified": 1673406810, + "narHash": "sha256-PQ4+IRb+vPGurFoBnaqEDb8Vb5RVR/rtrkdDuRfzHQk=", "owner": "sbdchd", "repo": "neoformat", - "rev": "918840f9f8944fdb05451e4a77d29b97898b415c", + "rev": "ec601d38a2e9309109f405ce038c5a6ce774f1a9", "type": "github" }, "original": { "owner": "sbdchd", "repo": "neoformat", - "rev": "918840f9f8944fdb05451e4a77d29b97898b415c", "type": "github" } }, @@ -219,51 +210,48 @@ "nlsp-settings-nvim": { "flake": false, "locked": { - "lastModified": 1668009753, - "narHash": "sha256-Zy+TPa2aei9ku3eibOXMHCOZ0awqQfjPUdsJok5P088=", + "lastModified": 1675304747, + "narHash": "sha256-HsNTVNbDPSKPjs0oGeYLCe1/qzacCJn+hS2XdO9di2Q=", "owner": "tamago324", "repo": "nlsp-settings.nvim", - "rev": "effb5f50b2ad7d6070e429635384345ca4be078e", + "rev": "5541d073b93a404445907e0aec3ebd9cf8914e53", "type": "github" }, "original": { "owner": "tamago324", "repo": "nlsp-settings.nvim", - "rev": "effb5f50b2ad7d6070e429635384345ca4be078e", "type": "github" } }, "nvim-cmp": { "flake": false, "locked": { - "lastModified": 1663990701, - "narHash": "sha256-gpkPMlOUMfTlef5WRFHLkmKEDZ9TRA/yRPqb6UXnKOA=", + "lastModified": 1674731450, + "narHash": "sha256-53ubj39XyXep+AyWMU7Vxs9uTvIVZkctl6/M9LLpock=", "owner": "hrsh7th", "repo": "nvim-cmp", - "rev": "17a55b3d5498c617855d015bbcad0c872d10c879", + "rev": "e7e2ef7031db8e0cfad7ad9916ec766ddd9dbb3b", "type": "github" }, "original": { "owner": "hrsh7th", "repo": "nvim-cmp", - "rev": "17a55b3d5498c617855d015bbcad0c872d10c879", "type": "github" } }, "nvim-lspconfig": { "flake": false, "locked": { - "lastModified": 1663921594, - "narHash": "sha256-uCFhwcR4oW+4wrSt6rx5G8k75dOLeqmYzW1G1CYlLkM=", + "lastModified": 1675162896, + "narHash": "sha256-2XmfhBldseP9zxrQBFtapUpMBIkhKgyiM+xUbP+os8I=", "owner": "neovim", "repo": "nvim-lspconfig", - "rev": "d4eb971db353ccf78cefb3be1b05483b69ec1e69", + "rev": "902d6aa31450d26e11bedcbef8af5b6fe2e1ffe8", "type": "github" }, "original": { "owner": "neovim", "repo": "nvim-lspconfig", - "rev": "d4eb971db353ccf78cefb3be1b05483b69ec1e69", "type": "github" } }, @@ -287,34 +275,32 @@ "nvim-tree-lua": { "flake": false, "locked": { - "lastModified": 1673160181, - "narHash": "sha256-61u31BqgVEbeBeVWP6wb8ZFYgCmpUp78HCO4KZktrZg=", + "lastModified": 1675128430, + "narHash": "sha256-gs50ubONKCxxXfR6wu6238s71R5Gmaot3unxpMFZOwM=", "owner": "kyazdani42", "repo": "nvim-tree.lua", - "rev": "ccb6d8a518d32e22bf5874f90e6c22661a5d8b46", + "rev": "215b29bfad74518442621b9d0483a621483b066b", "type": "github" }, "original": { "owner": "kyazdani42", "repo": "nvim-tree.lua", - "rev": "ccb6d8a518d32e22bf5874f90e6c22661a5d8b46", "type": "github" } }, "nvim-web-devicons": { "flake": false, "locked": { - "lastModified": 1663532214, - "narHash": "sha256-e8FP68mEmPAEbk+rYEKKGi0ZTJHDCPxrulnivkzInXk=", + "lastModified": 1674870401, + "narHash": "sha256-DfU4UcCf6uFVpAr1Lng9Vvw/x16XOmz92Yr9qJKopBw=", "owner": "kyazdani42", "repo": "nvim-web-devicons", - "rev": "969728506c0175644a1d448f55e311ccdada7eaf", + "rev": "a421d183ef37dfa13f51a5805bed2381aebf9080", "type": "github" }, "original": { "owner": "kyazdani42", "repo": "nvim-web-devicons", - "rev": "969728506c0175644a1d448f55e311ccdada7eaf", "type": "github" } }, @@ -382,17 +368,16 @@ "tabby-nvim": { "flake": false, "locked": { - "lastModified": 1669130982, - "narHash": "sha256-dlxT2XJviaYXLbr2P/RFlWUqB+xgPhf2Yd0ZScQ+cG4=", + "lastModified": 1675046887, + "narHash": "sha256-ddvT5lBLFWJnms4P+7Au1Bbou6mar0Eni+IgQQV4z0k=", "owner": "nanozuki", "repo": "tabby.nvim", - "rev": "a7710f38ded0cda5b07e38f10c55ed1940b35b19", + "rev": "9065c65138b59ea8182024216a5bbcf0d77baebb", "type": "github" }, "original": { "owner": "nanozuki", "repo": "tabby.nvim", - "rev": "a7710f38ded0cda5b07e38f10c55ed1940b35b19", "type": "github" } }, @@ -409,41 +394,38 @@ "original": { "owner": "nvim-telescope", "repo": "telescope-live-grep-args.nvim", - "rev": "7de3baef1ec4fb77f7a8195fe87bebd513244b6a", "type": "github" } }, "telescope-nvim": { "flake": false, "locked": { - "lastModified": 1673080271, - "narHash": "sha256-O+SdBNGBDolhucmegcjR9Uf8/7L8+GOAKm0SzwSZqZo=", + "lastModified": 1675149856, + "narHash": "sha256-L4Kw94CUy6N7zcyy9INuR/O0fxQ7sp0IvGd/u7fHxMA=", "owner": "nvim-telescope", "repo": "telescope.nvim", - "rev": "04af51dbfb17c2afa0b8d82b0e842e0638201ca9", + "rev": "203bf5609137600d73e8ed82703d6b0e320a5f36", "type": "github" }, "original": { "owner": "nvim-telescope", "repo": "telescope.nvim", - "rev": "04af51dbfb17c2afa0b8d82b0e842e0638201ca9", "type": "github" } }, "theme": { "flake": false, "locked": { - "lastModified": 1663990749, - "narHash": "sha256-EdmZ5qXY10jkYBgtd/qe23Ccl5qwFm3bwXNQIG8Qn5A=", + "lastModified": 1675250216, + "narHash": "sha256-t7jVZoQwoLptfSo7WvA4DJe3mmqAk9R5nNcvldDSp8w=", "owner": "catppuccin", "repo": "nvim", - "rev": "9ac18414f0446478024b19018d73b7ea14f6fc96", + "rev": "8769e767f12f5bf0b7d1250ee067088e7054809a", "type": "github" }, "original": { "owner": "catppuccin", "repo": "nvim", - "rev": "9ac18414f0446478024b19018d73b7ea14f6fc96", "type": "github" } } diff --git a/flake.nix b/flake.nix index 6b260cd..07762ec 100644 --- a/flake.nix +++ b/flake.nix @@ -15,7 +15,7 @@ # https://github.com/gpanders/editorconfig.nvim editorconfig-nvim = { - url = "github:gpanders/editorconfig.nvim?rev=e72d2331b43e3f08d0ecca44cecded4e20c01fab"; + url = "github:gpanders/editorconfig.nvim"; flake = false; }; @@ -23,19 +23,19 @@ # https://github.com/kyazdani42/nvim-tree.lua nvim-tree-lua = { - url = "github:kyazdani42/nvim-tree.lua?rev=ccb6d8a518d32e22bf5874f90e6c22661a5d8b46"; + url = "github:kyazdani42/nvim-tree.lua"; flake = false; }; # https://github.com/nvim-telescope/telescope.nvim telescope-nvim = { - url = "github:nvim-telescope/telescope.nvim?rev=04af51dbfb17c2afa0b8d82b0e842e0638201ca9"; + url = "github:nvim-telescope/telescope.nvim"; flake = false; }; # https://github.com/nvim-telescope/telescope-live-grep-args.nvim telescope-live-grep-args-nvim = { - url = "github:nvim-telescope/telescope-live-grep-args.nvim?rev=7de3baef1ec4fb77f7a8195fe87bebd513244b6a"; + url = "github:nvim-telescope/telescope-live-grep-args.nvim"; flake = false; }; @@ -43,7 +43,7 @@ # https://github.com/sbdchd/neoformat neoformat = { - url = "github:sbdchd/neoformat?rev=918840f9f8944fdb05451e4a77d29b97898b415c"; + url = "github:sbdchd/neoformat"; flake = false; }; @@ -51,7 +51,7 @@ # https://github.com/lewis6991/gitsigns.nvim gitsigns-nvim = { - url = "github:lewis6991/gitsigns.nvim?rev=f98c85e7c3d65a51f45863a34feb4849c82f240f"; + url = "github:lewis6991/gitsigns.nvim"; flake = false; }; @@ -59,13 +59,13 @@ # https://github.com/neovim/nvim-lspconfig nvim-lspconfig = { - url = "github:neovim/nvim-lspconfig?rev=d4eb971db353ccf78cefb3be1b05483b69ec1e69"; + url = "github:neovim/nvim-lspconfig"; flake = false; }; # https://github.com/tamago324/nlsp-settings.nvim nlsp-settings-nvim = { - url = "github:tamago324/nlsp-settings.nvim?rev=effb5f50b2ad7d6070e429635384345ca4be078e"; + url = "github:tamago324/nlsp-settings.nvim"; flake = false; }; @@ -77,25 +77,25 @@ # https://github.com/L3MON4D3/LuaSnip luasnip = { - url = "github:L3MON4D3/LuaSnip?rev=d36c063b7f6e701852f7880f1314656592a61b4f"; + url = "github:L3MON4D3/LuaSnip"; flake = false; }; # https://github.com/hrsh7th/nvim-cmp nvim-cmp = { - url = "github:hrsh7th/nvim-cmp?rev=17a55b3d5498c617855d015bbcad0c872d10c879"; + url = "github:hrsh7th/nvim-cmp"; flake = false; }; # https://github.com/hrsh7th/cmp-nvim-lsp cmp-nvim-lsp = { - url = "github:hrsh7th/cmp-nvim-lsp?rev=affe808a5c56b71630f17aa7c38e15c59fd648a8"; + url = "github:hrsh7th/cmp-nvim-lsp"; flake = false; }; # https://github.com/saadparwaiz1/cmp_luasnip cmp-luasnip = { - url = "github:saadparwaiz1/cmp_luasnip?rev=a9de941bcbda508d0a45d28ae366bb3f08db2e36"; + url = "github:saadparwaiz1/cmp_luasnip"; flake = false; }; @@ -103,31 +103,31 @@ # https://github.com/nanozuki/tabby.nvim tabby-nvim = { - url = "github:nanozuki/tabby.nvim?rev=a7710f38ded0cda5b07e38f10c55ed1940b35b19"; + url = "github:nanozuki/tabby.nvim"; flake = false; }; # https://github.com/nvim-lualine/lualine.nvim lualine-nvim = { - url = "github:nvim-lualine/lualine.nvim?rev=a52f078026b27694d2290e34efa61a6e4a690621"; + url = "github:nvim-lualine/lualine.nvim"; flake = false; }; # https://github.com/arkav/lualine-lsp-progress lualine-lsp-progress = { - url = "github:/arkav/lualine-lsp-progress?rev=56842d097245a08d77912edf5f2a69ba29f275d7"; + url = "github:/arkav/lualine-lsp-progress"; flake = false; }; # https://github.com/kyazdani42/nvim-web-devicons nvim-web-devicons = { - url = "github:kyazdani42/nvim-web-devicons?rev=969728506c0175644a1d448f55e311ccdada7eaf"; + url = "github:kyazdani42/nvim-web-devicons"; flake = false; }; # https://github.com/catppuccin/nvim theme = { - url = "github:catppuccin/nvim?rev=9ac18414f0446478024b19018d73b7ea14f6fc96"; + url = "github:catppuccin/nvim"; flake = false; }; @@ -135,7 +135,7 @@ # https://github.com/phaazon/hop.nvim hop-nvim = { - url = "github:phaazon/hop.nvim?rev=6591b3656b75ff313cc38dc662a7ee8f75f1c165"; + url = "github:phaazon/hop.nvim"; flake = false; }; @@ -235,7 +235,6 @@ plugins = with minimalNeovim.nix2lua; { nvimTree.settings = { - open_on_setup = true; renderer = { group_empty = true; full_name = true; diff --git a/plugins/explorer/nvim-tree.lua b/plugins/explorer/nvim-tree.lua index ab1a52d..ea9b914 100644 --- a/plugins/explorer/nvim-tree.lua +++ b/plugins/explorer/nvim-tree.lua @@ -3,3 +3,24 @@ require("nvim-tree").setup(@nvimTreeLuaSettings@) vim.keymap.set("n", "nt", "NvimTreeToggle") vim.keymap.set("n", "nf", "NvimTreeFindFile") + +local function open_nvim_tree(data) + -- buffer is a [No Name] + local no_name = data.file == "" and vim.bo[data.buf].buftype == "" + -- buffer is a directory + local directory = vim.fn.isdirectory(data.file) == 1 + + if not no_name and not directory then + return + end + + -- change to the directory + if directory then + vim.cmd.cd(data.file) + end + + -- open the tree + require("nvim-tree.api").tree.open() +end + +vim.api.nvim_create_autocmd({ "VimEnter" }, { callback = open_nvim_tree }) diff --git a/plugins/lsp/lspconfig.lua b/plugins/lsp/lspconfig.lua index c324161..e58fc26 100644 --- a/plugins/lsp/lspconfig.lua +++ b/plugins/lsp/lspconfig.lua @@ -47,8 +47,7 @@ local on_attach = function(client, bufnr) end -- nvim-cmp -local capabilities = vim.lsp.protocol.make_client_capabilities() -capabilities = require("cmp_nvim_lsp").update_capabilities(capabilities) +local capabilities = require("cmp_nvim_lsp").default_capabilities() -- for local configurations nlsp_settings.setup({})