😜

.gitignore

@@ -3,3 +3,4 @@ doc/tags
 /tmux/tmux.symlink/plugins
 /vim/vim.symlink/.netrwhist
 nvim/plugin/packer_compiled.lua
+nvim/lazy-lock.json

brew/Brewfile.symlink

@@ -1,24 +1,20 @@
 # vim: set ft=ruby
 
-brew "carthage"
-brew "chruby"
-brew "ctags"
+brew "asdf"
 brew "curl"
 brew "fd"
 brew "dark-mode"
 brew "git"
 brew "mas"
 brew "mosh"
 brew "node"
-brew "postgresql"
+brew "postgresql@15"
 brew "python"
 brew "reattach-to-user-namespace"
 brew "ripgrep"
-brew "ruby-install"
 brew "ssh-copy-id"
 brew "tmux"
 brew "tree"
-brew "typescript"
 brew "vim"
 brew "wget"
 brew "yarn"
@@ -27,21 +23,23 @@ brew "zsh"
 brew "zsh-autosuggestions"
 brew "zsh-syntax-highlighting"
 
-tap "homebrew/services"
+brew "neovim", args: ["head"]
 
-tap "espanso/espanso"
-brew "espanso"
+tap "homebrew/services"
 
 cask_args appdir: "/Applications"
-tap "homebrew/cask"
 
-cask "1password"
 cask "acorn"
 cask "airtable"
 cask "appzapper"
+cask "battery-buddy"
+cask "bartender"
 cask "blackhole-2ch"
+cask "cleanshot"
 cask "dash"
 cask "docker"
+cask "dropshare"
+cask "espanso"
 cask "firefox"
 cask "google-chrome"
 cask "gpg-suite"
@@ -50,27 +48,31 @@ cask "hammerspoon"
 cask "handbrake"
 cask "imageoptim"
 cask "iterm2"
+cask "monitorcontrol"
 cask "ngrok"
 cask "notion"
 cask "obs"
+cask "raycast"
 cask "signal"
 cask "sketch"
 cask "slack"
-cask "soulver"
 cask "superduper"
+cask "soulver"
 cask "telegram"
 cask "transmission"
 cask "transmit"
 cask "vimr"
 cask "visual-studio-code"
 cask "vlc"
+cask "wezterm"
 
 tap "homebrew/cask-fonts"
 cask "font-courier-prime"
 cask "font-courier-prime-code"
 cask "font-fantasque-sans-mono"
 cask "font-fira-code"
-cask "font-fira-sans"
+cask "font-ia-writer-duo"
+cask "font-ia-writer-quattro"
 cask "font-inconsolata"
 cask "font-input"
 cask "font-inter"
@@ -80,28 +82,17 @@ cask "font-iosevka-curly"
 cask "font-iosevka-curly-slab"
 cask "font-iosevka-etoile"
 cask "font-iosevka-slab"
+cask "font-iosevka-nerd-font"
 cask "font-monoid"
 cask "font-mononoki"
 cask "font-sf-compact"
 cask "font-sf-mono"
 cask "font-sf-pro"
 cask "font-victor-mono"
 
-cask "qlcolorcode"
-cask "qlmarkdown"
-cask "qlstephen"
-cask "qlvideo"
-cask "quicklook-json"
-cask "quicklookase"
-cask "suspicious-package"
-cask "webpquicklook"
-
 mas "1Password for Safari", id: 1569813296
-mas "Better", id: 1121192229
-mas "Coinverter", id: 926121450
 mas "Developer", id: 640199958
 mas "Final Cut Pro", id: 424389933
-mas "GIF Brewery 3", id: 1081413713
 mas "Gifski", id: 1351639930
 mas "HEIC Converter", id: 1294126402
 mas "Hand Mirror", id: 1502839586
@@ -114,10 +105,11 @@ mas "Pixelmator Pro", id: 1289583905
 mas "Plain Text Editor", id: 1572202501
 mas "Pure Paste", id: 1611378436
 mas "Reeder", id: 1529448980
-mas "Soulver", id: 413965349
+mas "Sprinkles", id: 1500209074
 mas "TestFlight", id: 899247664
 mas "Things", id: 904280696
 mas "Today", id: 6443714928
+mas "Today", id: 6443714928
 mas "Velja", id: 1607635845
 mas "Xcode", id: 497799835
 mas "iA Writer", id: 775737590

git/gitconfig.symlink

@@ -24,6 +24,7 @@
   up = pull --rebase --autostash
   upto = "branch --set-upstream-to"
   wipe = !git add -A && git commit -qm 'WIPE SAVEPOINT' && git reset HEAD~1 --hard
+  qs = "!git add -A && git commit -qm 'QuickSave'"
 [core]
   excludesfile = ~/.gitignore
   editor = nvim
@@ -54,14 +55,14 @@
 [commit]
   gpgsign = true
 [merge]
-  tool = diffconflicts
+	tool = diffconflicts
 [mergetool]
   prompt = false
-  keepBackup = false
+	keepBackup = false
 [difftool]
   prompt = false
 [mergetool "diffconflicts"]
-  cmd = nvim -c DiffConflicts \"$MERGED\" \"$BASE\" \"$LOCAL\" \"$REMOTE\"
-  trustExitCode = true
+	cmd = nvim -c DiffConflictsWithHistory \"$MERGED\" \"$BASE\" \"$LOCAL\" \"$REMOTE\"
+	trustExitCode = true
 [init]
   defaultBranch = main