proctor/dotfiles
1
0
Fork 0
mirror of https://github.com/stevenproctor/dotfiles.git synced 2026-01-28 10:09:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: proctor:9c7237c7e15547770f657d9d71583c8012926e1c
Branches Tags
proctor:master proctor:clojure_markdown_treesitter_experiment
...
compare: proctor:037ad7d879e006dfccf63198d9cacd8f3bcd92b7
Branches Tags
proctor:master proctor:clojure_markdown_treesitter_experiment

2 Commits
9c7237c7e1 ... 037ad7d879

Author SHA1 Message Date
Steven Proctor
037ad7d879 neovim - fix plugin load race condition for mason and lspconfig 2023-04-18 20:41:48 -05:00
Steven Proctor
948c8b4345 neovim - rainbow csv and base64 plugins 2023-04-18 20:41:09 -05:00
3 changed files with 16 additions and 6 deletions
Expand all files Collapse all files

6
nvim/.config/nvim/fnl/dotfiles/plugin/lspconfig.fnl
View File

@@ -5,6 +5,7 @@
lsp vim.lsp lsp vim.lsp
lspconfig lspconfig lspconfig lspconfig
nu aniseed.nvim.util nu aniseed.nvim.util
mason dotfiles.plugin.mason
cmp_nvim_lsp cmp_nvim_lsp}}) cmp_nvim_lsp cmp_nvim_lsp}})
(defn bufmap [mode from to] (u.noremap mode from to {:local? true})) (defn bufmap [mode from to] (u.noremap mode from to {:local? true}))
@@ -146,7 +147,10 @@
args (a.concat opts [...])] args (a.concat opts [...])]
(vim.lsp.buf.execute_command {:command cmd :arguments args}))) (vim.lsp.buf.execute_command {:command cmd :arguments args})))
(when-let [mason-lspconfig (require :mason-lspconfig)] (mason-lspconfig.setup) (mason.setup)
(when-let [mason-lspconfig (require :mason-lspconfig)]
(mason-lspconfig.setup)
(mason-lspconfig.setup_handlers {1 default-server-handler})) (mason-lspconfig.setup_handlers {1 default-server-handler}))
(u.nnoremap :<leader>li :LspInfo) (u.nnoremap :<leader>li :LspInfo)

12
nvim/.config/nvim/fnl/dotfiles/plugin/mason.fnl
View File

@@ -1,6 +1,10 @@
(module dotfiles.plugin.mason (module dotfiles.plugin.mason
{autoload {nvim aniseed.nvim mason mason mason-lspconf mason-lspconfig}}) {autoload {a aniseed.core
nvim aniseed.nvim mason mason mason-lspconf mason-lspconfig}})
(mason.setup {:ui {:icons {:package_installed "✓"}}}) (defn setup []
(when mason
(mason-lspconf.setup {:ensure_installed [:lua_ls]}) (mason.setup {:ui {:icons {:package_installed "✓"}}})
(when mason-lspconf
(mason-lspconf.setup {:ensure_installed [:lua_ls]})
(mason-lspconf.setup_handlers {1 default-server-handler}))))

2
nvim/.config/nvim/fnl/dotfiles/plugins.fnl
View File

@@ -24,6 +24,7 @@
:ahmedkhalf/project.nvim {} :ahmedkhalf/project.nvim {}
:airblade/vim-gitgutter {} :airblade/vim-gitgutter {}
:clojure-vim/vim-jack-in {} :clojure-vim/vim-jack-in {}
:christianrondeau/vim-base64 {}
:dhruvasagar/vim-table-mode {} :dhruvasagar/vim-table-mode {}
:folke/lsp-colors.nvim {} :folke/lsp-colors.nvim {}
:folke/which-key.nvim {:mod :whichkey} :folke/which-key.nvim {:mod :whichkey}
@@ -54,6 +55,7 @@
:lukas-reineke/headlines.nvim {:mod :headlines} :lukas-reineke/headlines.nvim {:mod :headlines}
; :michaelb/sniprun {:run "bash ./install.sh" :mod :sniprun} ; :michaelb/sniprun {:run "bash ./install.sh" :mod :sniprun}
:mrjones2014/smart-splits.nvim {:mod :smartsplits} :mrjones2014/smart-splits.nvim {:mod :smartsplits}
:mechatroner/rainbow_csv {}
:neovim/nvim-lspconfig {:mod :lspconfig} :neovim/nvim-lspconfig {:mod :lspconfig}
:norcalli/nvim-colorizer.lua {:mod :colorizer} :norcalli/nvim-colorizer.lua {:mod :colorizer}
:nvim-orgmode/orgmode {:mod :orgmode} :nvim-orgmode/orgmode {:mod :orgmode}