Compare commits

...

3 Commits

Author SHA1 Message Date
marisa 0ac971ff1f add git blame annotations 2021-06-01 16:57:15 +02:00
marisa ab00680bf1 new color scheme for nvim 2021-06-01 15:21:47 +02:00
marisa d9337614ae more mappings, change leader to space 2021-06-01 15:03:36 +02:00
5 changed files with 57 additions and 4 deletions

View File

@ -3,6 +3,55 @@ local set_keymap = require('common').set_keymap
-- reload vimrc
set_keymap('n', '<leader>sv', '<cmd>Reload<cr>')
-- basic
set_keymap('n', '<leader>q', '<cmd>q!<cr>')
set_keymap('n', '<leader>x', '<cmd>x<cr>')
-- moving
set_keymap('n', '<c-a>', '<Esc>I')
set_keymap('n', 'j', 'gj')
set_keymap('n', 'k', 'gk')
-- editing
set_keymap('n', 'Y', 'y$')
set_keymap('n', '<a-Up>', '<cmd>m .-2<cr>')
set_keymap('n', '<a-Down>', '<cmd>m .+1<cr>')
set_keymap('i', '<c-d>', '<Esc>ddi')
-- splits
set_keymap('n', '<leader>s', '<c-w>v')
set_keymap('n', '<leader>j', '<c-w>j')
set_keymap('n', '<leader>k', '<c-w>k')
set_keymap('n', '<leader>h', '<c-w>h')
set_keymap('n', '<leader>l', '<c-w>l')
-- tabs
set_keymap('n', '<a-Tab>', 'gT')
set_keymap('n', '<Tab>', 'gt')
set_keymap('n', '<leader>t[', '<cmd>tabmove -1<cr>')
set_keymap('n', '<leader>t]', '<cmd>tabmove +1<cr>')
set_keymap('n', '<leader>1', '1gt')
set_keymap('n', '<leader>2', '2gt')
set_keymap('n', '<leader>3', '3gt')
set_keymap('n', '<leader>4', '4gt')
set_keymap('n', '<leader>5', '5gt')
set_keymap('n', '<leader>6', '6gt')
set_keymap('n', '<leader>7', '7gt')
set_keymap('n', '<leader>8', '8gt')
set_keymap('n', '<leader>9', '9gt')
set_keymap('n', '<leader>0', '<cmd>tablast<cr>')
-- LSP
set_keymap('n', '<leader>ld', '<cmd>lua vim.lsp.buf.definition()<cr>')
set_keymap('n', '<leader>lD', '<cmd>lua vim.lsp.buf.declaration()<cr>')
set_keymap('n', '<leader>lt', '<cmd>lua vim.lsp.buf.type_definition()<cr>')
set_keymap('n', '<leader>li', '<cmd>lua vim.lsp.buf.implementation()<cr>')
set_keymap('n', 'K', '<cmd>lua vim.lsp.buf.hover()<cr>')
set_keymap('n', 'U', '<cmd>lua vim.lsp.buf.signature_help()<cr>')
set_keymap('n', '<leader>lr', '<cmd>lua vim.lsp.buf.references()<cr>')
set_keymap('n', '<leader>ls', '<cmd>lua vim.lsp.buf.document_symbol()<cr>')
set_keymap('n', '<leader>lS', '<cmd>lua vim.lsp.buf.workspace_symbol()<cr>')
set_keymap('n', '<leader>lR', '<cmd>lua vim.lsp.buf.rename()<cr>')
set_keymap('n', '<leader>lf', '<cmd>lua vim.lsp.buf.formatting()<cr>')
-- plug manager
set_keymap('n', '<leader>pi', '<cmd>PaqInstall<cr>')
set_keymap('n', '<leader>pu', '<cmd>PaqUpdate<cr>')
set_keymap('n', '<leader>pc', '<cmd>PaqClean<cr>')
-- hop
set_keymap('n', '<leader>hw', '<cmd>HopWord<cr>')
set_keymap('n', '<leader>hl', '<cmd>HopLine<cr>')

View File

@ -22,8 +22,8 @@ opt.shiftwidth = 2
-- window
opt.number = true
-- editing
vim.g.mapleader = ','
vim.g.maplocalleader = ','
vim.g.mapleader = ' ' --space
vim.g.maplocalleader = ' '
opt.whichwrap = 'b,s,<,>,[,]'
opt.backspace = {'indent', 'eol', 'start'}
opt.list = true

View File

@ -9,7 +9,8 @@ paq 'nvim-lua/popup.nvim'
paq 'nvim-lua/plenary.nvim'
-- files
paq 'tssm/fairyfloss.vim' -- theme
paq 'tjdevries/colorbuddy.nvim' -- color highlighting
paq 'maaslalani/nordbuddy' -- theme
paq 'mhinz/vim-startify' -- startup page
paq 'nvim-telescope/telescope.nvim' -- fuzzy finder
paq 'rmagatti/auto-session' -- auto session
@ -24,6 +25,7 @@ paq 'google/vim-searchindex' -- search index
paq 'editorconfig/editorconfig-vim' -- editorconfig support
paq 'RRethy/vim-illuminate' -- word highlighting
paq 'lewis6991/gitsigns.nvim' -- git gutter
paq 'f-person/git-blame.nvim' -- git blame annotations
-- edit
paq 'phaazon/hop.nvim' -- hopping around

View File

@ -2,4 +2,4 @@ local vim = vim
require('tabline').setup{}
require('gitsigns').setup()
vim.api.nvim_command('colorscheme fairyfloss')
vim.api.nvim_command('colorscheme nordbuddy')

View File

@ -3,6 +3,8 @@ require('telescope').load_extension('heading')
local set_keymap = require('../common').set_keymap
set_keymap('n', '<leader>ff', '<cmd>Telescope find_files<cr>')
set_keymap('n', '<leader>p', '<cmd>Telescope find_files<cr>') -- alternative cuz im used to it from vscode
set_keymap('n', '<leader><leader>', '<cmd>Telescope find_files<cr>') -- another alternative, this time from doom emacs
set_keymap('n', '<leader>fd', '<cmd>Telescope git_files<cr>')
set_keymap('n', '<leader>fg', '<cmd>Telescope live_grep<cr>')
set_keymap('n', '<leader>fb', '<cmd>Telescope buffers')