diff --git a/nvim/.config/nvim/fnl/dotfiles/conceal.fnl b/nvim/.config/nvim/fnl/dotfiles/conceal.fnl index a028590..62b7331 100644 --- a/nvim/.config/nvim/fnl/dotfiles/conceal.fnl +++ b/nvim/.config/nvim/fnl/dotfiles/conceal.fnl @@ -5,6 +5,7 @@ (def conceals {:defn :𝑓 + ;; :defn- : :fn :λ :lambda :λ :and :∧ @@ -36,8 +37,8 @@ (let [the-match (.. "\\<" the-match "\\>" )] (nvim.fn.matchadd :Conceal the-match 0 -1 {:conceal replacement}))) - (set nvim.wo.concealcursor :nvc) - (set nvim.wo.conceallevel 2)) + (set nvim.wo.conceallevel 2) + (set nvim.wo.concealcursor :nvc)) (defn toggle-conceal [] @@ -55,6 +56,6 @@ (def pretty-filetypes [:fennel :clojure]) -(each [_ ftype (pairs pretty-filetypes)] - (nvim.ex.autocmd :FileType ftype :call "SetupConceals()")) - +; (each [_ ftype (pairs pretty-filetypes)] +; (nvim.ex.autocmd :FileType ftype :call "SetupConceals()")) +; diff --git a/nvim/.config/nvim/fnl/dotfiles/plugin/compe.fnl b/nvim/.config/nvim/fnl/dotfiles/plugin/compe.fnl index 5d3734a..20195c2 100644 --- a/nvim/.config/nvim/fnl/dotfiles/plugin/compe.fnl +++ b/nvim/.config/nvim/fnl/dotfiles/plugin/compe.fnl @@ -25,7 +25,8 @@ :nvim_lsp true :nvim_lua true :conjure true - :vsnip true}}))) + :vsnip true + :vim_dadbod_completion true}}))) (nvim.ex.inoremap " compe#complete()") (nvim.ex.inoremap " compe#confirm('')") diff --git a/nvim/.config/nvim/fnl/dotfiles/plugin/lspconfig.fnl b/nvim/.config/nvim/fnl/dotfiles/plugin/lspconfig.fnl index 6e867c1..3ee180e 100644 --- a/nvim/.config/nvim/fnl/dotfiles/plugin/lspconfig.fnl +++ b/nvim/.config/nvim/fnl/dotfiles/plugin/lspconfig.fnl @@ -38,10 +38,12 @@ :K "lua vim.lsp.buf.hover()" "[g" "lua vim.lsp.diagnostic.goto_prev()" "]g" "lua vim.lsp.diagnostic.goto_prev()" - :ca "lua vim.lsp.buf.codeaction()" + : "lua vim.lsp.buf.signature_help()" + :ca "lua vim.lsp.buf.code_action()" + :cl "lua vim.lsp.codelens.run()" :sld "lua vim.lsp.diagnostic.show_line_diagnostics()" :rn "lua vim.lsp.buf.rename()" - :fa "lua vim.lsp.buf.formattting_sync()" + :fa "lua vim.lsp.buf.formatting_sync()" }) (def client-nmappings @@ -67,7 +69,7 @@ (nbufmap mapping cmd)) ; x mode mappings - (xbufmap :fa "lua vim.lsp.buf.formattting_sync()") + (xbufmap :fa "lua vim.lsp.buf.formatting_sync()") ; -- buf_set_keymap('n', 'gs', 'lua vim.lsp.buf.document_symbol()', opts) ; -- buf_set_keymap('n', 'gS', 'lua vim.lsp.buf.workspace_symbol()', opts) @@ -83,6 +85,7 @@ (bind-client-mappings client) (nvim.ex.autocmd :BufWritePre : :lua "vim.lsp.buf.formatting_sync()") + (nvim.ex.autocmd "BufEnter,CursorHold,InsertLeave" : :lua "vim.lsp.codelens.refresh()") ; client autocmds ; -- vim.api.nvim_command[[autocmd BufWritePre lua vim.lsp.buf_request_sync(vim.api.nvim_get_current_buf(), 'workspace/executeCommand', {command = 'clean-ns', arguments = {vim.uri_from_bufnr(0), vim.api.nvim_win_get_cursor(0)[1], vim.api.nvim_win_get_cursor(0)[2]}, title = 'Clean Namespace'})]] diff --git a/nvim/.config/nvim/fnl/dotfiles/plugin/telescope.fnl b/nvim/.config/nvim/fnl/dotfiles/plugin/telescope.fnl index db9703e..7120f1c 100644 --- a/nvim/.config/nvim/fnl/dotfiles/plugin/telescope.fnl +++ b/nvim/.config/nvim/fnl/dotfiles/plugin/telescope.fnl @@ -6,9 +6,10 @@ (telescope.setup {:defaults {:vimgrep_arguments ["ag" "--nocolor" "--noheading" - "--files-with-matches" "--number" "--column" + "--number" "--column" "--smart-case" "--hidden" "--follow" "--skip-vcs-ignores" - "-g" "!.git/"]}}) + ; "-g" "!.git/" + ]}}) (util.lnnoremap :ff "Telescope git_files hidden=true") diff --git a/nvim/.config/nvim/fnl/dotfiles/plugins.fnl b/nvim/.config/nvim/fnl/dotfiles/plugins.fnl index 92056b4..ba0b2f8 100644 --- a/nvim/.config/nvim/fnl/dotfiles/plugins.fnl +++ b/nvim/.config/nvim/fnl/dotfiles/plugins.fnl @@ -58,6 +58,10 @@ :tpope/vim-vinegar {} :wbthomason/packer.nvim {:mod :packer} :junegunn/vim-easy-align {:mod :easyalign} + + :tpope/vim-dadbod {} + :kristijanhusak/vim-dadbod-ui {} + :kristijanhusak/vim-dadbod-completion {} ; :luochen1990/rainbow {} ; :thecontinium/asyncomplete-conjure.vim {} }