Alias podman to docker

Do I actually just want this everywhere?

.gitignore

@@ -1,6 +1,6 @@
 *.swp
 
-alacritty/.config/alacritty/alacritty.yml
+alacritty/.config/alacritty/theme.toml
 
 bin/bin
 

.mise.toml

@@ -0,0 +1,4 @@
+[env]
+RIPGREP_CONFIG_PATH = "./.ripgreprc"
+
+# private configuration to go in .mise.local.toml

.ripgreprc

@@ -0,0 +1 @@
+--hidden

alacritty/.config/alacritty/alacritty-base.yml

@@ -1,6 +0,0 @@
-window:
-  opacity: 0.9
-font:
-  size: 14
-key_bindings:
-  - { key: Return, mods: Command, action: ToggleFullscreen }

alacritty/.config/alacritty/alacritty.toml

@@ -0,0 +1,14 @@
+import = [
+  "~/.config/alacritty/theme.toml",
+]
+
+[window]
+opacity = 0.9
+
+[font]
+size = 14
+
+[[keyboard.bindings]]
+action = "ToggleFullscreen"
+key = "Return"
+mods = "Command"

alacritty/.config/alacritty/themes/dark.toml

@@ -0,0 +1,26 @@
+# Colors (Gruvbox dark)
+[colors.primary]
+# hard contrast = background = '0x1d2021'
+background = "0x282828"
+# soft contrast = background = '0x32302f'
+foreground = "0xebdbb2"
+
+[colors.normal]
+black = '0x282828'
+red = '0xcc241d'
+green = '0x98971a'
+yellow = '0xd79921'
+blue = '0x458588'
+magenta = '0xb16286'
+cyan = '0x689d6a'
+white = '0xa89984'
+
+[colors.bright]
+black = '0x928374'
+red = '0xfb4934'
+green = '0xb8bb26'
+yellow = '0xfabd2f'
+blue = '0x83a598'
+magenta = '0xd3869b'
+cyan = '0x8ec07c'
+white = '0xebdbb2'

alacritty/.config/alacritty/themes/dark.yml

@@ -1,30 +0,0 @@
-# Colors (Gruvbox dark)
-colors:
-  # Default colors
-  primary:
-    # hard contrast: background = '0x1d2021'
-    background: '0x282828'
-    # soft contrast: background = '0x32302f'
-    foreground: '0xebdbb2'
-
-  # Normal colors
-  normal:
-    black:   '0x282828'
-    red:     '0xcc241d'
-    green:   '0x98971a'
-    yellow:  '0xd79921'
-    blue:    '0x458588'
-    magenta: '0xb16286'
-    cyan:    '0x689d6a'
-    white:   '0xa89984'
-
-  # Bright colors
-  bright:
-    black:   '0x928374'
-    red:     '0xfb4934'
-    green:   '0xb8bb26'
-    yellow:  '0xfabd2f'
-    blue:    '0x83a598'
-    magenta: '0xd3869b'
-    cyan:    '0x8ec07c'
-    white:   '0xebdbb2'

alacritty/.config/alacritty/themes/light.toml

@@ -0,0 +1,24 @@
+# Colors (Gruvbox light)
+[colors.primary]
+background = "0xfbf1c7"
+foreground = "0x3c3836"
+
+[colors.normal]
+black = "0xfbf1c7"
+blue = "0x458588"
+cyan = "0x689d6a"
+green = "0x98971a"
+magenta = "0xb16286"
+red = "0xcc241d"
+white = "0x7c6f64"
+yellow = "0xd79921"
+
+[colors.bright]
+black = "0x928374"
+blue = "0x076678"
+cyan = "0x427b58"
+green = "0x79740e"
+magenta = "0x8f3f71"
+red = "0x9d0006"
+white = "0x3c3836"
+yellow = "0xb57614"

alacritty/.config/alacritty/themes/light.yml

