mirror of
https://github.com/halfdan/dotfiles.git
synced 2025-04-26 20:35:40 +00:00
Several changes
This commit is contained in:
parent
e9d5bc639d
commit
1025f25d0c
@ -8,7 +8,7 @@ require('colorscheme')
|
|||||||
require('lsp')
|
require('lsp')
|
||||||
require('lsp.docker-ls')
|
require('lsp.docker-ls')
|
||||||
require('lsp.python-ls')
|
require('lsp.python-ls')
|
||||||
-- require('lsp.julia-ls')
|
require('lsp.julia-ls')
|
||||||
require('lsp.json-ls')
|
require('lsp.json-ls')
|
||||||
require('lsp.elixir-ls')
|
require('lsp.elixir-ls')
|
||||||
require('lsp.go-ls')
|
require('lsp.go-ls')
|
||||||
|
@ -18,18 +18,18 @@ vim.fn.sign_define(
|
|||||||
|
|
||||||
vim.cmd("nnoremap <silent> gd <cmd>lua vim.lsp.buf.definition()<CR>")
|
vim.cmd("nnoremap <silent> gd <cmd>lua vim.lsp.buf.definition()<CR>")
|
||||||
vim.cmd("nnoremap <silent> gD <cmd>lua vim.lsp.buf.declaration()<CR>")
|
vim.cmd("nnoremap <silent> gD <cmd>lua vim.lsp.buf.declaration()<CR>")
|
||||||
--vim.cmd("nnoremap <silent> gr <cmd>lua vim.lsp.buf.references()<CR>")
|
vim.cmd("nnoremap <silent> gr <cmd>lua vim.lsp.buf.references()<CR>")
|
||||||
--vim.cmd("nnoremap <silent> gi <cmd>lua vim.lsp.buf.implementation()<CR>")
|
vim.cmd("nnoremap <silent> gi <cmd>lua vim.lsp.buf.implementation()<CR>")
|
||||||
--vim.cmd("nnoremap <silent> ca :Lspsaga code_action<CR>")
|
vim.cmd("nnoremap <silent> ca :Lspsaga code_action<CR>")
|
||||||
vim.cmd("nnoremap <silent> K :Lspsaga hover_doc<CR>")
|
vim.cmd("nnoremap <silent> K :Lspsaga hover_doc<CR>")
|
||||||
-- vim.cmd('nnoremap <silent> <C-k> <cmd>lua vim.lsp.buf.signature_help()<CR>')
|
vim.cmd('nnoremap <silent> <C-k> <cmd>lua vim.lsp.buf.signature_help()<CR>')
|
||||||
vim.cmd("nnoremap <silent> <C-p> :Lspsaga diagnostic_jump_prev<CR>")
|
vim.cmd("nnoremap <silent> <C-p> :Lspsaga diagnostic_jump_prev<CR>")
|
||||||
vim.cmd("nnoremap <silent> <C-n> :Lspsaga diagnostic_jump_next<CR>")
|
vim.cmd("nnoremap <silent> <C-n> :Lspsaga diagnostic_jump_next<CR>")
|
||||||
-- -- scroll down hover doc or scroll in definition preview
|
-- -- scroll down hover doc or scroll in definition preview
|
||||||
-- vim.cmd("nnoremap <silent> <C-f> <cmd>lua require('lspsaga.action').smart_scroll_with_saga(1)<CR>")
|
vim.cmd("nnoremap <silent> <C-f> <cmd>ua require('lspsaga.action').smart_scroll_with_saga(1)<CR>")
|
||||||
-- -- scroll up hover doc
|
-- -- scroll up hover doc
|
||||||
-- vim.cmd("nnoremap <silent> <C-b> <cmd>lua require('lspsaga.action').smart_scroll_with_saga(-1)<CR>")
|
vim.cmd("nnoremap <silent> <C-b> <cmd>lua require('lspsaga.action').smart_scroll_with_saga(-1)<CR>")
|
||||||
-- vim.cmd('command! -nargs=0 LspVirtualTextToggle lua require("lsp/virtual_text").toggle()')
|
vim.cmd('command! -nargs=0 LspVirtualTextToggle lua require("lsp/virtual_text").toggle()')
|
||||||
|
|
||||||
-- Set Default Prefix.
|
-- Set Default Prefix.
|
||||||
-- Note: You can set a prefix per lsp server in the lv-globals.lua file
|
-- Note: You can set a prefix per lsp server in the lv-globals.lua file
|
||||||
|
@ -18,7 +18,7 @@ require'compe'.setup {
|
|||||||
path = true;
|
path = true;
|
||||||
buffer = true;
|
buffer = true;
|
||||||
calc = true;
|
calc = true;
|
||||||
vsnip = true;
|
vsnip = false;
|
||||||
nvim_lsp = true;
|
nvim_lsp = true;
|
||||||
nvim_lua = true;
|
nvim_lua = true;
|
||||||
spell = true;
|
spell = true;
|
||||||
@ -57,14 +57,14 @@ end
|
|||||||
_G.s_tab_complete = function()
|
_G.s_tab_complete = function()
|
||||||
if vim.fn.pumvisible() == 1 then
|
if vim.fn.pumvisible() == 1 then
|
||||||
return t "<C-p>"
|
return t "<C-p>"
|
||||||
elseif vim.fn.call("vsnip#jumpable", {-1}) == 1 then
|
--elseif vim.fn.call("vsnip#jumpable", {-1}) == 1 then
|
||||||
return t "<Plug>(vsnip-jump-prev)"
|
--return t "<Plug>(vsnip-jump-prev)"
|
||||||
else
|
else
|
||||||
return t "<S-Tab>"
|
return t "<S-Tab>"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
vim.api.nvim_set_keymap("i", "<Tab>", "v:lua.tab_complete()", {expr = true})
|
vim.api.nvim_set_keymap("i", "<Tab>", "v:lua.tab_complete()", {noremap = true, expr = true})
|
||||||
vim.api.nvim_set_keymap("s", "<Tab>", "v:lua.tab_complete()", {expr = true})
|
vim.api.nvim_set_keymap("s", "<Tab>", "v:lua.tab_complete()", {noremap = true, expr = true})
|
||||||
vim.api.nvim_set_keymap("i", "<S-Tab>", "v:lua.s_tab_complete()", {expr = true})
|
vim.api.nvim_set_keymap("i", "<S-Tab>", "v:lua.s_tab_complete()", {noremap = true, expr = true})
|
||||||
vim.api.nvim_set_keymap("s", "<S-Tab>", "v:lua.s_tab_complete()", {expr = true})
|
vim.api.nvim_set_keymap("s", "<S-Tab>", "v:lua.s_tab_complete()", {noremap = true, expr = true})
|
||||||
|
@ -67,7 +67,7 @@ bind -n WheelUpPane if-shell -F -t = "#{mouse_any_flag}" "send-keys -M" "if -Ft=
|
|||||||
set -g default-terminal "tmux-256color"
|
set -g default-terminal "tmux-256color"
|
||||||
|
|
||||||
# Terminal type configuration
|
# Terminal type configuration
|
||||||
set -ga terminal-overrides ",tmux-256color:Tc"
|
set -ga terminal-overrides ",tmux-256color:RGB"
|
||||||
|
|
||||||
# Start window numbering at specific num
|
# Start window numbering at specific num
|
||||||
set -g base-index 1
|
set -g base-index 1
|
||||||
|
Loading…
x
Reference in New Issue
Block a user