aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Cabergs <me@cacharle.xyz>2021-11-06 13:11:24 +0100
committerCharles Cabergs <me@cacharle.xyz>2021-11-06 13:11:24 +0100
commit14118b5959fa7b42f2a1e983b4a22124ad59052d (patch)
treefebf6e1513c73a580e9ede08d5cfd03c16845238
parentfccc165720bc8cfd8decc852414595468c65be61 (diff)
downloaddotfiles-14118b5959fa7b42f2a1e983b4a22124ad59052d.tar.gz
dotfiles-14118b5959fa7b42f2a1e983b4a22124ad59052d.tar.bz2
dotfiles-14118b5959fa7b42f2a1e983b4a22124ad59052d.zip
Added vim telescope mappings and Ctrl-j/k to navigate command history mappings
-rw-r--r--config/nvim/init.lua18
-rw-r--r--config/nvim/lua/mappings.lua8
-rw-r--r--config/zsh/aliases.zsh4
3 files changed, 22 insertions, 8 deletions
diff --git a/config/nvim/init.lua b/config/nvim/init.lua
index 86e010e..7bfc3f7 100644
--- a/config/nvim/init.lua
+++ b/config/nvim/init.lua
@@ -55,6 +55,19 @@ vim.g.gruvbox_contrast_dark = 'medium'
vim.g.gruvbox_contrast_light = 'hard'
vim.g.gruvbox_invert_selection = 0
+local actions = require('telescope.actions')
+require('telescope').setup {
+ defaults = {
+ mappings = {
+ i = {
+ ['<C-j>'] = actions.move_selection_next,
+ ['<C-k>'] = actions.move_selection_previous,
+ ['<esc>'] = actions.close,
+ }
+ }
+ }
+}
+
require('lualine').setup {
options = {
theme = 'gruvbox',
@@ -85,8 +98,3 @@ require('nvim-treesitter.configs').setup {
require('nvim_comment').setup()
require('mappings')
-
--- hi link juliaFunctionCall Identifier
--- hi link juliaParDelim Delimiter
---
--- autocmd Filetype markdown nnoremap <leader>r :execute 'silent !pandoc % -o %:r.pdf &' \| redraw! \| echom 'Converting to pdf: ' . expand('%:r') . '.pdf'<CR>
diff --git a/config/nvim/lua/mappings.lua b/config/nvim/lua/mappings.lua
index e37968a..566b647 100644
--- a/config/nvim/lua/mappings.lua
+++ b/config/nvim/lua/mappings.lua
@@ -18,6 +18,10 @@ map('n', '<leader>s=', '<C-W>=', {})
map('n', ' /', '/\v', {})
map('n', ' ?', '?\v', {})
+-- ctrl-j/k to navigate commands history
+map('c', '<C-j>', '<down>', {})
+map('c', '<C-k>', '<up>', {})
+
-- -- hook
-- -- remove trailing white space on save
-- autocmd vimrc BufWritePre * %s/\s\+$//e
@@ -47,3 +51,7 @@ map('n', 'ga', ':EasyAlign<CR>', {})
-- nnoremap <leader>h :SidewaysLeft<CR>
-- nnoremap <leader>w :ArgWrap<CR>
-- nnoremap <leader>ss :setlocal spell!<CR>
+
+map('n', '<C-p>', ':Telescope git_files<CR>', {})
+map('n', '<C-h>', ':Telescope help_tags<CR>', {})
+
diff --git a/config/zsh/aliases.zsh b/config/zsh/aliases.zsh
index 3abbf03..b2ca0a9 100644
--- a/config/zsh/aliases.zsh
+++ b/config/zsh/aliases.zsh
@@ -13,10 +13,8 @@ alias yay='yay --color=auto'
# common commands
alias less='less -N' # enable line number
-alias v='vim'
alias nvim='VIMINIT="" nvim'
-# alias vim='nvim'
-# alias mkdir='mkdir -p'
+alias v='nvim'
alias gdb='gdb -q' # disable long intro message
alias sudo='sudo ' # enable color (the search for aliases continues)
alias doas='doas ' # same for doas