This commit is contained in:
elkowar 2021-04-23 17:41:29 +02:00
parent 6ea22fa0ec
commit b8af6c5cc3
4 changed files with 38 additions and 28 deletions

View file

@ -6,13 +6,12 @@
lsp-configs lspconfig.configs lsp-configs lspconfig.configs
saga lspsaga saga lspsaga
utils utils utils utils
compe compe} compe compe
lsp_signature lsp_signature}
require-macros [macros]}) require-macros [macros]})
(fn on_attach [client bufnr] (fn on_attach [client bufnr]
(lsp_signature.on_attach)
(if client.resolved_capabilities.document_highlight (if client.resolved_capabilities.document_highlight
(do (do
(utils.highlight "LspReferenceRead" {:gui "underline"}) (utils.highlight "LspReferenceRead" {:gui "underline"})

View file

@ -19,11 +19,11 @@ end
local function _1_(...) local function _1_(...)
local ok_3f_0_, val_0_ = nil, nil local ok_3f_0_, val_0_ = nil, nil
local function _1_() local function _1_()
return {require("aniseed.core"), require("compe"), require("aniseed.fennel"), require("lspconfig"), require("lspconfig.configs"), require("aniseed.nvim"), require("lspsaga"), require("utils")} return {require("aniseed.core"), require("compe"), require("aniseed.fennel"), require("lspconfig"), require("lspconfig.configs"), require("lsp_signature"), require("aniseed.nvim"), require("lspsaga"), require("utils")}
end end
ok_3f_0_, val_0_ = pcall(_1_) ok_3f_0_, val_0_ = pcall(_1_)
if ok_3f_0_ then if ok_3f_0_ then
_0_0["aniseed/local-fns"] = {["require-macros"] = {macros = true}, require = {["lsp-configs"] = "lspconfig.configs", a = "aniseed.core", compe = "compe", fennel = "aniseed.fennel", lsp = "lspconfig", nvim = "aniseed.nvim", saga = "lspsaga", utils = "utils"}} _0_0["aniseed/local-fns"] = {["require-macros"] = {macros = true}, require = {["lsp-configs"] = "lspconfig.configs", a = "aniseed.core", compe = "compe", fennel = "aniseed.fennel", lsp = "lspconfig", lsp_signature = "lsp_signature", nvim = "aniseed.nvim", saga = "lspsaga", utils = "utils"}}
return val_0_ return val_0_
else else
return print(val_0_) return print(val_0_)
@ -35,13 +35,15 @@ local compe = _local_0_[2]
local fennel = _local_0_[3] local fennel = _local_0_[3]
local lsp = _local_0_[4] local lsp = _local_0_[4]
local lsp_configs = _local_0_[5] local lsp_configs = _local_0_[5]
local nvim = _local_0_[6] local lsp_signature = _local_0_[6]
local saga = _local_0_[7] local nvim = _local_0_[7]
local utils = _local_0_[8] local saga = _local_0_[8]
local utils = _local_0_[9]
local _2amodule_2a = _0_0 local _2amodule_2a = _0_0
local _2amodule_name_2a = "plugins.lsp" local _2amodule_name_2a = "plugins.lsp"
do local _ = ({nil, _0_0, {{nil}, nil, nil, nil}})[2] end do local _ = ({nil, _0_0, {{nil}, nil, nil, nil}})[2] end
local function on_attach(client, bufnr) local function on_attach(client, bufnr)
lsp_signature.on_attach()
if client.resolved_capabilities.document_highlight then if client.resolved_capabilities.document_highlight then
utils.highlight("LspReferenceRead", {gui = "underline"}) utils.highlight("LspReferenceRead", {gui = "underline"})
utils.highlight("LspReferenceText", {gui = "underline"}) utils.highlight("LspReferenceText", {gui = "underline"})

View file

@ -109,6 +109,10 @@ _G.packer_plugins = {
loaded = true, loaded = true,
path = "/home/leon/.local/share/nvim/site/pack/packer/start/haskell-vim" path = "/home/leon/.local/share/nvim/site/pack/packer/start/haskell-vim"
}, },
["lsp_signature.nvim"] = {
loaded = true,
path = "/home/leon/.local/share/nvim/site/pack/packer/start/lsp_signature.nvim"
},
["lspsaga.nvim"] = { ["lspsaga.nvim"] = {
loaded = true, loaded = true,
path = "/home/leon/.local/share/nvim/site/pack/packer/start/lspsaga.nvim" path = "/home/leon/.local/share/nvim/site/pack/packer/start/lspsaga.nvim"
@ -137,6 +141,11 @@ _G.packer_plugins = {
loaded = true, loaded = true,
path = "/home/leon/.local/share/nvim/site/pack/packer/start/nvim-compe" path = "/home/leon/.local/share/nvim/site/pack/packer/start/nvim-compe"
}, },
["nvim-jqx"] = {
loaded = false,
needs_bufread = false,
path = "/home/leon/.local/share/nvim/site/pack/packer/opt/nvim-jqx"
},
["nvim-lspconfig"] = { ["nvim-lspconfig"] = {
loaded = true, loaded = true,
path = "/home/leon/.local/share/nvim/site/pack/packer/start/nvim-lspconfig" path = "/home/leon/.local/share/nvim/site/pack/packer/start/nvim-lspconfig"
@ -310,6 +319,13 @@ time("Defining lazy-load commands", true)
vim.cmd [[command! -nargs=* -range -bang -complete=file Goyo lua require("packer.load")({'goyo.vim'}, { cmd = "Goyo", l1 = <line1>, l2 = <line2>, bang = <q-bang>, args = <q-args> }, _G.packer_plugins)]] vim.cmd [[command! -nargs=* -range -bang -complete=file Goyo lua require("packer.load")({'goyo.vim'}, { cmd = "Goyo", l1 = <line1>, l2 = <line2>, bang = <q-bang>, args = <q-args> }, _G.packer_plugins)]]
time("Defining lazy-load commands", false) time("Defining lazy-load commands", false)
vim.cmd [[augroup packer_load_aucmds]]
vim.cmd [[au!]]
-- Filetype lazy-loads
time("Defining lazy-load filetype autocommands", true)
vim.cmd [[au FileType json ++once lua require("packer.load")({'nvim-jqx'}, { ft = "json" }, _G.packer_plugins)]]
time("Defining lazy-load filetype autocommands", false)
vim.cmd("augroup END")
if should_profile then save_profiles() end if should_profile then save_profiles() end
END END

View file

@ -13,11 +13,17 @@ vim.cmd [[packadd packer.nvim]]
require("packer").startup(function(use) require("packer").startup(function(use)
use_rocks 'rtsisyk/fun' use_rocks "rtsisyk/fun"
-- better quickfix window
use "kevinhwang91/nvim-bqf" use "kevinhwang91/nvim-bqf"
use "akinsho/nvim-bufferline.lua" -- json query stuff
use {
"gennaro-tedesco/nvim-jqx",
ft = { "json" }
}
use { use {
"Olical/aniseed", "Olical/aniseed",
@ -26,30 +32,21 @@ require("packer").startup(function(use)
-- general purpose lua wrappers for nvim stuff -- general purpose lua wrappers for nvim stuff
use "norcalli/nvim.lua" use "norcalli/nvim.lua"
use "akinsho/nvim-bufferline.lua"
use "tweekmonster/startuptime.vim" use "tweekmonster/startuptime.vim"
use "tpope/vim-repeat" use "tpope/vim-repeat"
use { use {
"junegunn/goyo.vim", "junegunn/goyo.vim",
cmd = "Goyo", cmd = "Goyo",
} }
use "liuchengxu/vim-which-key" use "liuchengxu/vim-which-key"
use "mhinz/vim-signify" use "mhinz/vim-signify"
use "tpope/vim-fugitive" use "tpope/vim-fugitive"
use "preservim/nerdcommenter" use "preservim/nerdcommenter"
use "glepnir/galaxyline.nvim" use "glepnir/galaxyline.nvim"
use "gruvbox-community/gruvbox" use "gruvbox-community/gruvbox"
use "godlygeek/tabular" -- :Tab /regex can align code on occurrences of the given regex. I.e. :Tab /= aligns all = signs in a block. use "godlygeek/tabular" -- :Tab /regex can align code on occurrences of the given regex. I.e. :Tab /= aligns all = signs in a block.
use "tpope/vim-surround" use "tpope/vim-surround"
use "christoomey/vim-tmux-navigator" -- good integration with tmux pane switching use "christoomey/vim-tmux-navigator" -- good integration with tmux pane switching
use "nathanaelkane/vim-indent-guides" -- Can be toggled using <leader>ig (intent-guides) use "nathanaelkane/vim-indent-guides" -- Can be toggled using <leader>ig (intent-guides)
@ -59,7 +56,6 @@ require("packer").startup(function(use)
use "mg979/vim-visual-multi" use "mg979/vim-visual-multi"
use "hauleth/sad.vim" -- Use siw instead of ciw. when using . afterwards, will find the next occurrence of the changed word and change it too use "hauleth/sad.vim" -- Use siw instead of ciw. when using . afterwards, will find the next occurrence of the changed word and change it too
use "wellle/targets.vim" -- more text objects. IE: cin) (change in next parens). generally better handling of surrounding objects. use "wellle/targets.vim" -- more text objects. IE: cin) (change in next parens). generally better handling of surrounding objects.
use "unblevable/quick-scope" -- highlight targets when pressing f<character> use "unblevable/quick-scope" -- highlight targets when pressing f<character>
use { use {
"iamcco/markdown-preview.nvim", "iamcco/markdown-preview.nvim",
@ -67,22 +63,19 @@ require("packer").startup(function(use)
} }
use "machakann/vim-highlightedyank" use "machakann/vim-highlightedyank"
use "ciaranm/detectindent" use "ciaranm/detectindent"
use "pechorin/any-jump.vim" use "pechorin/any-jump.vim"
use "justinmk/vim-sneak" use "justinmk/vim-sneak"
use "psliwka/vim-smoothie" use "psliwka/vim-smoothie"
use "editorconfig/editorconfig-vim" use "editorconfig/editorconfig-vim"
use "honza/vim-snippets" use "honza/vim-snippets"
use "tommcdo/vim-exchange" use "tommcdo/vim-exchange"
use "kien/rainbow_parentheses.vim" use "kien/rainbow_parentheses.vim"
use "bhurlow/vim-parinfer" use "bhurlow/vim-parinfer"
use "ray-x/lsp_signature.nvim"
-- Language Plugins ----------------------------------------------------- {{{ -- Language Plugins ----------------------------------------------------- {{{
use "bduggan/vim-raku" use "bduggan/vim-raku"