diff options
| -rw-r--r-- | after/ftplugin/lua.lua (renamed from lua/user/lua.lua) | 0 | ||||
| -rw-r--r-- | init.lua | 35 | ||||
| -rw-r--r-- | lua/user/lsp/lsp-installer.lua | 2 | ||||
| -rw-r--r-- | lua/user/lsp/settings/r_language_server.lua | 2 | ||||
| -rw-r--r-- | lua/user/plugins.lua | 1 | ||||
| -rw-r--r-- | lua/user/whichkey.lua | 2 |
6 files changed, 21 insertions, 21 deletions
diff --git a/lua/user/lua.lua b/after/ftplugin/lua.lua index a37b3e7..a37b3e7 100644 --- a/lua/user/lua.lua +++ b/after/ftplugin/lua.lua @@ -1,18 +1,17 @@ -require "user.options" -require "user.keymaps" -require "user.plugins" -require "user.colorscheme" -require "user.cmp" -require "user.lsp" -require "user.telescope" -require "user.treesitter" -require "user.autopairs" -require "user.lua" -require "user.comment" -require "user.gitsigns" -require "user.nvim-tree" -require "user.bufferline" -require "user.lualine" -require "user.toggleterm" -require "user.indentline" -require "user.whichkey" + require "user.options" + require "user.keymaps" + require "user.plugins" + require "user.colorscheme" + require "user.cmp" + require "user.lsp" + require "user.telescope" + require "user.treesitter" + require "user.autopairs" + require "user.comment" + require "user.gitsigns" + require "user.nvim-tree" + require "user.bufferline" + require "user.lualine" + require "user.toggleterm" + require "user.indentline" + require "user.whichkey" diff --git a/lua/user/lsp/lsp-installer.lua b/lua/user/lsp/lsp-installer.lua index 2057007..f86b7b7 100644 --- a/lua/user/lsp/lsp-installer.lua +++ b/lua/user/lsp/lsp-installer.lua @@ -51,7 +51,7 @@ lsp_installer.on_server_ready(function(server) opts = vim.tbl_deep_extend("force", html_opts, opts) end - if server.name == "ltex" then + if server.name == "ltex-ls" then local ltex_opts = require("user.lsp.settings.ltex") opts = vim.tbl_deep_extend("force", ltex_opts, opts) end diff --git a/lua/user/lsp/settings/r_language_server.lua b/lua/user/lsp/settings/r_language_server.lua index fbe8846..d7e242d 100644 --- a/lua/user/lsp/settings/r_language_server.lua +++ b/lua/user/lsp/settings/r_language_server.lua @@ -2,7 +2,7 @@ return { settings = { R = { - filetypes = { 'r' }, + filetypes = { 'r','rmd' }, single_file_support = true, } } diff --git a/lua/user/plugins.lua b/lua/user/plugins.lua index 6008cd7..c528f95 100644 --- a/lua/user/plugins.lua +++ b/lua/user/plugins.lua @@ -56,6 +56,7 @@ return packer.startup(function(use) use "numToStr/Comment.nvim" -- Easily comment stuff use "nvim-lualine/lualine.nvim" use "windwp/nvim-autopairs" -- Autopairs, integrates with both cmp and treesitter + use "vimwiki/vimwiki" -- Colorschemes use "lunarvim/colorschemes" -- A bunch of colorschemes you can try out diff --git a/lua/user/whichkey.lua b/lua/user/whichkey.lua index 3d7abca..8a1bd2a 100644 --- a/lua/user/whichkey.lua +++ b/lua/user/whichkey.lua @@ -108,7 +108,7 @@ local mappings = { g = { name = "Git", - g = { "<cmd>lua _LAZYGIT_TOGGLE()<CR>", "Lazygit" }, + G = { "<cmd>lua _LAZYGIT_TOGGLE()<CR>", "Lazygit" }, j = { "<cmd>lua require 'gitsigns'.next_hunk()<cr>", "Next Hunk" }, k = { "<cmd>lua require 'gitsigns'.prev_hunk()<cr>", "Prev Hunk" }, l = { "<cmd>lua require 'gitsigns'.blame_line()<cr>", "Blame" }, |