From a351158e4facbe3b77c7486fb7523d0168be07ff Mon Sep 17 00:00:00 2001 From: Daniel Barber Date: Tue, 18 Jul 2023 17:08:38 -0500 Subject: [PATCH] Use more of tpope's plugins Also, switch out the nvim-test plugin for the original vim-test. --- config/nvim/lua/config/keymaps.lua | 2 +- .../lua/config/keymaps/{nvim-test.lua => test.lua} | 0 config/nvim/lua/config/options.lua | 3 +++ config/nvim/lua/config/plugins/guess-indent.lua | 7 +++++++ config/nvim/lua/plugins/init.lua | 12 +++++++++++- 5 files changed, 22 insertions(+), 2 deletions(-) rename config/nvim/lua/config/keymaps/{nvim-test.lua => test.lua} (100%) create mode 100644 config/nvim/lua/config/plugins/guess-indent.lua diff --git a/config/nvim/lua/config/keymaps.lua b/config/nvim/lua/config/keymaps.lua index b0ab01a..08c03be 100644 --- a/config/nvim/lua/config/keymaps.lua +++ b/config/nvim/lua/config/keymaps.lua @@ -28,4 +28,4 @@ keymap("n", "gm", ":TSJToggle", { desc = "Split or join code block" }) -- LSP require("config.keymaps.lsp") -require("config.keymaps.nvim-test") +require("config.keymaps.test") diff --git a/config/nvim/lua/config/keymaps/nvim-test.lua b/config/nvim/lua/config/keymaps/test.lua similarity index 100% rename from config/nvim/lua/config/keymaps/nvim-test.lua rename to config/nvim/lua/config/keymaps/test.lua diff --git a/config/nvim/lua/config/options.lua b/config/nvim/lua/config/options.lua index 199d997..9160643 100644 --- a/config/nvim/lua/config/options.lua +++ b/config/nvim/lua/config/options.lua @@ -32,6 +32,9 @@ vim.opt.splitright = true -- Add a space after comment characters vim.g.NERDSpaceDelims = 1 +-- Tests +vim.g["test#strategy"] = "toggleterm" + -- Neovide if vim.g.neovide then vim.g.neovide_cursor_animation_length = 0 diff --git a/config/nvim/lua/config/plugins/guess-indent.lua b/config/nvim/lua/config/plugins/guess-indent.lua new file mode 100644 index 0000000..21c5031 --- /dev/null +++ b/config/nvim/lua/config/plugins/guess-indent.lua @@ -0,0 +1,7 @@ +return { + "nmac427/guess-indent.nvim", + + config = function() + require("guess-indent").setup() + end, +} diff --git a/config/nvim/lua/plugins/init.lua b/config/nvim/lua/plugins/init.lua index 9551e9a..412f7d3 100644 --- a/config/nvim/lua/plugins/init.lua +++ b/config/nvim/lua/plugins/init.lua @@ -6,10 +6,21 @@ return { "hrsh7th/cmp-vsnip", "hrsh7th/vim-vsnip", "preservim/nerdcommenter", + "tpope/vim-bundler", + "tpope/vim-eunuch", "tpope/vim-fugitive", + "tpope/vim-projectionist", + "tpope/vim-rails", + "tpope/vim-rake", + "tpope/vim-repeat", + "tpope/vim-rhubarb", + "tpope/vim-surround", + "vim-ruby/vim-ruby", + "vim-test/vim-test", require("config.plugins.ascii"), require("config.plugins.colortils"), require("config.plugins.dashboard"), + require("config.plugins.guess-indent"), require("config.plugins.gitsigns"), require("config.plugins.lspconfig"), require("config.plugins.lualine"), @@ -18,7 +29,6 @@ return { require("config.plugins.null-ls"), require("config.plugins.nvim-cmp"), require("config.plugins.nvim-highlight-colors"), - require("config.plugins.nvim-test"), require("config.plugins.nvim-treesitter"), require("config.plugins.telescope"), require("config.plugins.toggleterm"),