From 1025f25d0c5f875fa31f9f25b409f435e4986dc1 Mon Sep 17 00:00:00 2001
From: Fabian Becker <fbecker18@bloomberg.net>
Date: Fri, 28 May 2021 18:24:15 +0200
Subject: [PATCH] Several changes

---
 .config/nvim/init.lua              |  2 +-
 .config/nvim/lua/lsp/init.lua      | 14 +++++++-------
 .config/nvim/lua/plugins/compe.lua | 14 +++++++-------
 .tmux.conf                         |  2 +-
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 65d4718..9ac0405 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -8,7 +8,7 @@ require('colorscheme')
 require('lsp')
 require('lsp.docker-ls')
 require('lsp.python-ls')
--- require('lsp.julia-ls')
+require('lsp.julia-ls')
 require('lsp.json-ls')
 require('lsp.elixir-ls')
 require('lsp.go-ls')
diff --git a/.config/nvim/lua/lsp/init.lua b/.config/nvim/lua/lsp/init.lua
index c2f5b6d..e0095e3 100644
--- a/.config/nvim/lua/lsp/init.lua
+++ b/.config/nvim/lua/lsp/init.lua
@@ -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.declaration()<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> ca :Lspsaga code_action<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> ca :Lspsaga code_action<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-n> :Lspsaga diagnostic_jump_next<CR>")
 -- -- 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
--- 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("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()')
 
 -- Set Default Prefix.
 -- Note: You can set a prefix per lsp server in the lv-globals.lua file
diff --git a/.config/nvim/lua/plugins/compe.lua b/.config/nvim/lua/plugins/compe.lua
index 506d9f8..1b03fb1 100644
--- a/.config/nvim/lua/plugins/compe.lua
+++ b/.config/nvim/lua/plugins/compe.lua
@@ -18,7 +18,7 @@ require'compe'.setup {
     path = true;
     buffer = true;
     calc = true;
-    vsnip = true;
+    vsnip = false;
     nvim_lsp = true;
     nvim_lua = true;
     spell = true;
@@ -57,14 +57,14 @@ end
 _G.s_tab_complete = function()
   if vim.fn.pumvisible() == 1 then
     return t "<C-p>"
-  elseif vim.fn.call("vsnip#jumpable", {-1}) == 1 then
-    return t "<Plug>(vsnip-jump-prev)"
+  --elseif vim.fn.call("vsnip#jumpable", {-1}) == 1 then
+    --return t "<Plug>(vsnip-jump-prev)"
   else
     return t "<S-Tab>"
   end
 end
 
-vim.api.nvim_set_keymap("i", "<Tab>", "v:lua.tab_complete()", {expr = true})
-vim.api.nvim_set_keymap("s", "<Tab>", "v:lua.tab_complete()", {expr = true})
-vim.api.nvim_set_keymap("i", "<S-Tab>", "v:lua.s_tab_complete()", {expr = true})
-vim.api.nvim_set_keymap("s", "<S-Tab>", "v:lua.s_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()", {noremap = true, 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()", {noremap = true, expr = true})
diff --git a/.tmux.conf b/.tmux.conf
index faa2621..6948d3c 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -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"
 
 # Terminal type configuration
-set -ga terminal-overrides ",tmux-256color:Tc"
+set -ga terminal-overrides ",tmux-256color:RGB"
 
 # Start window numbering at specific num
 set -g base-index 1