diff --git a/.gitmodules b/.gitmodules index 0882fe9..ab4e764 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,3 @@ -[submodule "tmux-MacOSX-pasteboard"] - path = tools/osx/iTerm2-Color-Schemes - url = git://github.com/mbadolato/iTerm2-Color-Schemes.git -[submodule "iTerm2-Color-Schemes"] - path = tools/osx/iTerm2-Color-Schemes - url = git://github.com/mbadolato/iTerm2-Color-Schemes.git [submodule "powerline-fonts"] path = tools/powerline/powerline-fonts url = git://github.com/Lokaltog/powerline-fonts.git @@ -19,3 +13,9 @@ [submodule "polybar-scripts"] path = tools/polybar/polybar-scripts url = git://github.com/polybar/polybar-scripts.git +[submodule "tools/osx/tmux-MacOSX-pasteboard"] + path = tools/osx/tmux-MacOSX-pasteboard + url = git://github.com/ChrisJohnsen/tmux-MacOSX-pasteboard.git +[submodule "tools/osx/iTerm2-Color-Schemes"] + path = tools/osx/iTerm2-Color-Schemes + url = git://github.com/mbadolato/iTerm2-Color-Schemes.git diff --git a/installers/apps/alacritty.sh b/installers/apps/alacritty.sh new file mode 100755 index 0000000..b10e8fe --- /dev/null +++ b/installers/apps/alacritty.sh @@ -0,0 +1,4 @@ +#!/bin/sh +ALACRITTY_VERSION=0.3.3; +curl -L https://github.com/jwilm/alacritty/releases/download/v${ALACRITTY_VERSION}/Alacritty-v${ALACRITTY_VERSION}-ubuntu_18_04_amd64.deb > /tmp/alacritty.deb; +sudo apt install -y /tmp/alacritty.deb; \ No newline at end of file diff --git a/installers/apps/golang.sh b/installers/apps/golang.sh new file mode 100755 index 0000000..c7cb7da --- /dev/null +++ b/installers/apps/golang.sh @@ -0,0 +1,13 @@ +#!/bin/sh + +GO_VERSION=1.13 + +if [ ! -d "${HOME_DIR}/.gvm/" ]; then + # install GVM + echo "installing gvm"; + bash < <(curl -s -S -L https://raw.githubusercontent.com/moovweb/gvm/master/binscripts/gvm-installer); + echo "[[ -s \"\$HOME/.gvm/scripts/gvm\" ]] && source \"\$HOME/.gvm/scripts/gvm\"" > ${HOME_DIR}/.shell_extensions/gvm.sh; + source ${HOME_DIR}/.gvm/scripts/gvm; + gvm install go${GO_VERSION} -B; + gvm use go${GO_VERSION} --default; +fi \ No newline at end of file diff --git a/installers/apps/node.sh b/installers/apps/node.sh new file mode 100755 index 0000000..073c3c3 --- /dev/null +++ b/installers/apps/node.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +NODE_VERSION=12 + +if [ ! -d "${HOME}/.nvm" ]; then + # install nvm + echo "installing nvm"; + curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.0/install.sh | bash; + echo "export NVM_DIR=\"\$HOME/.nvm\"" > "${HOME}/.shell_extensions/nvm.sh"; + echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> "${HOME}/.shell_extensions/nvm.sh"; + echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion' >> "${HOME}/.shell_extensions/nvm.sh"; + NVM_DIR=${HOME}/.nvm; + source $NVM_DIR/nvm.sh; + + nvm install v${NODE_VERSION}; +fi diff --git a/installers/apps/polybar.sh b/installers/apps/polybar.sh new file mode 100755 index 0000000..c757bd1 --- /dev/null +++ b/installers/apps/polybar.sh @@ -0,0 +1,9 @@ +#!/bin/sh +# install polybar +git clone --branch 3.4.0 --recursive https://github.com/polybar/polybar polybar +cd ./polybar/build +cmake .. +make -j$(nproc) +sudo make install +cd ../.. +rm -rf ./polybar diff --git a/installers/apps/ruby.sh b/installers/apps/ruby.sh new file mode 100755 index 0000000..6793f09 --- /dev/null +++ b/installers/apps/ruby.sh @@ -0,0 +1,8 @@ + + +if [ ! -d "${HOME}/.rvm" ]; then + gpg --keyserver hkp://pool.sks-keyservers.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB + curl -sSL https://get.rvm.io | bash -s stable --ruby; + echo "source \${HOME}/.rvm/scripts/rvm" > "${HOME}/.shell_extensions/rvm.sh" + source ${HOME}/.rvm/scripts/rvm +fi \ No newline at end of file diff --git a/installers/apps/rust.sh b/installers/apps/rust.sh new file mode 100755 index 0000000..9ea2ea6 --- /dev/null +++ b/installers/apps/rust.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +if [ ! -d "${HOME}/.cargo" ]; then + # install rust + echo "installing rustup + rust stable"; + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > /tmp/rustup.sh; + chmod +x /tmp/rustup.sh && /tmp/rustup.sh -y --no-modify-path; + echo 'source $HOME/.cargo/env' > "${HOME}/.shell_extensions/rust.sh"; + source ${HOME}/.cargo/env + rustup install stable; +fi \ No newline at end of file diff --git a/installers/apps/vim.sh b/installers/apps/vim.sh new file mode 100755 index 0000000..b3d7297 --- /dev/null +++ b/installers/apps/vim.sh @@ -0,0 +1,59 @@ +#!/bin/sh +# install vim with all of the necessary features +[ ! -s "${HOME}/Projects/vim" ] && git clone --branch v8.1.2109 https://github.com/vim/vim vim +cd ./vim + +export VIMRUNTIME=${HOME}/.config/vim/runtime; +echo "setting up vim runtime folder @ ${VIMRUNTIME}"; +mkdir -p ${VIMRUNTIME}/autoload ${VIMRUNTIME}/bundle && \ +curl -LSso ${VIMRUNTIME}/autoload/pathogen.vim https://tpo.pe/pathogen.vim; + + +VIM_CONFIG_ARGS=' + --enable-multibyte \ + --enable-rubyinterp=yes \ + --with-python3-config-dir=/usr/lib/python3.7/config-3.7m-x86_64-linux-gnu \ + --enable-python3interp=yes \ + --enable-perlinterp=yes \ + --enable-luainterp=yes \ + --disable-netbeans \ + --with-compiledby="Adam V " \ + --enable-gui=auto \ + --enable-cscope \ + --prefix=/usr/local +' + +VIM_CONFIG_X_ARGS=' + --enable-gtk2-check \ + --enable-gnome-check \ + --with-x +' +if [ ! -z "$(which X)" ]; then + echo "adding X options" + VIM_CONFIG_ARGS="${VIM_CONFIG_ARGS} ${VIM_CONFIG_X_ARGS}" +fi + +./configure ${VIM_CONFIG_ARGS} + +make VIMRUNTUMEDIR=${HOME}/.config/vim/runtime/ +sudo make install VIMRUNTIMEDIR=${HOME}/.config/vim/runtime/ + + +VIMFILES=/usr/local/share/vim/vim81 +find ${VIMFILES} -type f | \ + sed "s=${VIMFILES}==" | \ + xargs -I {} dirname {} | \ + xargs -I {} mkdir -p ${VIMRUNTIME}{}; + +find ${VIMFILES} -type f | \ + sed "s=${VIMFILES}==" | \ + xargs -I {} cp $VIMFILES/{} $VIMRUNTIME{}; + +ln -svf ${HOME}/.config/vim/.vimrc ~/.vimrc + +cd .. +rm -rf ./vim + +pushd ${HOME}/.config/vim/ +rake +popd \ No newline at end of file diff --git a/installers/base.sh b/installers/base.sh index d7f08ef..c58666f 100755 --- a/installers/base.sh +++ b/installers/base.sh @@ -2,8 +2,6 @@ set -eou pipefail shopt -s extglob -GO_VERSION=1.13 -NODE_VERSION=12 linkDirectory() { SOURCE=$1; @@ -27,7 +25,6 @@ SRC_DIR=${BASE_DIR}/src; TOOLS_DIR=${BASE_DIR}/tools; CONFIG_DIR=${SRC_DIR}/.config; EXT_DIR=${SRC_DIR}/.shell_extensions; -export VIMRUNTIME=${HOME}/.config/vim/runtime; if [ -d ${HOME_DIR} ]; then echo "installing into ${HOME_DIR}"; @@ -40,7 +37,7 @@ export HOME=${HOME_DIR}; echo "installing dot files from ${BASE_DIR} into ${HOME_DIR}..."; -mkdir -p ${HOME_DIR}/Projects; +mkdir -p ${HOME_DIR}/projects; mkdir -p ${HOME_DIR}/Downloads; mkdir -p ${HOME_DIR}/Desktop; mkdir -p ${HOME_DIR}/Documents/Pictures/Wallpapers; @@ -86,59 +83,16 @@ else echo "skipping tools..." fi - #------------------------------------------------------------------ # Set up home directory deps #------------------------------------------------------------------ mkdir -p ${HOME_DIR}/.bin; -echo "setting up vim runtime folder @ ${VIMRUNTIME}"; -mkdir -p ${VIMRUNTIME}/autoload ${VIMRUNTIME}/bundle && \ -curl -LSso ${VIMRUNTIME}/autoload/pathogen.vim https://tpo.pe/pathogen.vim; - - -if [ ! -d "${HOME_DIR}/.gvm/" ]; then - # install GVM - echo "installing gvm"; - bash < <(curl -s -S -L https://raw.githubusercontent.com/moovweb/gvm/master/binscripts/gvm-installer); - echo "[[ -s \"\$HOME/.gvm/scripts/gvm\" ]] && source \"\$HOME/.gvm/scripts/gvm\"" > ${HOME_DIR}/.shell_extensions/gvm.sh; - source ${HOME_DIR}/.gvm/scripts/gvm; - gvm install go${GO_VERSION} -B; - gvm use go${GO_VERSION} --default; -fi - -if [ ! -d "${HOME}/.nvm" ]; then - # install nvm - echo "installing nvm"; - curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.0/install.sh | bash; - echo "export NVM_DIR=\"\$HOME/.nvm\"" > "${HOME}/.shell_extensions/nvm.sh"; - echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> "${HOME}/.shell_extensions/nvm.sh"; - echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion' >> "${HOME}/.shell_extensions/nvm.sh"; - NVM_DIR=${HOME}/.nvm; - source $NVM_DIR/nvm.sh; - - nvm install v${NODE_VERSION}; -fi - -if [ ! -d "${HOME}/.cargo" ]; then - # install rust - echo "installing rustup + rust stable"; - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > /tmp/rustup.sh; - chmod +x /tmp/rustup.sh && /tmp/rustup.sh -y --no-modify-path; - echo 'source $HOME/.cargo/env' > "${HOME}/.shell_extensions/rust.sh"; - source ${HOME}/.cargo/env - rustup install stable; -fi - -if [ ! -d "${HOME}/.rvm" ]; then - gpg --keyserver hkp://pool.sks-keyservers.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB - curl -sSL https://get.rvm.io | bash -s stable --ruby; - echo "source \${HOME}/.rvm/scripts/rvm" > "${HOME}/.shell_extensions/rvm.sh" - source ${HOME}/.rvm/scripts/rvm -fi +APP_INSTALLS=${BASE_DIR}/installers/app; -pushd ${HOME}/.config/vim/ -rake -popd +source ${APP_INSTALLS}/golang.sh; +source ${APP_INSTALLS}/node.sh; +source ${APP_INSTALLS}/rust.sh; +source ${APP_INSTALLS}/rvm.sh; -find ${HOME} ! -path "${HOME}/Projects" ! -path "${HOME}" | xargs -I {} chown $@ {}; +find ${HOME} ! -path "${HOME}/projects" ! -path "${HOME}" | xargs -I {} chown $@ {}; diff --git a/installers/linux.sh b/installers/linux.sh index 057d504..6a4fb1f 100755 --- a/installers/linux.sh +++ b/installers/linux.sh @@ -1,6 +1,5 @@ #!/bin/bash -ALACRITTY_VERSION=0.3.3; INSTALL_LIST='ctags dhex neofetch irssi man bison python2 iptables software-properties-common libncurses-dev uidmap gpg apt-transport-https tar zip unzip curl wget git ca-certificates build-essential make cmake gcc tmux apt-utils dnsutils python3 less libassuan-dev libc6-dev libdevmapper-dev libglib2.0-dev libgpgme-dev libgpg-error-dev libostree-dev libprotobuf-dev libprotobuf-c-dev libseccomp-dev libselinux1-dev libsystemd-dev pkg-config runc python-dev python3-dev ruby-dev lua5.1 libperl-dev'; @@ -30,69 +29,10 @@ if [ -z "$(which X)" ]; then echo "no X server setup detected." else sudo apt-get install -y ${X_INSTALL_LIST}; - curl -L https://github.com/jwilm/alacritty/releases/download/v${ALACRITTY_VERSION}/Alacritty-v${ALACRITTY_VERSION}-ubuntu_18_04_amd64.deb > /tmp/alacritty.deb; - sudo apt install -y /tmp/alacritty.deb; - - # install polybar - git clone --branch 3.4.0 --recursive https://github.com/polybar/polybar polybar - cd ./polybar/build - cmake .. - make -j$(nproc) - sudo make install - cd ../.. - rm -rf ./polybar snap install code docker firefox thunderbird insomnia discord slack spotify; -fi - -# install vim with all of the necessary features -[ ! -s "${HOME}/Projects/vim" ] && git clone --branch v8.1.2109 https://github.com/vim/vim vim -cd ./vim -VIM_CONFIG_ARGS=' - --enable-multibyte \ - --enable-rubyinterp=yes \ - --with-python3-config-dir=/usr/lib/python3.7/config-3.7m-x86_64-linux-gnu \ - --enable-python3interp=yes \ - --enable-perlinterp=yes \ - --enable-luainterp=yes \ - --disable-netbeans \ - --with-compiledby="Adam V " \ - --enable-gui=auto \ - --enable-cscope \ - --prefix=/usr/local -' - -VIM_CONFIG_X_ARGS=' - --enable-gtk2-check \ - --enable-gnome-check \ - --with-x -' -if [ ! -z "$(which X)" ]; then - echo "adding X options" - VIM_CONFIG_ARGS="${VOM_CONFIG_ARGS} ${VIM_CONFIG_X_ARGS}" + # install polybar and alacritty fi -./configure ${VIM_CONFIG_ARGS} - -make VIMRUNTUMEDIR=${HOME}/.config/vim/runtime/ -sudo make install VIMRUNTIMEDIR=${HOME}/.config/vim/runtime/ - - -VIMFILES=/usr/local/share/vim/vim81 -find ${VIMFILES} -type f | \ - sed "s=${VIMFILES}==" | \ - xargs -I {} dirname {} | \ - xargs -I {} mkdir -p ${VIMRUNTIME}{}; - -find ${VIMFILES} -type f | \ - sed "s=${VIMFILES}==" | \ - xargs -I {} cp $VIMFILES/{} $VIMRUNTIME{}; - -ln -svf ${HOME}/.config/vim/.vimrc ~/.vimrc - -cd .. -rm -rf ./vim - - cd ${HOME} diff --git a/src/.config/tmux/.tmux.conf b/src/.config/tmux/.tmux.conf index 97ad9f1..49d7e32 100644 --- a/src/.config/tmux/.tmux.conf +++ b/src/.config/tmux/.tmux.conf @@ -10,19 +10,18 @@ set -g default-command "/bin/bash --login" set -g default-shell "/bin/bash" -source ~/tools/powerline/powerline/powerline/bindings/tmux/powerline.conf -set -g default-terminal "screen-256color" +set -g default-terminal "xterm-256color" # set esc-wait off, so vim works set-option -sg escape-time 0 + #set prefix to ctrl-a unbind-key C-b set-option -g prefix C-a unbind-key C-a ; bind-key C-a send-prefix - # some nice ops set-option -g bell-action any set-option -g history-limit 10000 diff --git a/src/.config/vim/.vimrc b/src/.config/vim/.vimrc index 9c4acc0..69ad14c 100644 --- a/src/.config/vim/.vimrc +++ b/src/.config/vim/.vimrc @@ -35,6 +35,7 @@ set backupcopy=yes set autoread set selection=exclusive set ttimeoutlen=50 +set termguicolors " Use the OS clipboard by default (on versions compiled with `+clipboard`) set clipboard=unnamedplus " Enhance command-line completion @@ -60,13 +61,13 @@ set t_Co=256 " Centralize backups, swapfiles and undo history if exists("&backupdir") - set backupdir=~/tools/vim/backups + set backupdir=~/.config/vim/backups/ endif if exists("&directory") - set directory=~/tools/vim/swaps + set directory=~/.config/vim/swaps/ endif if exists("&undodir") - set undodir=~/tools/vim/undo + set undodir=~/.config/vim/undo/ endif " Respect modeline in files @@ -154,7 +155,7 @@ nmap n :NERDTreeToggle %:p:h nmap m :NERDTreeClose:NERDTreeFind " strips whitespace -noremap ss :call StripWhitespace() +noremap ws :call StripWhitespace() " Strip trailing whitespace (,ss) function! StripWhitespace() @@ -216,7 +217,8 @@ let g:go_highlight_structs = 1 let g:go_highlight_operators = 1 let g:go_highlight_build_constraints = 1 let g:go_highlight_extra_types = 1 -let g:go_fmt_command = "goreturns" +let g:go_fmt_command = "goimports" +let g:go_fmt_autosave = 1 " -b -w -p" let g:syntastic_go_checkers = ['go', 'errcheck', 'gofmt', 'golint', 'govet'] diff --git a/src/.config/vim/plugins.txt b/src/.config/vim/plugins.txt index 9c82b75..f4bd765 100644 --- a/src/.config/vim/plugins.txt +++ b/src/.config/vim/plugins.txt @@ -1,7 +1,7 @@ git://github.com/tpope/vim-pathogen.git git://github.com/tpope/vim-fugitive.git git://github.com/tpope/vim-dispatch.git -git://github.com/Valloric/YouCompleteMe.git +#git://github.com/Valloric/YouCompleteMe.git git://github.com/nathanaelkane/vim-indent-guides.git git://github.com/airblade/vim-gitgutter.git git://github.com/fholgado/minibufexpl.vim.git diff --git a/src/.gitconfig b/src/.gitconfig index 9890357..0c0fe3c 100644 --- a/src/.gitconfig +++ b/src/.gitconfig @@ -1,167 +1,171 @@ [alias] - # View abbreviated SHA, description, and history graph of the latest 20 commits - lo = log --oneline -n 40 --graph - l = log --oneline -n 40 --graph --show-signature + # View abbreviated SHA, description, and history graph of the latest 20 commits + lo = log --oneline -n 40 --graph + l = log --oneline -n 40 --graph --show-signature - # View the current working tree status using the short format - s = status -s + # View the current working tree status using the short format + s = status -s - # Show the diff between the latest commit and the current state - d = !"git diff --color --patch-with-stat" - dc = !"git diff --cached --color --patch-with-stat" + # Show the diff between the latest commit and the current state + d = !"git diff --color --patch-with-stat" + dc = !"git diff --cached --color --patch-with-stat" - # `git di $number` shows the diff between the state `$number` revisions ago and the current state - di = !"d() { git diff --color --patch-with-stat HEAD~$1 | diff-so-fancy; }; git diff-index --color --quiet HEAD --; d" + # `git di $number` shows the diff between the state `$number` revisions ago and the current state + di = !"d() { git diff --color --patch-with-stat HEAD~$1 | diff-so-fancy; }; git diff-index --color --quiet HEAD --; d" - # Pull in remote changes for the current repository and all its submodules - p = !"git pull; git submodule foreach git pull origin master" + # Pull in remote changes for the current repository and all its submodules + p = !"git pull; git submodule foreach git pull origin master" - # Clone a repository including all submodules - c = clone --recursive + # Clone a repository including all submodules + c = clone --recursive - # Commit all changes - ca = !git add -A && git commit -av -S + # Commit all changes + ca = !git add -A && git commit -av -S - # commits with gpgsign flag - cs = commit -S + # commits with gpgsign flag + cs = commit -S - # commits with gpgsign and inline message flag - csm = commit -S -m + # commits with gpgsign and inline message flag + csm = commit -S -m - # Switch to a branch, creating it if necessary - go = checkout -B + # Switch to a branch, creating it if necessary + go = checkout -B - # pull rebase - pr = pull --rebase + # pull rebase + pr = pull --rebase - # Show verbose output about tags, branches or remotes - tags = tag -l - branches = branch -a - remotes = remote -v + # Show verbose output about tags, branches or remotes + tags = tag -l + branches = branch -a + remotes = remote -v - # Credit an author on the latest commit - credit = "!f() { git commit --amend --author \"$1 <$2>\" -C HEAD; }; f" + # Credit an author on the latest commit + credit = "!f() { git commit --amend --author \"$1 <$2>\" -C HEAD; }; f" - # Interactive rebase with the given number of latest commits - reb = "!r() { git rebase -i HEAD~$1; }; r" + # Interactive rebase with the given number of latest commits + reb = "!r() { git rebase -i HEAD~$1; }; r" - # Find branches containing commit - fb = "!f() { git branch -a --contains $1; }; f" + # Find branches containing commit + fb = "!f() { git branch -a --contains $1; }; f" - # Find tags containing commit - ft = "!f() { git describe --always --contains $1; }; f" + # Find tags containing commit + ft = "!f() { git describe --always --contains $1; }; f" - # Find commits by source code - fc = "!f() { git log --pretty=format:'%C(yellow)%h %Cblue%ad %Creset%s%Cgreen [%cn] %Cred%d' --decorate --date=short -S$1; }; f" + # Find commits by source code + fc = "!f() { git log --pretty=format:'%C(yellow)%h %Cblue%ad %Creset%s%Cgreen [%cn] %Cred%d' --decorate --date=short -S$1; }; f" - # Find commits by commit message - fm = "!f() { git log --pretty=format:'%C(yellow)%h %Cblue%ad %Creset%s%Cgreen [%cn] %Cred%d' --decorate --date=short --grep=$1; }; f" + # Find commits by commit message + fm = "!f() { git log --pretty=format:'%C(yellow)%h %Cblue%ad %Creset%s%Cgreen [%cn] %Cred%d' --decorate --date=short --grep=$1; }; f" # Remove branches that have already been merged with master - dm = "!git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d" + dm = "!git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d" plog = log --graph --pretty=format:'%h -%d %s %n' --abbrev-commit --date=relative --branches [diff] - # Git diff will use (i)ndex, (w)ork tree, (c)ommit and (o)bject - # instead of a/b/c/d as prefixes for patches - mnemonicprefix = true - tool = vimdiff + # Git diff will use (i)ndex, (w)ork tree, (c)ommit and (o)bject + # instead of a/b/c/d as prefixes for patches + mnemonicprefix = true + tool = vimdiff [merge] - tool = vimdiff - conflictstyle = diff3 + tool = vimdiff + conflictstyle = diff3 [mergetool] - prompt = false - trustExitCode = false + prompt = false + trustExitCode = false [advice] - statusHints = false + statusHints = false [apply] - # Detect whitespace errors when applying a patch - whitespace = fix + # Detect whitespace errors when applying a patch + whitespace = fix [gc] - auto=1 + auto=1 [core] - # Use custom `.gitignore` and `.gitattributes` - excludesfile = /Users/Adam/.gitignore - attributesfile = ~/.gitattributes - # Treat spaces before tabs and all kinds of trailing whitespace as an error. - # [default] trailing-space: looks for spaces at the end of a line - # [default] space-before-tab: looks for spaces before tabs at the beginning of - # a line - whitespace = space-before-tab,-indent-with-non-tab,trailing-space - # Make `git rebase` safer on OS X - # More info: - trustctime = false - autocrlf = false - eol = 'lf' - editor = $EDITOR - hooksPath = /home/adam/.githooks/ + # Use custom `.gitignore` and `.gitattributes` + excludesfile = /Users/Adam/.gitignore + attributesfile = ~/.gitattributes + # Treat spaces before tabs and all kinds of trailing whitespace as an error. + # [default] trailing-space: looks for spaces at the end of a line + # [default] space-before-tab: looks for spaces before tabs at the beginning of + # a line + whitespace = space-before-tab,-indent-with-non-tab,trailing-space + # Make `git rebase` safer on OS X + # More info: + trustctime = false + autocrlf = false + eol = 'lf' + editor = $EDITOR + hooksPath = /home/adam/.githooks/ [color] - # Use colors in Git commands that are capable of colored output when - # outputting to the terminal. (This is the default setting in Git ≥ 1.8.4.) - ui = auto + # Use colors in Git commands that are capable of colored output when + # outputting to the terminal. (This is the default setting in Git ≥ 1.8.4.) + ui = auto [color "branch"] - current = yellow reverse - local = yellow - remote = green + current = yellow reverse + local = yellow + remote = green [color "diff"] - meta = yellow bold - frag = magenta bold - old = red bold - new = green bold + meta = yellow bold + frag = magenta bold + old = red bold + new = green bold [color "status"] - added = yellow - changed = green - untracked = cyan + added = yellow + changed = green + untracked = cyan [merge] - # Include summaries of merged commits in newly created merge commit messages - log = true - # better merge messages - summary=true + # Include summaries of merged commits in newly created merge commit messages + log = true + # better merge messages + summary=true # URL shorthands [url "git@github.com:"] - insteadOf = "gh:" - pushInsteadOf = "github:" - pushInsteadOf = "git://github.com/" + insteadOf = https://github.com/ + pushInsteadOf = "github:" + pushInsteadOf = "git://github.com/" + [url "git://github.com/"] - insteadOf = "github:" + insteadOf = "github:" + [url "git@gist.github.com:"] - insteadOf = "gst:" - pushInsteadOf = "gist:" - pushInsteadOf = "git://gist.github.com/" + insteadOf = "gst:" + pushInsteadOf = "gist:" + pushInsteadOf = "git://gist.github.com/" + [url "git://gist.github.com/"] - insteadOf = "gist:" + insteadOf = "gist:" [push] - default = current + default = current + [pull] - default = current + default = current [user] - email = adam.veldhousen@liveauctioneers.com - name = Adam Veldhousen - signingkey = 415C0B9C + email = adam.veldhousen@liveauctioneers.com + name = Adam Veldhousen + signingkey = 4FA79E5B6598505C8DFA30A7A466CEE1415C0B9C [commit] - gpgsign = true - template = /home/adam/.gitmessage + gpgsign = true + template = /home/adam/.gitmessage [help] - autocorrect=20 + autocorrect=20 [credential] - # for OSX - #helper = osxkeychain - # for Linux - helper = store --file ~/.git-credentials + # for OSX + #helper = osxkeychain + # for Linux + helper = store --file ~/.git-credentials diff --git a/src/.githooks/pre-commit b/src/.githooks/pre-commit index 7d2dde0..a2aeb58 100755 --- a/src/.githooks/pre-commit +++ b/src/.githooks/pre-commit @@ -1,6 +1,6 @@ #!/usr/bin/env bash -if [ -f "$PWD/makefile" ] && [ ! -z "$(cat $PWD/makefile | grep 'lint:')" ]; then +if [ -f "$PWD/makefile" ] && [ ! -z "$(cat $PWD/makefile | grep '^lint:')" ]; then echo "lint rule found in $PWD/makefile..." make lint elif [ -f "$PWD/package.json" ] && [ ! -z "$(cat $PWD/package.json | grep '\"lint\"')" ]; then @@ -8,7 +8,7 @@ elif [ -f "$PWD/package.json" ] && [ ! -z "$(cat $PWD/package.json | grep '\"lin npm run lint fi -if [ -f "$PWD/makefile" ] && [ ! -z "$(cat $PWD/makefile | grep 'test:')" ]; then +if [ -f "$PWD/makefile" ] && [ ! -z "$(cat $PWD/makefile | grep '^test:')" ]; then echo "test rule found in $PWD/makefile..." make test elif [ -f "$PWD/package.json" ] && [ ! -z "$(cat $PWD/package.json | grep '\"test\"')" ]; then diff --git a/src/.githooks/pre-push b/src/.githooks/pre-push index 0be04d7..65693a3 100755 --- a/src/.githooks/pre-push +++ b/src/.githooks/pre-push @@ -3,7 +3,7 @@ # If the following text is found anywhere in the source for HEAD, we will prevent pushing dont_push_flag="DONT PUSH ME" -flag_found=`git grep --color "$dont_push_flag" HEAD` +flag_found=`git grep --color "$dont_push_flag" HEAD | grep -v 'pre-push'` if [ -n "$flag_found" ] then # Display which commit the first occurence of the flag was found and exit failure diff --git a/src/.profile b/src/.profile index 4665b74..8b2c29c 100644 --- a/src/.profile +++ b/src/.profile @@ -7,11 +7,6 @@ case $- in esac -# source environment settings -if [ -f ~/.environment ]; then - . ~/.environment -fi - # for when you want to do custom junk # Sources a folder with shell extensions if [ -d ~/.shell_extensions ]; then @@ -22,6 +17,12 @@ if [ -d ~/.shell_extensions ]; then done fi +# source environment settings +if [ -f ~/.environment ]; then + . ~/.environment +fi + if [ -f "./.motd" ]; then source .motd fi + diff --git a/src/.shell_extensions/environment.sh b/src/.shell_extensions/environment.sh index 948b145..7308d98 100644 --- a/src/.shell_extensions/environment.sh +++ b/src/.shell_extensions/environment.sh @@ -48,7 +48,7 @@ if [ -d "/c/Windows" ]; then . ~/.windows fi else - export GOPATH=~/Projects/go + export GOPATH=~/projects/go export DOTNETPATH=~/.dotnet/ fi diff --git a/tools/modules/iTerm2-Color-Schemes b/tools/modules/iTerm2-Color-Schemes deleted file mode 160000 index 20a54b0..0000000 --- a/tools/modules/iTerm2-Color-Schemes +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 20a54b079c8be65db941776f0b824054bb297b31 diff --git a/tools/modules/powerline b/tools/modules/powerline deleted file mode 160000 index d77cc30..0000000 --- a/tools/modules/powerline +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d77cc30a3be26cf34411af70c5e2b595eef2d46d diff --git a/tools/modules/powerline-fonts b/tools/modules/powerline-fonts deleted file mode 160000 index 99be848..0000000 --- a/tools/modules/powerline-fonts +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 99be8480bb39f2b9daa52f03a22941a45cd1b8cf diff --git a/tools/modules/tmux-MacOSX-pasteboard b/tools/modules/tmux-MacOSX-pasteboard deleted file mode 160000 index 98f3238..0000000 --- a/tools/modules/tmux-MacOSX-pasteboard +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 98f32381182c5850a40ed60abec0c1320b7be270 diff --git a/tools/osx/iTerm2-Color-Schemes b/tools/osx/iTerm2-Color-Schemes index b0f0c7e..9a961a3 160000 --- a/tools/osx/iTerm2-Color-Schemes +++ b/tools/osx/iTerm2-Color-Schemes @@ -1 +1 @@ -Subproject commit b0f0c7ec94f7cb6061639f8121a2cb1009c20627 +Subproject commit 9a961a3451d25628f20d09f464bc4a77ce640f6c