From b8af6c5cc3f006f9841d94fa93f9c0a5412a84f2 Mon Sep 17 00:00:00 2001 From: elkowar <5300871+elkowar@users.noreply.github.com> Date: Fri, 23 Apr 2021 17:41:29 +0200 Subject: [PATCH] asdf --- files/.config/nvim/fnl/plugins/lsp.fnl | 7 ++--- files/.config/nvim/lua/plugins/lsp.lua | 12 ++++--- files/.config/nvim/plugin/packer_compiled.vim | 16 ++++++++++ files/.config/nvim/plugins.lua | 31 +++++++------------ 4 files changed, 38 insertions(+), 28 deletions(-) diff --git a/files/.config/nvim/fnl/plugins/lsp.fnl b/files/.config/nvim/fnl/plugins/lsp.fnl index 37d13b8..4853208 100644 --- a/files/.config/nvim/fnl/plugins/lsp.fnl +++ b/files/.config/nvim/fnl/plugins/lsp.fnl @@ -6,13 +6,12 @@ lsp-configs lspconfig.configs saga lspsaga utils utils - compe compe} - - + compe compe + lsp_signature lsp_signature} require-macros [macros]}) - (fn on_attach [client bufnr] + (lsp_signature.on_attach) (if client.resolved_capabilities.document_highlight (do (utils.highlight "LspReferenceRead" {:gui "underline"}) diff --git a/files/.config/nvim/lua/plugins/lsp.lua b/files/.config/nvim/lua/plugins/lsp.lua index 71a7f23..6cbcd2e 100644 --- a/files/.config/nvim/lua/plugins/lsp.lua +++ b/files/.config/nvim/lua/plugins/lsp.lua @@ -19,11 +19,11 @@ end local function _1_(...) local ok_3f_0_, val_0_ = nil, nil 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 ok_3f_0_, val_0_ = pcall(_1_) 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_ else return print(val_0_) @@ -35,13 +35,15 @@ local compe = _local_0_[2] local fennel = _local_0_[3] local lsp = _local_0_[4] local lsp_configs = _local_0_[5] -local nvim = _local_0_[6] -local saga = _local_0_[7] -local utils = _local_0_[8] +local lsp_signature = _local_0_[6] +local nvim = _local_0_[7] +local saga = _local_0_[8] +local utils = _local_0_[9] local _2amodule_2a = _0_0 local _2amodule_name_2a = "plugins.lsp" do local _ = ({nil, _0_0, {{nil}, nil, nil, nil}})[2] end local function on_attach(client, bufnr) + lsp_signature.on_attach() if client.resolved_capabilities.document_highlight then utils.highlight("LspReferenceRead", {gui = "underline"}) utils.highlight("LspReferenceText", {gui = "underline"}) diff --git a/files/.config/nvim/plugin/packer_compiled.vim b/files/.config/nvim/plugin/packer_compiled.vim index a122173..35a00a2 100644 --- a/files/.config/nvim/plugin/packer_compiled.vim +++ b/files/.config/nvim/plugin/packer_compiled.vim @@ -109,6 +109,10 @@ _G.packer_plugins = { loaded = true, 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"] = { loaded = true, path = "/home/leon/.local/share/nvim/site/pack/packer/start/lspsaga.nvim" @@ -137,6 +141,11 @@ _G.packer_plugins = { loaded = true, 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"] = { loaded = true, 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 = , l2 = , bang = , args = }, _G.packer_plugins)]] 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 END diff --git a/files/.config/nvim/plugins.lua b/files/.config/nvim/plugins.lua index 8d6833d..60989c2 100644 --- a/files/.config/nvim/plugins.lua +++ b/files/.config/nvim/plugins.lua @@ -13,11 +13,17 @@ vim.cmd [[packadd packer.nvim]] require("packer").startup(function(use) - use_rocks 'rtsisyk/fun' + use_rocks "rtsisyk/fun" + -- better quickfix window use "kevinhwang91/nvim-bqf" - use "akinsho/nvim-bufferline.lua" + -- json query stuff + use { + "gennaro-tedesco/nvim-jqx", + ft = { "json" } + } + use { "Olical/aniseed", @@ -26,30 +32,21 @@ require("packer").startup(function(use) -- general purpose lua wrappers for nvim stuff use "norcalli/nvim.lua" - + use "akinsho/nvim-bufferline.lua" use "tweekmonster/startuptime.vim" use "tpope/vim-repeat" - use { "junegunn/goyo.vim", cmd = "Goyo", } - use "liuchengxu/vim-which-key" - use "mhinz/vim-signify" - use "tpope/vim-fugitive" - use "preservim/nerdcommenter" - use "glepnir/galaxyline.nvim" - 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 "tpope/vim-surround" - use "christoomey/vim-tmux-navigator" -- good integration with tmux pane switching use "nathanaelkane/vim-indent-guides" -- Can be toggled using ig (intent-guides) @@ -59,7 +56,6 @@ require("packer").startup(function(use) 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 "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 use { "iamcco/markdown-preview.nvim", @@ -67,22 +63,19 @@ require("packer").startup(function(use) } use "machakann/vim-highlightedyank" - use "ciaranm/detectindent" use "pechorin/any-jump.vim" use "justinmk/vim-sneak" use "psliwka/vim-smoothie" - use "editorconfig/editorconfig-vim" - use "honza/vim-snippets" - use "tommcdo/vim-exchange" - use "kien/rainbow_parentheses.vim" - use "bhurlow/vim-parinfer" + + use "ray-x/lsp_signature.nvim" + -- Language Plugins ----------------------------------------------------- {{{ use "bduggan/vim-raku"