3135c561a42eca2531109a9209077f841b4d2824

  1diff --git a/.chezmoiignore b/.chezmoiignore
  2index 4da1f04209ed2ed4beceed84e45c6d87a596a5a7..74dc3c15c9653c4e398da42f69a9b6bc6db390fc 100644
  3--- a/.chezmoiignore
  4+++ b/.chezmoiignore
  5@@ -14,6 +14,7 @@ config_template.yaml
  6 .config/mako
  7 .config/rofi
  8 .config/uwsm
  9+.config/user-dirs.dirs
 10 .config/waybar
 11 .icons
 12 {{- end }}
 13diff --git a/config_template.yaml b/config_template.yaml
 14index 6394e73c848b47d62364fd00c0973c56485c89c8..7ee431dbd45119e9ac574f0a7b05cec7cae65ccf 100644
 15--- a/config_template.yaml
 16+++ b/config_template.yaml
 17@@ -1,5 +1,7 @@
 18 ---
 19 data:
 20+  gui: true
 21+  modern_cli: true
 22   hyprland:
 23     monitors:
 24       identifier: "resolution@refresh_rate, auto, 1, vrr, 0"
 25diff --git a/dot_aliases b/dot_aliases.tmpl
 26rename from dot_aliases
 27rename to dot_aliases.tmpl
 28index a4f5ccf1d29400c33538d1bdc06ad82e63e00ef3..87b046560b2771472d233227ae966f3bc7250430 100644
 29--- a/dot_aliases
 30+++ b/dot_aliases.tmpl
 31@@ -1,5 +1,28 @@
 32 # vim: ft=zsh
 33 
 34+{{ if (index . "modern_cli" | default false) -}}
 35+# Modern CLI tools
 36+alias ls='eza --hyperlink --group-directories-first --time-style=long-iso'
 37+alias df=dysk
 38+alias -g du=dust
 39+alias -g duf=dust
 40+alias -g dufa=dust
 41+alias ps=procs
 42+alias psql=pgcli
 43+alias drill='dog'
 44+alias rmdir='trash -d'
 45+alias rmr='trash -rIf'
 46+{{ else }}
 47+# Traditional CLI tools
 48+alias ls='ls --group-directories-first --color=auto --time-style=long-iso'
 49+alias df='df -h'
 50+alias -g du='du -sh'
 51+alias -g duf='du -sh * | sort -h'
 52+alias -g dufa='du -sh * .* | sort -h'
 53+alias rmdir='trash'
 54+alias rmr='trash'
 55+{{- end }}
 56+
 57 # General
 58 alias '..'='cd ..'
 59 alias '...'='cd ../..'
 60@@ -22,27 +45,20 @@ alias cdl='cd ~/ && cl'
 61 alias cl=clear
 62 alias cz=chezmoi
 63 alias db='duplicity-backup -c ~/.config/duplicity-backup.conf'
 64-alias df=dysk
 65 alias diff='diff -y --suppress-common-lines'
 66 alias dockre=docker
 67-alias drill='dog'
 68 alias fdisk='sudo fdisk'
 69 alias grep='grep --color=auto'
 70 alias i3exit='i3-msg exit'
 71 alias kak='kubectl apply -k'
 72 alias kdk='kubectl diff -k'
 73-alias ls='eza --hyperlink --group-directories-first --time-style=long-iso'
 74 alias mkdir='mkdir -p'
 75 alias mpv='mpv --ytdl-format="bestvideo[height<=?1440]+bestaudio/best"'
 76 alias myip='curl -s https://icanhazip.com'
 77-alias ps=procs
 78-alias psql=pgcli
 79 alias qrscan='grimshot save area - 2>/dev/null | zbarimg -1 -q - | sed "s/QR-Code://" | wl-copy'
 80 alias ran=ranger
 81 alias rcp='rsync -aPv'
 82 alias rm='trash'
 83-alias rmdir='trash -d'
 84-alias rmr='trash -rIf'
 85 alias -g rmrf='\rm -rf'
 86 alias ssh='TERM=xterm-256color ssh'
 87 alias tailscale='sudo tailscale'
 88@@ -84,12 +100,9 @@ alias tfp='terraform plan'
 89 alias tfs='terraform state'
 90 
 91 # Oh my zsh alias override
 92-alias -g du=dust
 93-alias -g duf=dust
 94-alias -g dufa=dust
 95-alias l='ls -l -F auto'
 96+alias l='ls --classify=auto -l'
 97 alias la='ls -a'
 98-alias ll='ls -la'
 99+alias ll='ls -lah'
100 unalias -m 'fd'
101 unalias -m 'ff'
102 unalias -m '_'