dotfiles: update

Brewfile

@@ -10,16 +10,16 @@ brew "curl"
 brew "diff-so-fancy"
 brew "fd"
 brew "fzf"
+brew "zoxide"
+brew "exa"
 brew "git"
 brew "htop"
-brew "mysql", restart_service: true
 brew "postgresql", restart_service: true
 brew "redis", restart_service: true
 brew "neovim"
 brew "nmap"
 brew "node"
 brew "rbenv"
-brew "reattach-to-user-namespace"
 brew "ripgrep"
 brew "speedtest-cli"
 brew "stow"
@@ -32,12 +32,8 @@ brew "urlview"
 brew "wget"
 
 cask "alfred"
-cask "dash"
 cask "discord"
-cask "iterm2"
 cask "karabiner-elements"
-cask "macdown"
-cask "macvim"
 cask "qlcolorcode"
 cask "qlimagesize"
 cask "qlmarkdown"
@@ -45,10 +41,7 @@ cask "qlstephen"
 cask "qlvideo"
 cask "quicklook-json"
 cask "quicklookase"
-cask "sequel-pro"
 cask "steam"
 cask "transmission"
-cask "virtualbox"
 cask "vlc"
 cask "webpquicklook"
-cask "xquartz"

alacritty/.config/alacritty/alacritty.yml

@@ -12,14 +12,14 @@ draw_bold_text_with_bright_colors: true
 font:
   normal:
     family: Fira Code
-    style: Retina
+    style: Medium
   bold:
     family: Fira Code
     style: Bold
   italic:
     family: Fira Code
     style: Light
-  size: 22.0
+  size: 24.0
   offset:
     x: 0
     y: 0

bash/.bash_profile

@@ -5,9 +5,14 @@ fi
 eval "$(rbenv init - --no-rehash)"
 (rbenv rehash &) 2> /dev/null
 
+eval "$(zoxide init bash)"
+
 # eval "$(docker-machine env default)"
 
 # export NVM_DIR="$HOME/.nvm"
 # [ -s "/usr/local/opt/nvm/nvm.sh" ] && . "/usr/local/opt/nvm/nvm.sh"
 export PATH="/usr/local/opt/icu4c/bin:$PATH"
 export PATH="/usr/local/opt/icu4c/sbin:$PATH"
+export PATH="/opt/homebrew/opt/avr-gcc@8/bin:$PATH"
+export PATH="/opt/homebrew/opt/arm-gcc-bin@8/bin:$PATH"
+. "$HOME/.cargo/env"

bash/.bashrc

@@ -1,6 +1,5 @@
-[ -f ~/iCloud/secrets.sh ]           && . ~/iCloud/secrets.sh
+[ -f ~/ownCloud/secrets.sh ]         && . ~/ownCloud/secrets.sh
 [ -f /etc/bashrc ]                   && . /etc/bashrc
-[ -f /usr/local/etc/profile.d/z.sh ] && . /usr/local/etc/profile.d/z.sh
 [ -f /etc/bash_completion ]          && . /etc/bash_completion
 [ -f ~/.fzf.bash ]                   && . ~/.fzf.bash
 
@@ -32,35 +31,11 @@ export LC_ALL=en_US.UTF-8
 
 # fzf
 export FZF_DEFAULT_COMMAND='fd --type f --hidden --follow --exclude .git'
-export FZF_DEFAULT_OPTS='--layout=reverse --inline-info'
 export FZF_CTRL_R_OPTS='--no-info'
