henrik/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updates

Browse Source
This commit is contained in:
Henrik Bakken
2020-11-20 03:22:34 +01:00
parent 9a72c6a0ec
commit d09c5159e9
2 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nvim/init.vim
+16 -13
View File
@@ -36,7 +36,6 @@ Plug 'tpope/vim-surround' " parentheses helper
Plug 'mbbill/undotree' " Persistent undo
Plug 'farmergreg/vim-lastplace' " When reopen a buffer, puts the cursor where it was last time
Plug 'haya14busa/vim-asterisk' " better asterisk motions
Plug 'svermeulen/vim-cutlass'
Plug 'tpope/vim-unimpaired'
Plug 'tpope/vim-sensible'
" tmux
@@ -46,6 +45,7 @@ Plug 'christoomey/vim-tmux-navigator' " integrate movement in tmux and vim
Plug 'chriskempson/base16-vim' " base16 themes
Plug 'chrisbra/Colorizer' " show color codes
Plug 'junegunn/rainbow_parentheses.vim' " colorize parentheses
Plug 'junegunn/goyo.vim'
" themes
Plug 'vim-airline/vim-airline'
Plug 'vim-airline/vim-airline-themes'
@@ -162,12 +162,11 @@ set list
" -----------------------------------------------------------------------------
" KEYBINDS
" -----------------------------------------------------------------------------
" *****************************
" MAPPING
let mapleader="\<SPACE>"
nnoremap q: <nop>
nnoremap Q <nop>
vnoremap v <Esc>
set pastetoggle=<F2>
nmap <esc><esc> :noh<cr>
nmap <leader>R :so ~/.config/nvim/init.vim<cr>
nmap <leader>E :tabe ~/OneDrive/dotfiles/nvim/init.vim<cr>
nmap <leader>w :cd %:p:h<cr>
@@ -176,14 +175,14 @@ nmap <leader>w :cd %:p:h<cr>
" *****************************
" REMAPPING
set langmap=å(,¨),Å{,^},Ø\\;,ø:,æ^
nnoremap æ "
vnoremap v <Esc>
nmap <esc><esc> :noh<cr>
" *****************************
" REMAPPING
nnoremap m d
xnoremap m d
nnoremap mm dd
nnoremap M D
" UNMAPPING
nnoremap q: <nop>
nnoremap Q <nop>
" *****************************
" EDITING
@@ -243,7 +242,7 @@ nmap <silent> <M-k> :TmuxNavigateUp<cr>
nmap <silent> <M-l> :TmuxNavigateRight<cr>
" make splits and tabs
nnoremap <M-BAR> :vsplit<cr>
nnoremap <M-§> :vnew<cr>
nnoremap § :vnew<cr>
nnoremap <M--> :split<cr>
nnoremap <M-_> :new<cr>
nnoremap <M-t> :tabe %<cr>
@@ -266,6 +265,10 @@ nmap <M-d> :bp<bar>bd#<cr>
nmap <M-D> :bp<bar>bd!#<cr>
" close window
nmap <M-q> :q<cr>
" goyo
let g:goyo_linenr=1
let g:goyo_width=120
nmap <C-w> :Goyo<cr>
" *****************************
" GIT
@@ -278,7 +281,7 @@ vmap <M-X> :CocCommand git.chunkUndo<cr>
" *****************************
" EXPLORERS
" coc-explorer
map <C-f> :CocCommand explorer<cr>
map <C-x> :CocCommand explorer<cr>
" vim-fugitive
" g? for fugitive help. :Gdiff, :Gblame, :Gstats '=' expand, '-' add/reset changes, :Gcommit % to commit current file with messag
map <C-g> :vertical Git<cr>:vertical resize 60<cr>
st/config.h
+5 -5
View File
@@ -249,8 +249,8 @@ static Shortcut shortcuts[] = {
{ TERMMOD, XK_J, kscrolldown, {.i = 1} },
{ TERMMOD, XK_U, kscrollup, {.i = -1} },
{ TERMMOD, XK_D, kscrolldown, {.i = -1} },
{ TERMMOD, XK_Page_Up, kscrollup, {.i = -1} },
{ TERMMOD, XK_Page_Down, kscrolldown, {.i = -1} },
{ ShiftMask, XK_Page_Up, kscrollup, {.i = -1} },
{ ShiftMask, XK_Page_Down, kscrolldown, {.i = -1} },
{ TERMMOD, XK_Num_Lock, numlock, {.i = 0} },
};
@@ -766,7 +766,7 @@ static Key key[] = {
{ XK_BackSpace, Mod1Mask|ControlMask, "\033[127;7u", 0, 0},
{ XK_BackSpace, Mod1Mask|ControlMask|ShiftMask, "\033[127;8u", 0, 0},
{ XK_BackSpace, Mod1Mask|ShiftMask, "\033[127;4u", 0, 0},
{ XK_BackSpace, ShiftMask, "\033[127;2u", 0, 0},
/* { XK_BackSpace, ShiftMask, "\033[127;2u", 0, 0}, */
{ XK_Tab, ControlMask, "\033[9;5u", 0, 0},
{ XK_Tab, ControlMask|ShiftMask, "\033[1;5Z", 0, 0},
{ XK_Tab, Mod1Mask, "\033[1;3Z", 0, 0},
@@ -779,7 +779,7 @@ static Key key[] = {
{ XK_Return, Mod1Mask|ControlMask, "\033[13;7u", 0, 0},
{ XK_Return, Mod1Mask|ControlMask|ShiftMask, "\033[13;8u", 0, 0},
{ XK_Return, Mod1Mask|ShiftMask, "\033[13;4u", 0, 0},
{ XK_Return, ShiftMask, "\033[13;2u", 0, 0},
/* { XK_Return, ShiftMask, "\033[13;2u", 0, 0}, */
{ XK_Pause, ControlMask, "\033[18;5u", 0, 0},
{ XK_Pause, ControlMask|ShiftMask, "\033[18;6u", 0, 0},
{ XK_Pause, Mod1Mask, "\033[18;3u", 0, 0},
@@ -863,7 +863,7 @@ static Key key[] = {
{ XK_space, Mod1Mask|ControlMask, "\033[32;7u", 0, 0},
{ XK_space, Mod1Mask|ControlMask|ShiftMask, "\033[32;8u", 0, 0},
{ XK_space, Mod1Mask|ShiftMask, "\033[32;4u", 0, 0},
{ XK_space, ShiftMask, "\033[32;2u", 0, 0},
/* { XK_space, ShiftMask, "\033[32;2u", 0, 0}, */
{ XK_0, ControlMask, "\033[48;5u", 0, 0},
{ XK_A, ControlMask|ShiftMask, "\033[65;6u", 0, 0},
{ XK_B, ControlMask|ShiftMask, "\033[66;6u", 0, 0},