barak/dotfiles
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Institude Filepath, veonim, and git-diff3-style

Browse source
This commit is contained in:
Barak Michener 2019-04-01 11:05:32 -07:00
parent 52f28e2d1b
commit 0b64b1cbe2
2 changed files with 17 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.gitconfig
View file

@ -22,6 +22,9 @@
[diff] [diff]
renamelimit = 0 renamelimit = 0
[merge]
conflictstyle = diff3
[color] [color]
diff = auto diff = auto
interactive = auto interactive = auto
@ -36,5 +39,6 @@
default = current default = current
[rerere] [rerere]
enabled = true enabled = true
[url "git@github.com:"] [url "git@github.com:"]
insteadOf = https://github.com/ insteadOf = https://github.com/

13
.vimrc
View file

@ -70,6 +70,16 @@ set t_Sb=ESC[4%dm
let $RUST_SRC_PATH="/usr/src/rust/src/" let $RUST_SRC_PATH="/usr/src/rust/src/"
"let g:ft_ignore_pat = '.org' "let g:ft_ignore_pat = '.org'
"
if exists('veonim')
let g:vscode_extensions = [
\'ms-python.python',
\'ms-vscode.go',
\]
set guifont=Droid\ Sans\ Mono\ Dotted:h20
" set linespace=10
endif
" Required: " Required:
set runtimepath+=/home/bmichener/.vim/bundle/repos/github.com/Shougo/dein.vim set runtimepath+=/home/bmichener/.vim/bundle/repos/github.com/Shougo/dein.vim
@ -420,6 +430,9 @@ endif
" CD to the path of the file I'm editing. " CD to the path of the file I'm editing.
command Cdf :cd %:p:h command Cdf :cd %:p:h
" Print path of file
command Filepath :echo expand('%:p')
" Save a vim session! Useful if you want to save buffer states and so on " Save a vim session! Useful if you want to save buffer states and so on
command SaveSession :mksession! ~/.vim_last_session command SaveSession :mksession! ~/.vim_last_session
command LoadSession :source ~/.vim_last_session command LoadSession :source ~/.vim_last_session