[] updated 5/2

earlonrails · May 2, 2022 · a7ec187 · a7ec187
1 parent 19f5a35
commit a7ec187
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 63 deletions.
diff --git a/Brewfile b/Brewfile
@@ -1,5 +1,3 @@
-tap "atlassian/tap"
-tap "bazelbuild/tap", pin: true
 tap "homebrew/bundle"
 tap "homebrew/cask"
 tap "homebrew/cask-fonts"
@@ -9,16 +7,12 @@ tap "homebrew/services"
 tap "rs/tap"
 cask "java"
 brew "openssl"
-brew "ansible"
-brew "apktool"
 brew "automake"
 brew "bash-completion"
 brew "cmake"
 brew "coreutils"
 brew "dep"
-brew "elixir"
 brew "f2c"
-brew "fish"
 brew "git"
 brew "gmp"
 brew "gnupg"
@@ -30,69 +24,35 @@ brew "jq"
 brew "libksba"
 brew "libmagic"
 brew "libtool"
-brew "lua"
-brew "luarocks"
-brew "maven"
-brew "mongodb", restart_service: true
-brew "ninja"
-brew "openssl@1.1"
 brew "pbzip2"
-brew "postgresql", restart_service: true
 brew "progress"
-brew "pyenv"
-brew "python"
 brew "redis", restart_service: true
 brew "rename"
 brew "sbt"
 brew "shmux"
-brew "sshpass"
 brew "sslscan"
 brew "telnet"
-brew "terraform"
 brew "tmux"
 brew "vegeta"
 brew "watch"
 brew "wget"
-brew "zeromq"
-brew "atlassian/tap/atlassian-plugin-sdk"
-brew "bazelbuild/tap/bazel"
 brew "rs/tap/jaggr"
 brew "rs/tap/jplot"
-cask "adium"
-cask "adobe-air"
 cask "alfred"
-cask "amazon-music"
-cask "android-studio"
-cask "angry-ip-scanner"
-cask "atom"
 cask "keepingyouawake"
-cask "chefdk"
-cask "chromium"
 cask "colorpicker-skalacolor"
 cask "docker"
-cask "eclipse-java"
 cask "firefox"
 cask "font-dejavu-sans-mono-for-powerline"
 cask "font-hack-nerd-font"
-cask "gimp"
 cask "insomnia"
 cask "intellij-idea-ce"
 cask "iterm2"
-cask "jeromelebel-mongohub"
 cask "macdown"
 cask "meld"
 cask "ngrok"
-cask "obs"
-cask "openshot-video-editor"
-cask "psequel"
 cask "rowanj-gitx"
-cask "scala-ide"
 cask "shiftit"
-cask "skype"
-cask "spotifree"
-cask "spotify"
-cask "steam"
-cask "sublime-text"
-cask "virtualbox"
-cask "vlc"
-cask "xquartz"
+cask "rectangle"
+
+
diff --git a/git/gitconfig.work b/git/gitconfig.work
@@ -1,21 +1,22 @@
 [user]
-	email = kkrauss@twilio.com
+	email = kevin.krauss@hulu.com
 	name = Kevin Krauss
 [alias]
   ll = pull origin
   sh = push origin
   pf = push --force-with-lease
   pretty = log --graph --pretty=format:'%Cred%h%Creset %an: %s - %Creset %C(yellow)%d%Creset %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
 [core]
-  editor = subl -w -n
-	excludesfile = /Users/kkrauss/.gitignore_global
-  hooksPath = /Users/kkrauss/.git-hooks
+  editor = code --wait
+	excludesFile = /Users/kevin.krauss/.gitignore_global
+  hooksPath = /Users/kevin.krauss/.git-hooks
 [merge]
-  tool = opendiff
-[mergetool]
+  tool = vscode
+[mergetool "vscode"]
+  cmd = code --wait $MERGED
   keepBackup = false
 [diff]
-  tool = opendiff
+  tool = code --wait --diff $LOCAL $REMOTE
 [pull]
   rebase = true
 [rebase]

diff --git a/git/gitignore_global b/git/gitignore_global
@@ -40,4 +40,5 @@ Thumbs.db
 .tool-versions
 .python-version
 .vscode/
+.devcontainer/
 
diff --git a/install-mac.sh b/install-mac.sh
@@ -13,6 +13,6 @@ brew bundle
 
 # Set macOS preferences
 # We will run this last because this will reload the shell
-if [ "$(uname)" == "Darwin" ]; then
+if [ "$(uname)" = "Darwin" ]; then
   source .macos
 fi
diff --git a/install.sh b/install.sh
@@ -6,7 +6,7 @@ if ! [ -d "$HOME/.asdf" ]; then
   git clone https://github.com/asdf-vm/asdf.git ~/.asdf --branch v0.6.3
 fi
 
-if [ "$(uname)" == "Darwin" ]; then
+if [ "$(uname)" = "Darwin" ]; then
   source install-mac.sh
 else
   source install-linux.sh

diff --git a/system/bash_profile b/system/bash_profile
@@ -5,7 +5,6 @@ alias l='\ls'
 alias ll='\ls -lAh'
 alias la='\ls -a'
 alias ls='\ls -al'
-alias open='xdg-open'
 
 # tmux
 alias tmux='TERM=screen-256color-bce tmux'
@@ -54,15 +53,8 @@ alias dclean='docker rmi -f $(docker images -f "dangling=true" -q); docker volum
 alias dprune='docker system prune -a'
 alias dcon='docker container prune --filter "until=12h"'
 alias oci='eval "$(chef shell-init bash)"'
-alias pbcopy='xclip -selection clipboard'
-alias pbpaste='xclip -selection clipboard -o'
-alias lzd='lazydocker'
-
-# kubernetes
-alias ka='kubectl apply --recursive -f'
-alias klo='kubectl logs -f'
-alias kex='kubectl exec -it'
-alias kdel='kubectl delete --recursive -f'
+# alias pbcopy='xclip -selection clipboard'
+# alias pbpaste='xclip -selection clipboard -o'
 
 # python alias
 alias nose='source venv/bin/activate && nosetests'
@@ -359,6 +351,14 @@ squeek() {
   sudo modprobe usbhid && sudo modprobe psmouse
 }
 
+kifi() {
+  sudo pkill networkd
+  sudo ifconfig en0 up
+  sudo ifconfig en0 up
+  ifconfig -u en0
+  sudo ipconfig set en0 DHCP
+}
+
 # export GIT_SSH="$HOME/dynamic_git_command.sh"
 # swapgitmail() {
 #   [ -n "$MAIN_GIT_EMAIL" ] || echo "MAIN_GIT_EMAIL not set"
@@ -440,4 +440,3 @@ export HISTFILESIZE=100000
 export HISTSIZE=100000
 export HISTCONTROL=ignoredups:erasedups
 export BASH_SILENCE_DEPRECATION_WARNING=1
-eval $(/home/linuxbrew/.linuxbrew/bin/brew shellenv)