diff --git a/dotfiles/fish/config.fish b/dotfiles/fish/config.fish index ebdacbf..37148a4 100644 --- a/dotfiles/fish/config.fish +++ b/dotfiles/fish/config.fish @@ -18,6 +18,7 @@ if status is-interactive # abbr (from 3.6, --universal is removed) abbr -a -- l less abbr -a -- ll 'eza -la --icons --git' + abbr -a -- qpv 'qpdfview --unique' zoxide init fish | source diff --git a/dotfiles/neovim/init.lua b/dotfiles/neovim/init.lua index d37aed4..6445df9 100644 --- a/dotfiles/neovim/init.lua +++ b/dotfiles/neovim/init.lua @@ -1,7 +1,7 @@ ----------------------------------------------------------- -- Installing plugin manager 'lazy.nvim' local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" -if not vim.loop.fs_stat(lazypath) then +if not (vim.uv or vim.loop).fs_stat(lazypath) then vim.fn.system({ "git", "clone", @@ -131,7 +131,40 @@ require('lazy').setup({ }, { 'folke/trouble.nvim', - -- config = function + opts = {}, + cmd = "Trouble", + keys = { + { + "xx", + "Trouble diagnostics toggle", + desc = "Diagnostics (Trouble)", + }, + { + "xX", + "Trouble diagnostics toggle filter.buf=0", + desc = "Buffer Diagnostics (Trouble)", + }, + { + "cs", + "Trouble symbols toggle focus=false", + desc = "Symbols (Trouble)", + }, + { + "cl", + "Trouble lsp toggle focus=false win.position=bottom", + desc = "LSP Definitions / references / ... (Trouble)", + }, + { + "xL", + "Trouble loclist toggle", + desc = "Location List (Trouble)", + }, + { + "xQ", + "Trouble qflist toggle", + desc = "Quickfix List (Trouble)", + }, + }, }, { 'Julian/lean.nvim', diff --git a/dotfiles/neovim/lua/lualine_setup.lua b/dotfiles/neovim/lua/lualine_setup.lua index 7f412d4..ce01287 100644 --- a/dotfiles/neovim/lua/lualine_setup.lua +++ b/dotfiles/neovim/lua/lualine_setup.lua @@ -1,7 +1,7 @@ -- https://qiita.com/uhooi/items/99aeff822d4870a8e269 local lsp_names = function () local clients = {} - for _, client in ipairs(vim.lsp.get_active_clients({ bufnr = 0})) do + for _, client in ipairs(vim.lsp.get_clients({ bufnr = 0})) do table.insert(clients, client.name) end return ' ' .. table.concat(clients, ', ')