diff --git a/.bashrc b/.bashrc index 5858c00..79ab36a 100755 --- a/.bashrc +++ b/.bashrc @@ -10,10 +10,6 @@ alias dedsstore="find . -name \".DS_Store\" -delete" alias c="clear" alias dps="docker ps -a --format 'table {{.Names}}\t{{.Status}}\t{{.Image}}'" -# Difftastic Config -export DFT_TAB_WIDTH=4 -export DFT_BACKGROUND=light - # History HISTSIZE=50000 HISTFILESIZE=50000 @@ -57,12 +53,15 @@ fi alias tmux="tmux -2" alias grep="grep --color=auto" +eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" + # Fix gpg signing # https://github.com/keybase/keybase-issues/issues/2798 export GPG_TTY=$(tty) # Golang -export PATH=$PATH:/usr/local/go/bin:${HOME}/go/bin +# NOTE: Go is installed with Homebrew and automatically placed on the path +export PATH=$PATH:${HOME}/go/bin export TERM="xterm-256color" export EDITOR=$(which vim) @@ -76,22 +75,7 @@ if [[ -d ${HOME}/bin ]]; then fi # fzf -# TODO: Why are these files in so many different places? -if [ -f ~/.fzf.bash ]; then - source ~/.fzf.bash -fi - -if [ -f /usr/share/bash-completion/completions/fzf ]; then - source /usr/share/bash-completion/completions/fzf -fi - -if [ -f /usr/share/doc/fzf/examples/key-bindings.bash ]; then - source /usr/share/doc/fzf/examples/key-bindings.bash -fi - -if [ -f /usr/share/doc/fzf/examples/completion.bash ]; then - source /usr/share/doc/fzf/examples/completion.bash -fi +eval "$(fzf --bash)" export FZF_DEFAULT_OPTS=" \ --color=bg+:#ccd0da,bg:#eff1f5,spinner:#dc8a78,hl:#d20f39 \ diff --git a/bin/linux/bat b/bin/linux/bat deleted file mode 120000 index b524a80..0000000 --- a/bin/linux/bat +++ /dev/null @@ -1 +0,0 @@ -bat-0.24.0 \ No newline at end of file diff --git a/bin/linux/bat-0.24.0 b/bin/linux/bat-0.24.0 deleted file mode 100755 index 899d72b..0000000 Binary files a/bin/linux/bat-0.24.0 and /dev/null differ diff --git a/bin/linux/delta b/bin/linux/delta deleted file mode 120000 index 90347ac..0000000 --- a/bin/linux/delta +++ /dev/null @@ -1 +0,0 @@ -delta-0.15.1 \ No newline at end of file diff --git a/bin/linux/delta-0.15.1 b/bin/linux/delta-0.15.1 deleted file mode 100755 index c802944..0000000 Binary files a/bin/linux/delta-0.15.1 and /dev/null differ diff --git a/bin/linux/difft b/bin/linux/difft deleted file mode 120000 index 9006d32..0000000 --- a/bin/linux/difft +++ /dev/null @@ -1 +0,0 @@ -difft-0.38.0 \ No newline at end of file diff --git a/bin/linux/difft-0.38.0 b/bin/linux/difft-0.38.0 deleted file mode 100755 index cd2020a..0000000 Binary files a/bin/linux/difft-0.38.0 and /dev/null differ diff --git a/bin/linux/dive b/bin/linux/dive deleted file mode 120000 index 8ab4004..0000000 --- a/bin/linux/dive +++ /dev/null @@ -1 +0,0 @@ -dive-0.10.0 \ No newline at end of file diff --git a/bin/linux/dive-0.10.0 b/bin/linux/dive-0.10.0 deleted file mode 100755 index 39dafbd..0000000 Binary files a/bin/linux/dive-0.10.0 and /dev/null differ diff --git a/bin/linux/eza b/bin/linux/eza deleted file mode 120000 index 9753a92..0000000 --- a/bin/linux/eza +++ /dev/null @@ -1 +0,0 @@ -eza-0.11.0 \ No newline at end of file diff --git a/bin/linux/eza-0.11.0 b/bin/linux/eza-0.11.0 deleted file mode 100755 index 7ac0837..0000000 Binary files a/bin/linux/eza-0.11.0 and /dev/null differ diff --git a/bin/linux/fd b/bin/linux/fd deleted file mode 120000 index d779b69..0000000 --- a/bin/linux/fd +++ /dev/null @@ -1 +0,0 @@ -fd-v10.1.0 \ No newline at end of file diff --git a/bin/linux/fd-v10.1.0 b/bin/linux/fd-v10.1.0 deleted file mode 100755 index bf0066e..0000000 Binary files a/bin/linux/fd-v10.1.0 and /dev/null differ diff --git a/bin/linux/gron b/bin/linux/gron deleted file mode 120000 index de91e40..0000000 --- a/bin/linux/gron +++ /dev/null @@ -1 +0,0 @@ -gron-0.7.1 \ No newline at end of file diff --git a/bin/linux/gron-0.7.1 b/bin/linux/gron-0.7.1 deleted file mode 100755 index b91b785..0000000 Binary files a/bin/linux/gron-0.7.1 and /dev/null differ diff --git a/bin/linux/jq b/bin/linux/jq deleted file mode 120000 index 583ff3e..0000000 --- a/bin/linux/jq +++ /dev/null @@ -1 +0,0 @@ -jq-1.7 \ No newline at end of file diff --git a/bin/linux/jq-1.7 b/bin/linux/jq-1.7 deleted file mode 100755 index 589c30e..0000000 Binary files a/bin/linux/jq-1.7 and /dev/null differ diff --git a/bin/linux/lazygit b/bin/linux/lazygit deleted file mode 120000 index 1f2be0e..0000000 --- a/bin/linux/lazygit +++ /dev/null @@ -1 +0,0 @@ -lazygit-0.42.0 \ No newline at end of file diff --git a/bin/linux/lazygit-0.42.0 b/bin/linux/lazygit-0.42.0 deleted file mode 100755 index 1bb6a53..0000000 Binary files a/bin/linux/lazygit-0.42.0 and /dev/null differ diff --git a/install.sh b/install.sh index e4abd3b..e17f059 100755 --- a/install.sh +++ b/install.sh @@ -77,12 +77,24 @@ function performSetup() { echo "Linking neovim config" ln -fns ${DOTFILES_DIR}/nvim ~/.config/nvim + echo "Installing homebrew" + /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" + if [[ "${OSTYPE}" == "darwin"* ]]; then - brew install rsync rga pandoc poppler tesseract tmux ledger + brew install tmux else - sudo apt install visidata ripgrep + sudo apt install build-essential visidata fi + brew install \ + gcc \ + tmux neovim \ + eza bat fzf ripgrep fd jq gron \ + git lazygit git-delta \ + crane dive devcontainer \ + go sqlite \ + stripe-cli restic + popd > /dev/null }