Set autocrlf = true on laptop (windows)

diff --git a/.bash/fzf.bash b/.bash/fzf.bash
index 6f43718b0652977cf44561bbd941fdfaa411db92..77d2e66387ceb90817c1ab63eb0debf04d02a639 100644 (file)
--- a/.bash/fzf.bash
+++ b/.bash/fzf.bash
@@ -1,5 +1,9 @@
 # Setup fzf
 # ---------
+
+
+if [ -d "/usr/local/opt/fzf" ]; then
+
 if [[ ! "$PATH" == */usr/local/opt/fzf/bin* ]]; then
   export PATH="$PATH:/usr/local/opt/fzf/bin"
 fi
@@ -18,3 +22,5 @@ fi
 # ------------
 source "/usr/local/opt/fzf/shell/key-bindings.bash"
 
+
+fi

diff --git a/.gitconfig b/.gitconfig
index 440b7132c96115e9faefda678a2a4cc5b337f499..336ce9062c7180e981ce08eb4ff31631bf7cc2a2 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -32,7 +32,7 @@
   ready = rebase -i @{u}
   rbi = "!r() { git rebase -i HEAD~$1; }; r"
   ec = config --global -e
-  l = log --oneline --decorate
+  l = log --oneline --decorate --reverse
   lg = log --pretty=format:"%C(yellow)%h\\ %C(green)%ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=short --graph
   tail = !"git lg -10 HEAD"
   last = log -1 HEAD
@@ -84,14 +84,6 @@
   rebase = true
 [push]
   default = tracking
-[include]
-  path = ~/.gitconfig_local
-[init]
-  templatedir = ~/.git_template
-[core]
-  excludesfile = ~/.gitignore_global
-  autocrlf = false
-  editor = vim
 [diff]
   tool = vimdiff
 [difftool]
@@ -101,3 +93,10 @@
   conflictstyle = diff3
 [mergetool]
   prompt = false
+[init]
+  templatedir = ~/.git_template
+[core]
+  excludesfile = ~/.gitignore_global
+  editor = vim
+[include]
+  path = ~/.gitconfig_local

diff --git a/.vimrc b/.vimrc
index 6447bb974732c16b78b8756bcff591e234683232..b2e26bba8cc769609a298c1defbd76b083e6ad9b 100644 (file)
--- a/.vimrc
+++ b/.vimrc
@@ -25,6 +25,8 @@ Plug 'junegunn/fzf.vim'
 Plug 'thanthese/Tortoise-Typing'
 Plug 'altercation/vim-colors-solarized'
 Plug 'editorconfig/editorconfig-vim'
+Plug 'scrooloose/nerdtree'
+Plug 'vim-scripts/a.vim'
 
 call plug#end()
 
@@ -95,8 +97,8 @@ let g:fzf_launcher = "In_a_new_term_function %s"
 "let g:airline#extensions#tabline#enabled = 1
 
 let g:EditorConfig_exclude_patterns = ['fugitive://.*', 'scp://.*']
-let g:EditorConfig_verbose=1 
-
+let g:EditorConfig_verbose=1
+let g:NERDTreeWinSize=30
 " }}}2
 " Section: Commands {{{1
 "-----------------------