@@ -1,30 +0,0 @@
-# Colors (Gruvbox light)
-colors:
-  # Default colors
-  primary:
-    # hard contrast: background = '0xf9f5d7'
-    background: '0xfbf1c7'
-    # soft contrast: background = '0xf2e5bc'
-    foreground: '0x3c3836'
-
-  # Normal colors
-  normal:
-    black:   '0xfbf1c7'
-    red:     '0xcc241d'
-    green:   '0x98971a'
-    yellow:  '0xd79921'
-    blue:    '0x458588'
-    magenta: '0xb16286'
-    cyan:    '0x689d6a'
-    white:   '0x7c6f64'
-
-  # Bright colors
-  bright:
-    black:   '0x928374'
-    red:     '0x9d0006'
-    green:   '0x79740e'
-    yellow:  '0xb57614'
-    blue:    '0x076678'
-    magenta: '0x8f3f71'
-    cyan:    '0x427b58'
-    white:   '0x3c3836'

bin/bin/toggle-color-mode

@@ -13,11 +13,10 @@ else
   new_color=dark
 fi
 
-alacritty_header=" # Dynamically generated. Edit $HOME/.config/alacritty/alacritty-base.yml"
-
 alacritty=$HOME/.config/alacritty/
-echo $alacritty_header > $alacritty/alacritty.yml
+ln -sf $alacritty/themes/$new_color.toml $alacritty/theme.toml
-cat $alacritty/alacritty-base.yml $alacritty/themes/$new_color.yml >> $alacritty/alacritty.yml
+# Alacritty does not notice update of imported symlink
+touch $alacritty/alacritty.toml
 
 echo $new_color > $color_file
 

git/.gitconfig

@@ -23,7 +23,7 @@
   program = gpg
 
 [merge]
-  tool = vimdiff
+  tool = nvim -d
 
 [pull]
   rebase = false

install.sh

@@ -25,7 +25,7 @@ install_homebrew() {
 install_shared_brew_packages() {
   echo -n Checking shared brew packages...
   missing_packages=$(
-    comm -23  <(cat packages-shared-brew.txt) <(brew list | sort) \
+    comm -23  <(cat packages-shared-brew.txt) <(brew list --full-name | sort) \
       | tr "\n" " "
   )
 
@@ -153,7 +153,7 @@ install_linux_packagges() {
 install_darwin_brew_packages() {
   echo -n Checking Darwin brew packages...
   missing_packages=$(
-    comm -23  <(cat packages-darwin-brew.txt) <(brew list | sort) \
+    comm -23  <(cat packages-darwin-brew.txt) <(brew list --full-name | sort) \
       | tr "\n" " "
   )
 
@@ -177,7 +177,7 @@ install_darwin_brew_cask_packages() {
   fi
 
   missing_packages=$(
-    comm -23  <(cat $package_files | sort) <(brew list | sort) \
+    comm -23  <(cat $package_files | sort) <(brew list --full-name | sort) \
       | tr "\n" " "
   )
 

packages-darwin-brew-cask-personal.txt

@@ -1,5 +1,5 @@
 arduino-ide
-battle-net
+freecad
 minecraft
 mqtt-explorer
 openscad

packages-darwin-brew-cask.txt

@@ -5,6 +5,7 @@ discord
 firefox
 google-chrome
 obsidian
+podman-desktop
 rectangle
 slack
 zoom

packages-darwin-brew.txt

@@ -1,4 +1,3 @@
 coreutils
 gnu-sed
-orbstack
 session-manager-plugin

packages-shared-brew.txt

@@ -9,20 +9,23 @@ gh
 git
 gmp
 gnupg
+goreleaser/tap/goreleaser
 hurl
+iperf3
 jq
 libpq
 libyaml
 llvm
+mise
 neovim
 node-build
+openapi-generator
 openssl@1.1
 openssl@3
 qmk/qmk/qmk
 rar
 readline
 ripgrep
-mise
 ruby-build
 shared-mime-info
 stow

zsh/.config/zsh/aliases

@@ -15,6 +15,7 @@ alias c="clear"
 alias cs="toggle-color-mode"
 alias cdr="git-root"
 alias dc="docker-compose-call"
+alias docker="podman"
 alias g="g" # overwrite g alias
 alias ga="git add"
 alias gaa="git add --all"