Merge branch 'master' of https://gitlab.com/keanegit/dotfiles
Merging new changes to work PC
This commit is contained in:
ikeane
commit
7cbf8ea755
8 changed files with 1049 additions and 957 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -2,3 +2,4 @@
|
|||
*.un~
|
||||
/vim/.vim/plugins/*
|
||||
*.swp
|
||||
*.netrwhist
|
||||
|
|
|
|||
BIN
.swp
BIN
.swp
Binary file not shown.
9
qmk/pinky3_main/README.md
Normal file
9
qmk/pinky3_main/README.md
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
|
||||
#Compiling / Flashing
|
||||
|
||||
```bash
|
||||
qmk compile ~/.dotfiles/qmk/pinky3_main/pinky_3_layout_main.json
|
||||
|
||||
sudo qmk flash ~/.dotfiles/qmk/pinky3_main/pinky_3_layout_main.json -kb pinky/3 -km ~/.dotfiles/qmk/pinky3_main/pinky_3_layout_main.hex -bl avrdude-split-left
|
||||
```
|
||||
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -3,11 +3,11 @@
|
|||
"notes":"",
|
||||
"documentation":"\"This file is a QMK Configurator export. You can import this at <https://config.qmk.fm>. It can also be used directly with QMK's source code.\n\nTo setup your QMK environment check out the tutorial: <https://docs.qmk.fm/#/newbs>\n\nYou can convert this file to a keymap.c using this command: `qmk json2c {keymap}`\n\nYou can compile this keymap using this command: `qmk compile {keymap}`\"\n",
|
||||
"keyboard":"pinky/3",
|
||||
"keymap":"pinky_3_layout_mine",
|
||||
"keymap":"pinky_3_layout_main",
|
||||
"layout":"LAYOUT",
|
||||
"layers":[
|
||||
[
|
||||
"C_S_T(KC_TAB)",
|
||||
"LCAG_T(KC_TAB)",
|
||||
"KC_Q",
|
||||
"KC_W",
|
||||
"KC_E",
|
||||
|
|
@ -35,14 +35,14 @@
|
|||
"KC_L",
|
||||
"KC_SCLN",
|
||||
"KC_QUOT",
|
||||
"LSFT_T(KC_LPRN)",
|
||||
"KC_LSPO",
|
||||
"KC_Z",
|
||||
"KC_X",
|
||||
"KC_C",
|
||||
"KC_V",
|
||||
"KC_B",
|
||||
"TO(3)",
|
||||
"TO(1)",
|
||||
"MO(3)",
|
||||
"TT(1)",
|
||||
"KC_N",
|
||||
"KC_M",
|
||||
"KC_COMM",
|
||||
|
|
@ -51,12 +51,12 @@
|
|||
"KC_ENT",
|
||||
"KC_LALT",
|
||||
"KC_LGUI",
|
||||
"TO(2)",
|
||||
"MO(2)",
|
||||
"KC_INS",
|
||||
"TO(4)",
|
||||
"MO(4)",
|
||||
"KC_SPC",
|
||||
"KC_PSCR",
|
||||
"TO(5)"
|
||||
"MO(5)"
|
||||
],
|
||||
[
|
||||
"KC_TAB",
|
||||
|
|
@ -133,7 +133,6 @@
|
|||
"KC_HOME",
|
||||
"KC_NO",
|
||||
"KC_NO",
|
||||
"KC_NO",
|
||||
"KC_LEFT",
|
||||
"KC_DOWN",
|
||||
"KC_UP",
|
||||
|
|
@ -144,6 +143,7 @@
|
|||
"KC_NO",
|
||||
"KC_NO",
|
||||
"KC_NO",
|
||||
"KC_NO",
|
||||
"KC_PGUP",
|
||||
"KC_NO",
|
||||
"KC_NO",
|
||||
|
|
@ -320,4 +320,4 @@
|
|||
]
|
||||
],
|
||||
"author":"Ian Keane"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
let g:netrw_dirhistmax =10
|
||||
let g:netrw_dirhist_cnt =1
|
||||
let g:netrw_dirhist_1='/home/green/lisp_games/croatoan-test'
|
||||
|
|
@ -1,4 +1,56 @@
|
|||
TODO: asciidoc
|
||||
ODO: asciidoc
|
||||
hq6/VimFreeDrag
|
||||
|
||||
General Vim
|
||||
c-p, c-n
|
||||
dumb completion in open buffers
|
||||
c-i, c-o
|
||||
back/forward a jump
|
||||
g;
|
||||
back to last edit location
|
||||
c-^
|
||||
go to previous file edited (alternate file)
|
||||
registers
|
||||
:reg
|
||||
see register contents
|
||||
<C-r> reg
|
||||
paste from register in normal mode
|
||||
names
|
||||
1-9
|
||||
delete registers
|
||||
0
|
||||
yank register
|
||||
a-z
|
||||
named registers
|
||||
A-Z
|
||||
same as a-z but append
|
||||
/
|
||||
current search pattern
|
||||
=
|
||||
returns a math result
|
||||
_
|
||||
black-hole register
|
||||
:
|
||||
last ex command
|
||||
quickfix
|
||||
run :make in vim
|
||||
:copen to go to line
|
||||
navigation:
|
||||
:cn, :cw, :cp, [c, ]c
|
||||
regex copying
|
||||
show only matching lines:
|
||||
:g/pattern
|
||||
copy only matching lines:
|
||||
:g/pattern/ y A
|
||||
v
|
||||
inverse
|
||||
delete all lines not matching a pattern:
|
||||
:v/pattern/d
|
||||
|
||||
|
||||
https://www.youtube.com/watch?v=v0W7JkzQAzA
|
||||
|
||||
|
||||
|
||||
EasyAlign
|
||||
C-x in visual mode to do reg expression
|
||||
|
|
@ -55,6 +107,9 @@ Tmux
|
|||
c-b w new window
|
||||
tslime: ,t
|
||||
|
||||
TODO YCM
|
||||
<leader>gd goto definition
|
||||
|
||||
Help Navigation
|
||||
follow link: ctrl-]
|
||||
previous link: ctrl-t
|
||||
|
|
|
|||
10
vim/.vimrc
10
vim/.vimrc
|
|
@ -125,8 +125,10 @@
|
|||
" Nnoremap <tab> %
|
||||
" Vnoremap <tab> %
|
||||
" Remap tab to jump by window
|
||||
nnoremap <tab> <C-w>w
|
||||
vnoremap <tab> <C-w>w
|
||||
nnoremap <tab> :tabn<CR>
|
||||
vnoremap <tab> :tabn<CR>
|
||||
nnoremap <S-tab> :tabp<CR>
|
||||
vnoremap <S-tab> :tabp<CR>
|
||||
|
||||
"}}}
|
||||
|
||||
|
|
@ -168,6 +170,7 @@
|
|||
nnoremap <leader>d k :r !date <cr>
|
||||
|
||||
nnoremap <leader>k :vert new ~/.vim/bindings.md <cr>
|
||||
tnoremap <leader><esc> <C-\><C-n>
|
||||
|
||||
"}}}
|
||||
|
||||
|
|
@ -213,6 +216,7 @@
|
|||
nnoremap <C-l> <C-w>l
|
||||
nnoremap <C-c> :close <cr>
|
||||
nnoremap <C-n> :bn <cr>
|
||||
nnoremap <C-x> :bd <cr>
|
||||
" Map resize pane
|
||||
" TODO: remap pane resize to something else (leader?)
|
||||
map + :vertical resize +5<CR>
|
||||
|
|
@ -304,6 +308,8 @@
|
|||
nmap ghn <Plug>(GitGutterNextHunk)
|
||||
nmap ghp <Plug>(GitGutterPrevHunk)
|
||||
nmap ghf <Plug>(GitGutterFold)
|
||||
" Controls fugitive diff split direction
|
||||
set diffopt=vertical
|
||||
"}}}
|
||||
|
||||
" plugin modification {{{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue