Update settings and some clean up

.gitconfig

@@ -1,9 +1,50 @@
 [user]
-	name = First Last
-	email = email@email.com
-[github]
-	user = username
+  name = First Last
+  email = email@email.com
 [core]
-	editor = editor
+  editor = editor
 [credential]
-	helper = osxkeychain
+  helper = osxkeychain
+[color]
+  ui = true
+  diff = auto
+  status = auto
+  branch = auto
+  interactive = auto
+  pager = true
+[color "branch"]
+  current = green reverse
+[color "diff"]
+  meta = yellow
+[color "status"]
+  untracked = cyan
+[pager]
+  branch = false
+[filter "lfs"]
+  clean = git-lfs clean -- %f
+  smudge = git-lfs smudge -- %f
+  process = git-lfs filter-process
+  required = true
+[alias]
+  tree = log --graph --pretty=oneline
+  lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
+  l = log --pretty=colored
+  s = status
+  d = diff
+  aa = add -A
+  co = checkout
+  cob = checkout -b
+  del = branch -d
+  delete = branch -D
+  reb = !git fetch && git rebase -i origin/main
+  ren =  "!f() { git branch -m ${2} ${1}; }; f"
+  up = !git fetch origin && git pull --rebase --prune
+  cm = !git add -A && git commit
+  save = !git add -A && git commit -m "SAVEPOINT"
+  wip = !git add -u && git commit -m "WIP"
+  undo = reset HEAD~1 --mixed
+  amend = commit -a --amend --reuse-message=HEAD
+  wipe = !git add -A && git commit -qm 'WIPE SAVEPOINT' && git reset HEAD~1 --hard
+  bclean = "!f() { git branch --merged ${1-master} | grep -v " ${1-master}$" | xargs -r git branch -d; }; f"
+  bdone = "!f() { git checkout ${1-master} && git up && git bclean ${1-master}; }; f"
+  contributors = "shortlog --summary --numbered"

.gitignore

@@ -1,2 +1,3 @@
 *.DS_Store
 .vscode/
+Brewfile.lock.json

.zshrc

