diff --git a/dotfiles/.local/share/chezmoi/.chezmoidata.yaml b/dotfiles/.local/share/chezmoi/.chezmoidata.yaml
index 4221d290..14c48d8d 100644
--- a/dotfiles/.local/share/chezmoi/.chezmoidata.yaml
+++ b/dotfiles/.local/share/chezmoi/.chezmoidata.yaml
@@ -46,6 +46,9 @@ alternatives:
     pacman: bottom
     scoop: bottom
     snap: bottom
+  bw:
+    choco: bitwarden-cli
+    snap: bw
   gdu:
     brew: gdu
     go: github.com/dundee/gdu/v5/cmd/gdu@latest
@@ -63,6 +66,17 @@ alternatives:
       - git
     brew: git-lfs
     scoop: git-lfs
+  gnu:
+    brew:
+      - coreutils
+      - findutils
+      - gawk
+      - gnu-getopt
+      - gnu-indent
+      - gnu-tar
+      - gnu-sed
+      - gnutls
+      - grep
   lazygit:
     brew: lazygit
     choco: lazygit
@@ -149,6 +163,12 @@ alternatives:
     choco: shotcut
     flatpak: org.shotcut.Shotcut
     snap: shotcut
+  tmux:
+    brew:
+      - awk
+      - gnu-sed
+      - perl
+      - tmux
   tree-sitter-cli:
     cargo: tree-sitter-cli
   volta:
diff --git a/dotfiles/.local/share/chezmoi/.chezmoiexternal.toml b/dotfiles/.local/share/chezmoi/.chezmoiexternal.toml
index f316e9ca..9c3387c6 100644
--- a/dotfiles/.local/share/chezmoi/.chezmoiexternal.toml
+++ b/dotfiles/.local/share/chezmoi/.chezmoiexternal.toml
@@ -16,6 +16,13 @@
     type = "file"
     url = "https://raw.githubusercontent.com/trapd00r/LS_COLORS/master/lscolors.sh"
     refreshPeriod = "{{ $refreshPeriod }}"
+[".config/tmux/tmux.conf"]
+    type = "file"
+    url = "https://raw.githubusercontent.com/gpakosz/.tmux/master/.tmux.conf"
+    refreshPeriod = "{{ $refreshPeriod }}"
+[".config/tmux/tmux.conf.local"]
+    type = "file"
+    url = "https://raw.githubusercontent.com/gpakosz/.tmux/master/.tmux.conf.local"
 [".local/antigen.zsh"]
     type = "file"
     url = "https://raw.githubusercontent.com/zsh-users/antigen/develop/bin/antigen.zsh"
diff --git a/dotfiles/.local/share/chezmoi/dot_editorconfig b/dotfiles/.local/share/chezmoi/dot_editorconfig
new file mode 100644
index 00000000..01a20f16
--- /dev/null
+++ b/dotfiles/.local/share/chezmoi/dot_editorconfig
@@ -0,0 +1,15 @@
+# https://editorconfig.org
+
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+insert_final_newline = false
+trim_trailing_whitespace = false
diff --git a/dotfiles/.local/share/chezmoi/dot_gitconfig.tmpl b/dotfiles/.local/share/chezmoi/dot_gitconfig.tmpl
deleted file mode 100644
index 72bfd83e..00000000
--- a/dotfiles/.local/share/chezmoi/dot_gitconfig.tmpl
+++ /dev/null
@@ -1,2 +0,0 @@
-[user]
-    email = {{ .email | quote }}
diff --git a/dotfiles/.local/share/chezmoi/private_dot_config/git/config.tmpl b/dotfiles/.local/share/chezmoi/private_dot_config/git/config.tmpl
index eff45889..03175330 100644
--- a/dotfiles/.local/share/chezmoi/private_dot_config/git/config.tmpl
+++ b/dotfiles/.local/share/chezmoi/private_dot_config/git/config.tmpl
@@ -112,7 +112,7 @@
   autocorrect = 20
 [init]
   defaultBranch = master
-  templatedir = /Users/bzalewski/.local/git-templates
+  templatedir = ~/.config/git/template
 [interactive]
   diffFilter = delta --color-only --features=interactive
 [merge]
diff --git a/dotfiles/.local/share/chezmoi/private_dot_config/shell/aliases b/dotfiles/.local/share/chezmoi/private_dot_config/shell/aliases.tmpl
similarity index 94%
rename from dotfiles/.local/share/chezmoi/private_dot_config/shell/aliases
rename to dotfiles/.local/share/chezmoi/private_dot_config/shell/aliases.tmpl
index 1d6b6e7e..91219f78 100644
--- a/dotfiles/.local/share/chezmoi/private_dot_config/shell/aliases
+++ b/dotfiles/.local/share/chezmoi/private_dot_config/shell/aliases.tmpl
@@ -1,3 +1,12 @@
+{{- if eq .chezmoi.os "darwin" }}
+### macOS Polyfills
+if command -v brew > /dev/null; then
+  PATH="$(brew --prefix)/opt/coreutils/libexec/gnubin:$PATH"
+  PATH="$(brew --prefix)/opt/gnu-indent/libexec/gnubin:$PATH"
+  PATH="$(brew --prefix)/opt/gnu-sed/libexec/gnubin:$PATH"
+fi
+
+{{- end }}
 ### bat
 if command -v bat > /dev/null; then
   export MANPAGER="sh -c 'col -bx | bat -l man -p'"
diff --git a/dotfiles/.local/share/chezmoi/private_dot_config/shell/exports b/dotfiles/.local/share/chezmoi/private_dot_config/shell/exports
index 6b53eef7..53b586e8 100644
--- a/dotfiles/.local/share/chezmoi/private_dot_config/shell/exports
+++ b/dotfiles/.local/share/chezmoi/private_dot_config/shell/exports
@@ -207,9 +207,6 @@ export PGSERVICEFILE="$XDG_CONFIG_HOME/pg/pg_service.conf"
 ### Readline
 export INPUTRC="$XDG_CONFIG_HOME/readline/inputrc"
 
-### Rear
-# https://github.com/rear/rear/blob/master/doc/user-guide/03-configuration.adoc
-
 ### Redis
 export REDISCLI_HISTFILE="$XDG_DATA_HOME/redis/rediscli_history"
 export REDISCLI_RCFILE="$XDG_CONFIG_HOME/redis/redisclirc"