From d923a2e354653d87cecf361d4c046bbac97a9e94 Mon Sep 17 00:00:00 2001 From: Daniel Kempkens Date: Tue, 21 May 2024 20:59:48 +0200 Subject: [PATCH] nvim: cleanup plugins a bit --- home/config/nvim/plugins/comment.fnl | 4 +- home/config/nvim/plugins/project.fnl | 13 ----- home/config/nvim/plugins/treesitter.fnl | 1 + home/programs/nvim/default.nix | 10 +--- home/programs/nvim/plugins.nix | 66 +++++++++---------------- home/programs/nvim/plugins.yaml | 4 +- 6 files changed, 27 insertions(+), 71 deletions(-) delete mode 100644 home/config/nvim/plugins/project.fnl diff --git a/home/config/nvim/plugins/comment.fnl b/home/config/nvim/plugins/comment.fnl index a535b61..ba7cd97 100644 --- a/home/config/nvim/plugins/comment.fnl +++ b/home/config/nvim/plugins/comment.fnl @@ -1,2 +1,2 @@ -(let [cmt (require :Comment)] - (cmt.setup {:padding true})) +(let [cmt (require :ts-comments)] + (cmt.setup {})) diff --git a/home/config/nvim/plugins/project.fnl b/home/config/nvim/plugins/project.fnl deleted file mode 100644 index 31610b8..0000000 --- a/home/config/nvim/plugins/project.fnl +++ /dev/null @@ -1,13 +0,0 @@ -(let [project (require :project_nvim)] - (project.setup {:detection_methods [:pattern :lsp] - :patterns [:.git - :_darcs - :.hg - :.bzr - :.svn - :.gitlab-ci.yml - :flake.nix - :init.lua - :Makefile - :mix.exs - :package.json]})) diff --git a/home/config/nvim/plugins/treesitter.fnl b/home/config/nvim/plugins/treesitter.fnl index 1b2a590..4e31ae1 100644 --- a/home/config/nvim/plugins/treesitter.fnl +++ b/home/config/nvim/plugins/treesitter.fnl @@ -26,6 +26,7 @@ :javascript :jsdoc :json + :just :lua :make :markdown diff --git a/home/programs/nvim/default.nix b/home/programs/nvim/default.nix index 7569323..894afe1 100644 --- a/home/programs/nvim/default.nix +++ b/home/programs/nvim/default.nix @@ -113,8 +113,6 @@ in type = "fennel"; } - vim-just - { plugin = rainbow-delimiters-nvim; config = builtins.readFile ../../config/nvim/plugins/rainbow-delimiters.fnl; @@ -136,12 +134,6 @@ in pkgs.vimPlugins.telescope-zf-native-nvim - { - plugin = project-nvim; - config = builtins.readFile ../../config/nvim/plugins/project.fnl; - type = "fennel"; - } - telescope-ui-select-nvim telescope-undo-nvim @@ -179,7 +171,7 @@ in # Comments { - plugin = comment-nvim; + plugin = ts-comments-nvim; config = builtins.readFile ../../config/nvim/plugins/comment.fnl; type = "fennel"; } diff --git a/home/programs/nvim/plugins.nix b/home/programs/nvim/plugins.nix index f1cda7e..0da4856 100644 --- a/home/programs/nvim/plugins.nix +++ b/home/programs/nvim/plugins.nix @@ -29,7 +29,7 @@ in }; nvim-web-devicons = buildVimPlugin { pname = "nvim-web-devicons"; - version = "2024-05-13"; + version = "2024-05-14"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-web-devicons"; @@ -117,23 +117,12 @@ in }; nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "2024-05-20"; + version = "2024-05-21"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "7c9c5bed8340031f8a6dad47a58a26eaf15b9a56"; - sha256 = "0lki07zrpakm944kn0dpxkc2b50ank5n8idnvkl3lrwlcqyfjaqg"; - fetchSubmodules = false; - }; - }; - vim-just = buildVimPlugin { - pname = "vim-just"; - version = "2024-05-01"; - src = fetchFromGitHub { - owner = "NoahTheDuke"; - repo = "vim-just"; - rev = "a621ede3bcf551144358c112ba1f4e6c2e84e092"; - sha256 = "1ih2jd14faq80jdxrz42pdmcnz3k5pl4h5hn90x03w1m14bkpmxz"; + rev = "73fb37ed77b18ac357ca8e6e35835a8db6602332"; + sha256 = "0bmq29ab8jigwz31xywgw1wb4apw4k0z7pb9fad5hl2b8z0cbbz7"; fetchSubmodules = false; }; }; @@ -170,17 +159,6 @@ in fetchSubmodules = false; }; }; - project-nvim = buildVimPlugin { - pname = "project.nvim"; - version = "2023-04-04"; - src = fetchFromGitHub { - owner = "ahmedkhalf"; - repo = "project.nvim"; - rev = "8c6bad7d22eef1b71144b401c9f74ed01526a4fb"; - sha256 = "1md639mcs3dgvhvx93wi0rxiwjnb195r9al9bfqvcvl3r307gxba"; - fetchSubmodules = false; - }; - }; telescope-ui-select-nvim = buildVimPlugin { pname = "telescope-ui-select.nvim"; version = "2023-12-04"; @@ -205,12 +183,12 @@ in }; nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2024-05-20"; + version = "2024-05-21"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "9bda20fb967075355f253911bc066a8b5a03c77e"; - sha256 = "05y3gnfi4wqi521i2m481gc4ay6j5vcww18c8jpn6bj42slgl6z3"; + rev = "0b8165cf95806bc4bb8f745bb0c92021b2ed4b98"; + sha256 = "1xs2w7pjq0yhd9i5rc28b50h69kgf3xy1dhmd38avladkxmpp0ky"; fetchSubmodules = false; }; }; @@ -227,7 +205,7 @@ in }; schemastore-nvim = buildVimPlugin { pname = "schemastore.nvim"; - version = "2024-05-19"; + version = "2024-05-20"; src = fetchFromGitHub { owner = "b0o"; repo = "schemastore.nvim"; @@ -280,14 +258,14 @@ in fetchSubmodules = false; }; }; - comment-nvim = buildVimPlugin { - pname = "comment.nvim"; - version = "2023-08-07"; + ts-comments-nvim = buildVimPlugin { + pname = "ts-comments.nvim"; + version = "2024-05-21"; src = fetchFromGitHub { - owner = "numtostr"; - repo = "comment.nvim"; - rev = "0236521ea582747b58869cb72f70ccfa967d2e89"; - sha256 = "1mvi7c6n9ybgs6lfylzhkidifa6jkgsbj808knx57blvi5k7blgr"; + owner = "folke"; + repo = "ts-comments.nvim"; + rev = "57e6c133c6091e1eba25ffd77697563d3f8ffc68"; + sha256 = "025j43vifr9d8sab6wv8aqjil526zw20zl4lvq3fwilgdwzhshhy"; fetchSubmodules = false; }; }; @@ -392,7 +370,7 @@ in }; nvim-autopairs = buildVimPlugin { pname = "nvim-autopairs"; - version = "2024-05-19"; + version = "2024-05-20"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; @@ -447,12 +425,12 @@ in }; heirline-nvim = buildVimPlugin { pname = "heirline.nvim"; - version = "2024-05-20"; + version = "2024-05-21"; src = fetchFromGitHub { owner = "rebelot"; repo = "heirline.nvim"; - rev = "fe7a8e8a747f156f6eac86ec75122652cf9563f4"; - sha256 = "1pl5w5aligzw9x71lv22f50hi7jfaynp8kxpr4jhc6c2gi2l65x0"; + rev = "0d797435e54645a5f98bad7ad6046aac1ef95c1e"; + sha256 = "0payyx0j0s4wgk5xvczdnjqkj5nymlhw4f7hcw3sl9m334vnxshb"; fetchSubmodules = false; }; }; @@ -513,12 +491,12 @@ in }; neogit = buildVimPlugin { pname = "neogit"; - version = "2024-05-19"; + version = "2024-05-21"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "b93316d15c590377f50ca61e70e9129e4aa9b848"; - sha256 = "13g6rjd70x73jnpv4mp4pb8nyjrphdsnwk81w8z732jgdb8058vy"; + rev = "5b7bad8056a65578a7fbd1c703850245594d0f9f"; + sha256 = "05z7z6f1dick6xn6m0613zj2lgy7vr2hdqqidqvzv8v8vb65qa9q"; fetchSubmodules = false; }; }; diff --git a/home/programs/nvim/plugins.yaml b/home/programs/nvim/plugins.yaml index dca5d7d..bbadb27 100644 --- a/home/programs/nvim/plugins.yaml +++ b/home/programs/nvim/plugins.yaml @@ -13,12 +13,10 @@ - src: Mofiqul/dracula.nvim # Syntax - src: nvim-treesitter/nvim-treesitter -- src: NoahTheDuke/vim-just - src: HiPhish/rainbow-delimiters.nvim - src: folke/todo-comments.nvim # Telescope - src: nvim-telescope/telescope.nvim -- src: ahmedkhalf/project.nvim - src: nvim-telescope/telescope-ui-select.nvim - src: debugloop/telescope-undo.nvim # LSP @@ -31,7 +29,7 @@ # Linter - src: mfussenegger/nvim-lint # Comments -- src: numtostr/comment.nvim +- src: folke/ts-comments.nvim # Snippets - src: L3MON4D3/LuaSnip # cmp