@@ -0,0 +1,108 @@
+# If you come from bash you might have to change your $PATH.
+# export PATH=$HOME/bin:/usr/local/bin:$PATH
+
+# Path to your oh-my-zsh installation.
+export ZSH=$HOME/.oh-my-zsh
+
+# Set name of the theme to load --- if set to "random", it will
+# load a random theme each time oh-my-zsh is loaded, in which case,
+# to know which specific one was loaded, run: echo $RANDOM_THEME
+# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes
+ZSH_THEME="tranquility"
+
+# Set list of themes to pick from when loading at random
+# Setting this variable when ZSH_THEME=random will cause zsh to load
+# a theme from this variable instead of looking in $ZSH/themes/
+# If set to an empty array, this variable will have no effect.
+# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" )
+
+# Uncomment the following line to use case-sensitive completion.
+# CASE_SENSITIVE="true"
+
+# Uncomment the following line to use hyphen-insensitive completion.
+# Case-sensitive completion must be off. _ and - will be interchangeable.
+# HYPHEN_INSENSITIVE="true"
+
+# Uncomment the following line to disable bi-weekly auto-update checks.
+# DISABLE_AUTO_UPDATE="true"
+
+# Uncomment the following line to automatically update without prompting.
+# DISABLE_UPDATE_PROMPT="true"
+
+# Uncomment the following line to change how often to auto-update (in days).
+# export UPDATE_ZSH_DAYS=13
+
+# Uncomment the following line if pasting URLs and other text is messed up.
+# DISABLE_MAGIC_FUNCTIONS="true"
+
+# Uncomment the following line to disable colors in ls.
+# DISABLE_LS_COLORS="true"
+
+# Uncomment the following line to disable auto-setting terminal title.
+# DISABLE_AUTO_TITLE="true"
+
+# Uncomment the following line to enable command auto-correction.
+# ENABLE_CORRECTION="true"
+
+# Uncomment the following line to display red dots whilst waiting for completion.
+# Caution: this setting can cause issues with multiline prompts (zsh 5.7.1 and newer seem to work)
+# See https://github.com/ohmyzsh/ohmyzsh/issues/5765
+# COMPLETION_WAITING_DOTS="true"
+
+# Uncomment the following line if you want to disable marking untracked files
+# under VCS as dirty. This makes repository status check for large repositories
+# much, much faster.
+# DISABLE_UNTRACKED_FILES_DIRTY="true"
+
+# Uncomment the following line if you want to change the command execution time
+# stamp shown in the history command output.
+# You can set one of the optional three formats:
+# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
+# or set a custom format using the strftime function format specifications,
+# see 'man strftime' for details.
+# HIST_STAMPS="mm/dd/yyyy"
+
+# Would you like to use another custom folder than $ZSH/custom?
+ZSH_CUSTOM=custom_path
+
+# Which plugins would you like to load?
+# Standard plugins can be found in $ZSH/plugins/
+# Custom plugins may be added to $ZSH_CUSTOM/plugins/
+# Example format: plugins=(rails git textmate ruby lighthouse)
+# Add wisely, as too many plugins slow down shell startup.
+plugins=(
+  git
+  rails
+)
+
+source $ZSH/oh-my-zsh.sh
+
+# User configuration
+
+if which rbenv > /dev/null; then eval "$(rbenv init -)"; fi
+if which asdf > /dev/null; then echo -e "\n. $(brew --prefix asdf)/asdf.sh" >> ${ZDOTDIR:-~}/.zshrc; fi
+if which direnv > /dev/null; then eval "$(direnv hook zsh)"; fi
+
+# export MANPATH="/usr/local/man:$MANPATH"
+
+# You may need to manually set your language environment
+# export LANG=en_US.UTF-8
+
+# Preferred editor for local and remote sessions
+# if [[ -n $SSH_CONNECTION ]]; then
+#   export EDITOR='vim'
+# else
+#   export EDITOR='mvim'
+# fi
+
+# Compilation flags
+# export ARCHFLAGS="-arch x86_64"
+
+# Set personal aliases, overriding those provided by oh-my-zsh libs,
+# plugins, and themes. Aliases can be placed here, though oh-my-zsh
+# users are encouraged to define aliases within the ZSH_CUSTOM folder.
+# For a full list of active aliases, run `alias`.
+#
+# Example aliases
+# alias zshconfig="mate ~/.zshrc"
+# alias ohmyzsh="mate ~/.oh-my-zsh"

Brewfile

@@ -1,24 +1,34 @@
-tap 'caskroom/cask'
+brew "mas"
 
-brew 'git'
-brew 'mas'
+cask "1password"
+cask "alfred"
+cask "android-file-transfer"
+cask "appcleaner"
+cask "calibre"
+cask "chatgpt"
+cask "cursor"
+cask "firefox"
+cask "github"
+cask "google-chrome"
+cask "imageoptim"
+cask "insomnia"
+cask "iterm2"
+cask "licecap"
+cask "logitech-options"
+cask "postico"
+cask "rectangle"
+cask "sequel-pro"
+cask "slack"
+cask "trainerroad"
+cask "transmission"
+cask "visual-studio-code"
+cask "vlc"
+cask "whatsapp"
+cask "xbar"
 
-cask 'appcleaner'
-cask 'filezilla'
-cask 'firefox'
-cask 'flux'
-cask 'google-chrome'
-cask 'keepingyouawake'
-cask 'keka'
-cask 'mamp'
-cask 'opera'
-cask 'sequel-pro'
-cask 'skype'
-cask 'spectacle'
-cask 'transmission'
-cask 'visual-studio-code'
-cask 'vlc'
-
-mas "iMovie", id: 408981434
-mas "Numbers", id: 409203825
-mas "Pages", id: 409201541
+mas "Bumpr", id: 1166066070
+mas "GIPHY", id: 668208984
+mas "Things", id: 904280696
+mas "Wipr 2", id: 1662217862
+mas "Vinegar", id: 1591303229
+mas "Xcode", id: 497799835