Merge pull request #21 from genebean/mods_from_work

Mods from work
This commit is contained in:
Gene Liverman 2019-12-27 09:02:15 -05:00 committed by GitHub
commit ee73299b94
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 2 deletions

4
.gitignore vendored
View file

@ -13,7 +13,11 @@ link/nix/config/grv/
link/nix/config/gtk-2.0/ link/nix/config/gtk-2.0/
link/nix/config/htop/ link/nix/config/htop/
link/nix/config/hub link/nix/config/hub
link/nix/config/Microsoft\\VisualStudio Services/
link/nix/config/NuGet/nuget.config link/nix/config/NuGet/nuget.config
link/nix/config/powershell/powershellget/ link/nix/config/powershell/powershellget/
link/nix/config/puppet/
link/nix/config/QtProject/ link/nix/config/QtProject/
link/nix/config/tmuxinator/ link/nix/config/tmuxinator/
link/nix/config/wireshark/

View file

@ -86,9 +86,9 @@ gpg-connect-agent updatestartuptty /bye >/dev/null
alias biv='bundle install --path=vendor/bundle' alias biv='bundle install --path=vendor/bundle'
alias gbc='git branch --merged | command grep -vE "^(\*|\s*(master|develop|production)\s*$)" | command xargs -n 1 git branch -d' alias gbc='git branch --merged | command grep -vE "^(\*|\s*(master|develop|production)\s*$)" | command xargs -n 1 git branch -d'
alias sal='ssh-add -L' alias sal='ssh-add -L'
alias ogk='/Applications/GitKraken.app/Contents/MacOS/GitKraken &' alias ogk='open -a GitKraken'
alias sz='source ~/.zshrc' alias sz='source ~/.zshrc'
alias st='/Applications/SourceTree.app/Contents/MacOS/SourceTree &' alias st='open -a SourceTree'
alias ykey='pkill gpg-agent && source ~/.zshrc; ssh-add -L' alias ykey='pkill gpg-agent && source ~/.zshrc; ssh-add -L'
# this makes grv from homebrew work # this makes grv from homebrew work
@ -123,6 +123,8 @@ export PATH=$PATH:~/.nexustools
if [[ `uname` == 'Darwin' ]]; then if [[ `uname` == 'Darwin' ]]; then
export PATH=$PATH:/usr/local/sbin export PATH=$PATH:/usr/local/sbin
alias flushdns='sudo killall -HUP mDNSResponder'
# Araxis needs to come first so that its tools don't get stomped # Araxis needs to come first so that its tools don't get stomped
# by ones Homebrew installs to /usr/local/bin. In particular, compare # by ones Homebrew installs to /usr/local/bin. In particular, compare
# from ImageMagick breaks using git difftool. # from ImageMagick breaks using git difftool.

View file

@ -2,3 +2,5 @@ Host *.westga.edu
User ven-gliverman User ven-gliverman
HOST *.delivery.puppetlabs.net HOST *.delivery.puppetlabs.net
IdentityFile ~/.ssh/id_rsa-acceptance IdentityFile ~/.ssh/id_rsa-acceptance
Host beanbag.technicalissues.us
User gliverma