Update nvim configuration

2 files changed, 27 insertions, 6 deletions

diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index f3adc69..658f1f1 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -29,5 +29,17 @@ vim.api.nvim_create_autocmd('LspAttach', {
     vim.keymap.set('n', 'K',  vim.lsp.buf.hover, opts)
     vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, opts)
     vim.keymap.set('n', 'gd', vim.lsp.buf.definition, opts)
+    vim.keymap.set('n', 'gr', vim.lsp.buf.references, opts)
   end,
 })
+
+vim.keymap.set('t', '<A-h>', "<C-\\><C-N><C-w>h", nil)
+vim.keymap.set('t', '<A-j>', "<C-\\><C-N><C-w>j", nil)
+vim.keymap.set('t', '<A-k>', "<C-\\><C-N><C-w>k", nil)
+vim.keymap.set('t', '<A-l>', "<C-\\><C-N><C-w>l", nil)
+
+local ts = require('telescope.builtin')
+vim.keymap.set('n', '<leader>ff', ts.find_files, {})
+vim.keymap.set('n', '<leader>gg', ts.live_grep, {})
+vim.keymap.set('n', '<leader>gf', ts.git_files, {})
+vim.keymap.set('n', '<leader>b', ts.buffers, {})
diff --git a/.config/vim/vimrc b/.config/vim/vimrc
index 7805be9..5250a4e 100644
--- a/.config/vim/vimrc
+++ b/.config/vim/vimrc
@@ -7,6 +7,10 @@ set fileencoding=utf-8
 set encoding=utf-8
 set fileformats=unix
 
+" Avoid infinite screen recursion
+unlet $SSH_CLIENT
+
+" Set sane defaults, if not using neovim already
 if !has('nvim')
   let $MYVIMRC="$XDG_CONFIG_HOME/vim/vimrc"
   " Check if the backup/swap dir exists
@@ -117,10 +121,15 @@ endif
 autocmd BufWritePre * %s/\s\+$//e
 
 " Move around in insert mode with Alt+{hjkl}
-imap    <A-h> <Left>
-imap    <A-l> <Right>
-imap    <A-k> <Up>
-imap    <A-j> <Down>
+inoremap    <A-h> <Left>
+inoremap    <A-l> <Right>
+inoremap    <A-k> <Up>
+inoremap    <A-j> <Down>
+
+nnoremap <A-h> <C-w>h
+nnoremap <A-j> <C-w>j
+nnoremap <A-k> <C-w>k
+nnoremap <A-l> <C-w>l
 
 " Go to end/start of line, like in the shell
 imap <C-E> <ESC>A
@@ -149,7 +158,7 @@ vnoremap <leader>{ <ESC>`>a}<ESC>`<i{<ESC>
 
 "" Plugin settings
 " junegunn/fzf.vim bindings
-noremap <C-f> :Files %:h<cr>
+noremap <C-f> :Files<cr>
 noremap <C-b> :Buffers<cr>
 
 " lervag/vimtex
@@ -250,4 +259,4 @@ if has('nvim')
   call plug#end()
 endif
 
-colorscheme tokyonight
+colorscheme night-owl