diff --git a/lua/ward/plugins/nvim-tree.lua b/lua/ward/plugins/nvim-tree.lua index 98f89bd..d924783 100644 --- a/lua/ward/plugins/nvim-tree.lua +++ b/lua/ward/plugins/nvim-tree.lua @@ -15,10 +15,16 @@ return { require("nvim-tree").setup({ view = { width = 32, + relativenumber = true, }, filters = { git_ignored = false, }, + actions = { + open_file = { + quit_on_open = true, + }, + }, on_attach = function(bufnr) local api = require "nvim-tree.api" diff --git a/lua/ward/plugins/render-markdown.lua b/lua/ward/plugins/render-markdown.lua index 0d33116..cc42b4e 100644 --- a/lua/ward/plugins/render-markdown.lua +++ b/lua/ward/plugins/render-markdown.lua @@ -1,4 +1,3 @@ ----@type NvPluginSpec -- NOTE: This plugin activly shows the result of your markdown while you're typing it -- URL: https://https://github.com/MeanderingProgrammer/render-markdown.nvim return { @@ -6,7 +5,5 @@ return { -- dependencies = { 'nvim-treesitter/nvim-treesitter', 'echasnovski/mini.nvim' }, -- if you use the mini.nvim suite -- dependencies = { 'nvim-treesitter/nvim-treesitter', 'echasnovski/mini.icons' }, -- if you use standalone mini plugins dependencies = { 'nvim-treesitter/nvim-treesitter', 'nvim-tree/nvim-web-devicons' }, -- if you prefer nvim-web-devicons - ---@module 'render-markdown' - ---@type render.md.UserConfig opts = {}, } diff --git a/lua/ward/plugins/toggleterm.lua b/lua/ward/plugins/toggleterm.lua index 2f18f58..b00365f 100644 --- a/lua/ward/plugins/toggleterm.lua +++ b/lua/ward/plugins/toggleterm.lua @@ -16,7 +16,7 @@ return { return 20 end, }) - vim.keymap.set('n', 't', ":ToggleTerm name=BottomTerm") + vim.keymap.set('n', '`', ":ToggleTerm name=BottomTerm", { desc = "ToggleTerm" }) --vim.keymap.set('n', 'tv', ":ToggleTerm direction=vertical name=VerticalTerm") --vim.keymap.set('n', 'tf', ":ToggleTerm direction=float name=FloatTerm") end, diff --git a/lua/ward/plugins/trouble.lua b/lua/ward/plugins/trouble.lua new file mode 100644 index 0000000..0f93dc2 --- /dev/null +++ b/lua/ward/plugins/trouble.lua @@ -0,0 +1,39 @@ +--$ URL: https://github.com/folke/trouble.nvim +--# :help trouble +return { + "folke/trouble.nvim", + opts = {}, -- for default options, refer to the configuration section for custom setup. + cmd = "Trouble", + keys = { + { + "tx", + "Trouble diagnostics toggle", + desc = "Diagnostics (Trouble)", + }, + { + "tq", + "Trouble diagnostics toggle filter.buf=0", + desc = "Buffer Diagnostics (Trouble)", + }, + { + "ts", + "Trouble symbols toggle focus=false", + desc = "Symbols (Trouble)", + }, + { + "tl", + "Trouble lsp toggle focus=false win.position=right", + desc = "LSP Definitions / references / ... (Trouble)", + }, + { + "tL", + "Trouble loclist toggle", + desc = "Location List (Trouble)", + }, + { + "tq", + "Trouble qflist toggle", + desc = "Quickfix List (Trouble)", + }, + }, +} diff --git a/lua/ward/plugins/which-key.lua b/lua/ward/plugins/which-key.lua index f05e3c7..5c10517 100644 --- a/lua/ward/plugins/which-key.lua +++ b/lua/ward/plugins/which-key.lua @@ -22,7 +22,7 @@ return { local wk = require("which-key") wk.add({ { "b", group = "Buffers" }, - { "t", group = "Terminal" }, + { "t", group = "Trouble" }, { "v", group = "Vim" }, { "l", group = "LSP" }, { "x", group = "Plugins" }, diff --git a/lua/ward/setup.lua b/lua/ward/setup.lua index 40b496a..d136598 100644 --- a/lua/ward/setup.lua +++ b/lua/ward/setup.lua @@ -17,12 +17,15 @@ vim.opt.wrap = false --vim.opt.colorcolumn= 110 vim.api.nvim_set_option_value("colorcolumn", "110", {}) -vim.opt.confirm = true -- confirm on quit with unsave changes -vim.opt.hlsearch = true -- highlight search +vim.opt.confirm = true -- confirm on quit with unsave changes +vim.opt.hlsearch = true -- highlight search vim.opt.incsearch = true -- incremental search vim.opt.termguicolors = true +--set shell=/usr/bin/zsh +vim.opt.shell='/usr/bin/zsh' + -- Sets colors to line numbers Above, Current and Below in this order function LineNumberColors() vim.api.nvim_set_hl(0, "LineNrAbove", { fg = "#51B3EC", bold = true })