diff --git a/gitconfig b/gitconfig index 5bbfddb..d764163 100644 --- a/gitconfig +++ b/gitconfig @@ -95,3 +95,5 @@ smudge = git-lfs smudge -- %f process = git-lfs filter-process required = true +[init] + defaultBranch = main diff --git a/sbclirc b/sbclirc index 2be1dc8..d32af51 100644 --- a/sbclirc +++ b/sbclirc @@ -31,4 +31,4 @@ (setf *prompt* (colorize :bold (colorize :blue "λ "))) (setf *prompt2* (colorize :bold (colorize :blue "λ₂ "))) (setf *ret* (colorize :bold (colorize :red "⇒ "))) -(setf *pygmentize* "/usr/local/bin/pygmentize") +(setf *pygmentize* nil) diff --git a/vimrc b/vimrc index 58a7966..a8f6be4 100644 --- a/vimrc +++ b/vimrc @@ -30,10 +30,7 @@ Bundle 'scrooloose/syntastic' " Other programming languages Bundle 'hellerve/carp-vim' -Bundle 'junegunn/goyo.vim' - -" Extra -Plugin 'editorconfig/editorconfig-vim' +"Bundle 'junegunn/goyo.vim' " }}} diff --git a/zshrc b/zshrc index cc84ab5..6abe123 100644 --- a/zshrc +++ b/zshrc @@ -26,7 +26,8 @@ export TEXBIN=/Library/TeX/texbin/ export GHC_HOME=/usr/local/bin export CABAL_HOME=$HOME/.cabal/ export SCRIPTS_HOME=$HOME/.scripts -export PATH=/usr/local/opt/python/bin:$GHC_HOME:$PATH:$CABAL_HOME/bin:/opt/local/bin:/usr/local/sbin:/usr/local/opt/llvm/bin:~/.local/bin:$GOBIN:$SCRIPTS_HOME:$TEXBIN +export GH_HOME=~/Documents/Code/Github +export PATH=/usr/local/opt/python/bin:$GHC_HOME:$PATH:$CABAL_HOME/bin:/opt/local/bin:/usr/local/sbin:/usr/local/opt/llvm/bin:~/.local/bin:$GOBIN:$SCRIPTS_HOME:$TEXBIN:$GH_HOME/ut/sandboxtron/bin export MANPATH=$MANPATH:/opt/local/share/man:/usr/local/opt/erlang/lib/erlang/man export INFOPATH=$INFOPATH:/opt/local/share/info export PYTHONSTARTUP=~/.pythonrc @@ -35,25 +36,18 @@ export TERM=rxvt export LANG=en_US.UTF-8 export LC_ALL=$LANG export JAVA_HOME=`/usr/libexec/java_home -v 9` -export GH_HOME=~/Documents/Code/Github export CARP_DIR=$GH_HOME/carp/Carp/ export EDITOR=/usr/local/bin/vim alias dob="git branch --merged | grep -vE '(\*)|(master)|(dev)' | xargs -n 1 git branch -d" alias vi="stty stop '' -ixoff ; stty erase '^?'; vim" -alias em="emacs" -alias mk="make" alias g="git" -alias virtualenv2="python2.7 /usr/local/lib/python2.7/site-packages/virtualenv.py" alias ghci="ghci -v0" alias ghc-sandbox="ghc -no-user-package-db -package-db .cabal-sandbox/*-packages.conf.d" alias ghci-sandbox="ghci -no-user-package-db -package-db .cabal-sandbox/*-packages.conf.d" alias runhaskell-sandbox="runhaskell -no-user-package-db -package-db .cabal-sandbox/*-packages.conf.d" -alias psg="ps aux | grep -v grep | grep -i -e VSZ -e" alias python="python3" alias pysh="ipython" -alias pip2="/usr/local/bin/pip2" alias pip="pip3" -alias setjdk="launchctl setenv STUDIO_JDK /Library/Java/JavaVirtualMachines/jdk1.8.0_05.jdk" alias cdg="cd $GH_HOME" alias cdgo="cd ~/.go/src" alias emptytrash="sudo rm -rfv /Volumes/*/.Trashes; sudo rm -rfv /private/var/log/asl/*.asl" @@ -142,10 +136,6 @@ makepass(){ echo '' } -massif() { - valgrind --tool=massif --massif-out-file=massif.prof $1 && ms_print massif.prof | less -} - ###-begin-npm-completion-### # # npm command completion script @@ -206,7 +196,3 @@ function ghcl { fortune | cowsay -f koala remind - -# eval `opam config env` - -fpath+=${ZDOTDIR:-~}/.zsh_functions