Compare commits
2 Commits
7c710e33ac
...
f031a06fb7
Author | SHA1 | Date |
---|---|---|
Nise Void | f031a06fb7 | |
Nise Void | b674ab3a6c |
2
kshrc
2
kshrc
|
@ -2,12 +2,10 @@ alias gpg='gpg2'
|
||||||
export GPG_TTY=$(tty)
|
export GPG_TTY=$(tty)
|
||||||
|
|
||||||
alias vim=nvim
|
alias vim=nvim
|
||||||
alias uwpass='PASSWORD_STORE_DIR=~/.pass/uw pass'
|
|
||||||
alias gca='git commit --amend --no-edit'
|
alias gca='git commit --amend --no-edit'
|
||||||
alias gpf='git push --force-with-lease'
|
alias gpf='git push --force-with-lease'
|
||||||
alias gs='git show'
|
alias gs='git show'
|
||||||
alias gd='git diff'
|
alias gd='git diff'
|
||||||
alias openvpn='sudo openvpn --config *.ovpn'
|
|
||||||
|
|
||||||
if [ -e "$HOME/.kshrc_private" ]; then
|
if [ -e "$HOME/.kshrc_private" ]; then
|
||||||
. "$HOME/.kshrc_private"
|
. "$HOME/.kshrc_private"
|
||||||
|
|
|
@ -242,6 +242,8 @@ function! plug#begin(...)
|
||||||
let home = s:path(s:plug_fnamemodify(s:plug_expand(a:1), ':p'))
|
let home = s:path(s:plug_fnamemodify(s:plug_expand(a:1), ':p'))
|
||||||
elseif exists('g:plug_home')
|
elseif exists('g:plug_home')
|
||||||
let home = s:path(g:plug_home)
|
let home = s:path(g:plug_home)
|
||||||
|
elseif has('nvim')
|
||||||
|
let home = stdpath('data') . '/plugged'
|
||||||
elseif !empty(&rtp)
|
elseif !empty(&rtp)
|
||||||
let home = s:path(split(&rtp, ',')[0]) . '/plugged'
|
let home = s:path(split(&rtp, ',')[0]) . '/plugged'
|
||||||
else
|
else
|
||||||
|
@ -405,7 +407,7 @@ function! plug#end()
|
||||||
|
|
||||||
for [map, names] in items(lod.map)
|
for [map, names] in items(lod.map)
|
||||||
for [mode, map_prefix, key_prefix] in
|
for [mode, map_prefix, key_prefix] in
|
||||||
\ [['i', '<C-O>', ''], ['n', '', ''], ['v', '', 'gv'], ['o', '', '']]
|
\ [['i', '<C-\><C-O>', ''], ['n', '', ''], ['v', '', 'gv'], ['o', '', '']]
|
||||||
execute printf(
|
execute printf(
|
||||||
\ '%snoremap <silent> %s %s:<C-U>call <SID>lod_map(%s, %s, %s, "%s")<CR>',
|
\ '%snoremap <silent> %s %s:<C-U>call <SID>lod_map(%s, %s, %s, "%s")<CR>',
|
||||||
\ mode, map, map_prefix, string(map), string(names), mode != 'i', key_prefix)
|
\ mode, map, map_prefix, string(map), string(names), mode != 'i', key_prefix)
|
||||||
|
|
|
@ -38,11 +38,6 @@ set termguicolors
|
||||||
set t_Co=256
|
set t_Co=256
|
||||||
colorscheme Tomorrow-Night
|
colorscheme Tomorrow-Night
|
||||||
|
|
||||||
let g:gitgutter_sign_added = '+ '
|
|
||||||
let g:gitgutter_sign_modified = '~ '
|
|
||||||
let g:gitgutter_sign_modified_removed = '__'
|
|
||||||
let g:gitgutter_sign_removed = '_ '
|
|
||||||
|
|
||||||
" Syntax
|
" Syntax
|
||||||
syntax on
|
syntax on
|
||||||
set showmatch
|
set showmatch
|
||||||
|
@ -60,6 +55,8 @@ set tabstop=4 shiftwidth=4 noexpandtab
|
||||||
autocmd BufRead,BufNewFile *.py set tabstop=4 shiftwidth=4 noexpandtab
|
autocmd BufRead,BufNewFile *.py set tabstop=4 shiftwidth=4 noexpandtab
|
||||||
autocmd BufRead,BufNewFile *.yml set tabstop=2 shiftwidth=2 expandtab
|
autocmd BufRead,BufNewFile *.yml set tabstop=2 shiftwidth=2 expandtab
|
||||||
autocmd BufRead,BufNewFile *.yaml set tabstop=2 shiftwidth=2 expandtab
|
autocmd BufRead,BufNewFile *.yaml set tabstop=2 shiftwidth=2 expandtab
|
||||||
|
autocmd BufRead,BufNewFile *.ts set tabstop=2 shiftwidth=2 expandtab
|
||||||
|
autocmd BufRead,BufNewFile *.vue set tabstop=2 shiftwidth=2 expandtab
|
||||||
|
|
||||||
" Disable auto newlines
|
" Disable auto newlines
|
||||||
set wrap
|
set wrap
|
||||||
|
|
2
profile
2
profile
|
@ -10,7 +10,7 @@ fi
|
||||||
export SSH_AUTH_SOCK=~/.ssh/ssh_auth_sock
|
export SSH_AUTH_SOCK=~/.ssh/ssh_auth_sock
|
||||||
|
|
||||||
# Go
|
# Go
|
||||||
export GOPRIVATE="git.fuyu.moe/*/*,git.ultraware.nl/*/*,git.sinuss.nl/*/*"
|
export GOPRIVATE="git.fuyu.moe/*/*"
|
||||||
|
|
||||||
# Fixes
|
# Fixes
|
||||||
export _JAVA_AWT_WM_NONREPARENTING=1
|
export _JAVA_AWT_WM_NONREPARENTING=1
|
||||||
|
|
Loading…
Reference in New Issue