diff --git a/.gitignore b/.gitignore index 8c0fae6..3c53d4e 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,5 @@ xsrf/certificates xsrf/cookies.txt rcmain user-dirs.dirs +dot/file/vim/pack diff --git a/dot/file/bashrc b/dot/file/bashrc index b579e36..1f07cb0 100644 --- a/dot/file/bashrc +++ b/dot/file/bashrc @@ -1,3 +1,5 @@ +. $HOME/.profile + q(){ echo $SHLVL - 1 | bc exit diff --git a/dot/file/gitconfig b/dot/file/gitconfig index 4196c53..c981d9d 100644 --- a/dot/file/gitconfig +++ b/dot/file/gitconfig @@ -25,3 +25,5 @@ [core] autocrlf = input +[pull] + ff = only diff --git a/dot/file/profile b/dot/file/profile index 70ba563..096f4b1 100755 --- a/dot/file/profile +++ b/dot/file/profile @@ -52,3 +52,5 @@ export_loop \ test -r $SETENV && . "$SETENV" && setenv profile +export GPG_TTY=$(tty) + diff --git a/dot/file/vim/colors/jien.vim b/dot/file/vim/colors/jien.vim index b9f9951..56c504a 100644 --- a/dot/file/vim/colors/jien.vim +++ b/dot/file/vim/colors/jien.vim @@ -24,13 +24,13 @@ hi Search cterm=none ctermfg=black ctermbg=yellow hi SpecialKey cterm=none ctermfg=darkgreen ctermbg=none hi StatusLine cterm=none ctermfg=black ctermbg=red hi StatusLineNC cterm=reverse ctermfg=none ctermbg=none -hi Title cterm=bold ctermfg=yellow ctermbg=none +hi Title cterm=none ctermfg=yellow ctermbg=none hi Statement cterm=none ctermfg=blue ctermbg=none hi Visual cterm=none ctermfg=black ctermbg=red hi WarningMsg cterm=none ctermfg=1 ctermbg=none hi String cterm=none ctermfg=darkcyan ctermbg=none hi Comment cterm=none ctermfg=yellow ctermbg=none -hi Constant cterm=bold ctermfg=red ctermbg=none +hi Constant cterm=none ctermfg=red ctermbg=none hi Special cterm=none ctermfg=red ctermbg=none hi Identifier cterm=none ctermfg=lightgreen ctermbg=none hi Include cterm=none ctermfg=red ctermbg=none @@ -41,9 +41,9 @@ hi Type cterm=none ctermfg=green ctermbg=none hi Function cterm=none ctermfg=darkmagenta ctermbg=none hi Structure cterm=none ctermfg=green ctermbg=none hi LineNr cterm=none ctermfg=black ctermbg=yellow -hi Ignore cterm=bold ctermfg=7 ctermbg=none +hi Ignore cterm=none ctermfg=7 ctermbg=none hi Directory cterm=none ctermfg=darkcyan ctermbg=none -hi ErrorMsg cterm=bold ctermfg=7 ctermbg=1 +hi ErrorMsg cterm=none ctermfg=7 ctermbg=1 hi VisualNOS cterm=bold,underline ctermfg=none ctermbg=none hi WildMenu cterm=none ctermfg=black ctermbg=yellow hi DiffAdd ctermbg=4 ctermfg=none ctermbg=none @@ -51,6 +51,6 @@ hi DiffChange ctermbg=5 ctermfg=none ctermbg=none hi DiffDelete cterm=bold ctermfg=4 ctermbg=6 hi DiffText cterm=bold ctermfg=none ctermbg=1 hi Underlined cterm=underline ctermfg=5 ctermbg=none -hi Error cterm=bold ctermfg=7 ctermbg=1 ctermbg=none +hi Error cterm=none ctermfg=7 ctermbg=1 ctermbg=none hi SpellErrors cterm=bold ctermfg=7 ctermbg=1 ctermbg=none "hi CircleScobs cterm=bold ctermfg=red diff --git a/dot/file/vimrc b/dot/file/vimrc index a57dfc8..433c5da 100644 --- a/dot/file/vimrc +++ b/dot/file/vimrc @@ -11,10 +11,7 @@ set number set autoindent set smartindent - " Fuck the spaces. - " Especially in the Python... - " 'ftplugin'(For neovim) - let g:python_recommended_style=0 + let g:python_recommended_style=1 imap set smarttab set noet ci pi sw=4 ts=4 @@ -32,9 +29,8 @@ set foldmethod=indent set foldnestmax=10 " GUI. - " Cursor line in GUI(It works too slow in terminal). + set cursorline if has("gui_running") - set cursorline colorscheme vividchalk else " My colorscheme based on 'slate'. @@ -48,6 +44,8 @@ noremap <2-LeftMouse> za " Nerd-Tree. nmap \nt :NERDTree . + " Commenting + noremap / :Commentary " Disable highlight. nmap \nl :if &cursorline==1set nocursorlineelseset cursorlineendif nmap \nh :nohlsearch @@ -69,7 +67,13 @@ cnoremap cnoremap b cnoremap f -" Autocmd. + vnoremap // y/\V=escape(@",'/\') +" File types. + autocmd FileType javascript setlocal expandtab shiftwidth=2 tabstop=2 softtabstop=0 + autocmd FileType javascriptreact setlocal expandtab shiftwidth=2 tabstop=2 softtabstop=0 + autocmd FileType scss setlocal expandtab shiftwidth=2 tabstop=2 softtabstop=0 + autocmd FileType css setlocal expandtab shiftwidth=2 tabstop=2 softtabstop=0 +" Jump to the last pos. " When editing a file, always jump to the last known cursor position. " Don't do it when the position is invalid or when inside an event handler " (happens when dropping a file on "gvim"). diff --git a/dot/file/zshrc b/dot/file/zshrc index aa87e7c..44e984b 100644 --- a/dot/file/zshrc +++ b/dot/file/zshrc @@ -1,4 +1,5 @@ #!/bin/sh +. $HOME/.profile #autoload -Uz compinit promptinit #compinit #promptinit