-
-_gen_fzf_default_opts() {
-  local color00='#2E3440'
-  local color01='#3B4252'
-  local color02='#434C5E'
-  local color03='#4C566A'
-  local color04='#D8DEE9'
-  local color05='#E5E9F0'
-  local color06='#ECEFF4'
-  local color07='#8FBCBB'
-  local color08='#BF616A'
-  local color09='#D08770'
-  local color0A='#EBCB8B'
-  local color0B='#A3BE8C'
-  local color0C='#88C0D0'
-  local color0D='#81A1C1'
-  local color0E='#B48EAD'
-  local color0F='#5E81AC'
-
-export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS"\
-" --color=bg+:$color01,bg:$color00,spinner:$color0C,hl:$color0D"\
-" --color=fg:$color04,header:$color0D,info:$color0A,pointer:$color0C"\
-" --color=marker:$color0C,fg+:$color06,prompt:$color0A,hl+:$color0D"\
-" --color=gutter:$color00"
-}
-
-_gen_fzf_default_opts
+export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS
+  --height 100% --layout=reverse --border --cycle --info=inline
+  --bind=ctrl-d:preview-page-down
+  --bind=ctrl-u:preview-page-up"
 
 alias ~='cd ~'
 alias l='exa'
@@ -110,21 +85,16 @@ alias rdm='bin/rails db:migrate'
 alias rdr='bin/rails db:rollback'
 alias rds='bin/rails db:seed'
 
+alias d='docker'
 alias k='kubectl'
+alias dc='docker-compose'
 
-alias br='bin/rails'
 alias rc='bin/rails c'
 alias rs='bin/rails s -p3001'
 
-alias mux='tmuxinator start'
-
 alias ibrew='arch -x86_64 /usr/local/bin/brew'
 alias mbrew='arch -arm64e /opt/homebrew/bin/brew'
 
-yta() {
-  streamlink $1 audio_mp4
-}
-
 fzf_kill() {
     local pids=$(
       ps -f -u $USER | sed 1d | fzf --multi | tr -s [:blank:] | cut -d' ' -f3
@@ -134,12 +104,6 @@ fzf_kill() {
     fi
 }
 
-unalias z 2> /dev/null
-z() {
-  [ $# -gt 0 ] && _z "$*" && return
-  cd "$(_z -l 2>&1 | fzf --height 40% --nth 2.. --reverse --inline-info +s --tac --query "${*##-* }" | sed 's/^[0-9,.]* *//')"
-}
-
 alias fkill='fzf_kill'
 
 # Homebrew stuff

htop/.config/htop/htoprc

@@ -1,37 +1,24 @@
-# Beware! This file is rewritten by htop when settings are changed in the interface.
-# The parser is also very primitive, and not human-friendly.
-fields=0 48 39 2 46 47 1
+fields=0 48 17 18 38 39 40 2 46 47 49 1
 sort_key=46
 sort_direction=1
-tree_sort_key=0
-tree_sort_direction=1
+hide_threads=0
 hide_kernel_threads=1
 hide_userland_threads=1
-shadow_other_users=1
-show_thread_names=0
-show_program_path=0
-highlight_base_name=1
+shadow_other_users=0
+show_thread_names=1
+show_program_path=1
+highlight_base_name=0
 highlight_megabytes=1
 highlight_threads=1
-highlight_changes=1
-highlight_changes_delay_secs=5
-find_comm_in_cmdline=1
-strip_exe_from_cmdline=1
-show_merged_command=0
-tree_view=0
-tree_view_always_by_pid=0
+tree_view=1
 header_margin=1
 detailed_cpu_time=0
-cpu_count_from_one=1
-show_cpu_usage=1
-show_cpu_frequency=0
-update_process_names=0
-account_guest_in_cpu_meter=0
-color_scheme=5
-enable_mouse=1
+cpu_count_from_zero=1
+update_process_names=1
+account_guest_in_cpu_meter=1
+color_scheme=0
 delay=15
-left_meters=Memory Swap Blank CPU AllCPUs2
+left_meters=AllCPUs2 CPU Blank Memory Swap
 left_meter_modes=1 1 2 1 1
-right_meters=Hostname Clock Tasks LoadAverage Uptime
-right_meter_modes=2 2 2 2 2
-hide_function_bar=0
+right_meters=Hostname Blank Tasks LoadAverage Blank Uptime
+right_meter_modes=2 2 2 2 2 2