diff --git a/Brewfile b/Brewfile index b4184c4..dce19aa 100644 --- a/Brewfile +++ b/Brewfile @@ -193,3 +193,4 @@ brew "bitwarden-cli" brew "awscli@2" brew "newsboat" brew "wtfutil" +brew "tfenv" diff --git a/dot_gitconfig b/dot_gitconfig index de78765..0099bdb 100644 --- a/dot_gitconfig +++ b/dot_gitconfig @@ -90,3 +90,13 @@ [branch] # Show most recently changed branches first. sort = -committerdate + tool = colordiff + +[difftool "colordiff"] + cmd = colordiff -ydw \"$LOCAL\" \"$REMOTE\" + +[url "git@github.com:"] + insteadOf = https://github.com/ + +[difftool] + prompt = false diff --git a/dot_scripts/bootstrap.sh b/dot_scripts/bootstrap.sh index d4cc12a..517deb4 100755 --- a/dot_scripts/bootstrap.sh +++ b/dot_scripts/bootstrap.sh @@ -233,7 +233,8 @@ go get -u -v github.com/jessfraz/dockfmt go get -u -v github.com/dmlittle/scenery go get -u -v github.com/camptocamp/terraboard go get -u -v github.com/juliensalinas/torrengo -go get -u -v github.com/asciimoo/wuzz # Interactive cli tool for HTTP inspection +go get -u -v github.com/asciimoo/wuzz # Interactive cli tool for HTTP inspection +go get -u -v github.com/keilerkonzept/terraform-module-versions # detect new terraform modules versions sudo curl -L git.io/scope -o /usr/local/bin/scope sudo chmod a+x /usr/local/bin/scope diff --git a/dot_zsh_aliases b/dot_zsh_aliases index 3d1b8ce..04cdb06 100644 --- a/dot_zsh_aliases +++ b/dot_zsh_aliases @@ -120,12 +120,12 @@ alias rm='gomi' alias df='df -H' alias diff='colordiff --side-by-side --ignore-space-change --width=200 --suppress-common-lines --recursive' alias du='ncdu --color dark -rr -x --exclude .git --exclude node_modules' +alias ctrl-c='pbcopy' alias s=ls alias sl=ll alias ls='lsd' alias lsg='ll | grep -i' # show me files matching "ls grep" alias lh='ls -alt | head' # see the last modified files - alias tree='ls --almost-all --tree' alias v=vi alias x='extract' diff --git a/dot_zsh_functions b/dot_zsh_functions index 74b1577..3dd6695 100644 --- a/dot_zsh_functions +++ b/dot_zsh_functions @@ -427,3 +427,6 @@ function file_getpairs { dl_stopwords; \cat "$1" | tr '[:upper:]' '[:lower:]' | \grep -o -E '\w{3,} \w{3,}' | \grep --invert-match --word-regexp --fixed-strings --file="$HOME/stopwords.txt" | \sed 's/s$//g' | \sed 's/ing$//g' | sort | uniq -c | sort --numeric-sort --reverse } +function file_dups { + \cat "$1" | sort | uniq -c | sort -nr +}