feat: simplify shell config

.bashrc

@@ -1 +0,0 @@
-unset HISTFILE

.config/autorandr/delta-tls/config

@@ -1,33 +0,0 @@
-output DisplayPort-1-0
-off
-output HDMI-A-1-0
-off
-output DisplayPort-1-2
-off
-output eDP
-crtc 0
-gamma 1.0:0.833:0.769
-mode 1920x1080
-pos 0x0
-primary
-rate 240.00
-x-prop-max_bpc 16
-x-prop-non_desktop 0
-x-prop-scaling_mode None
-x-prop-tearfree auto
-x-prop-underscan off
-x-prop-underscan_hborder 0
-x-prop-underscan_vborder 0
-output DisplayPort-1-1
-crtc 4
-gamma 1.0:0.833:0.769
-mode 1920x1080
-pos 1920x0
-rate 60.00
-x-prop-max_bpc 8
-x-prop-non_desktop 0
-x-prop-scaling_mode None
-x-prop-tearfree auto
-x-prop-underscan off
-x-prop-underscan_hborder 0
-x-prop-underscan_vborder 0

.config/autorandr/delta-tls/setup

@@ -1,2 +0,0 @@
-DisplayPort-1-1 00ffffffffffff004c2d200d34415743191e010380341d782a9315a655519c27115054bfef80714f81c0810081809500a9c0b3000101023a801871382d40582c450009252100001e000000fd00324b1e5111000a202020202020000000fc00533234463335300a2020202020000000ff0048345a4e3630323031370a20200114020311814690041f13120365030c001000011d00bc52d01e20b828554009252100001e8c0ad090204031200c4055000925210000188c0ad08a20e02d10103e9600092521000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000081
-eDP 00ffffffffffff004d105d1500000000171f0104a522137807de50a3544c99260f505400000001010101010101010101010101010101edec80a0703887403020350058c2100000183c3b80a0703887403020350058c210000018000000100000000000000000000000000000000000fc004c513135364d314a5730330a2000c3

.config/autorandr/ip-agn/config

@@ -2,6 +2,8 @@ output HDMI-A-0
 mode 1920x1080
 pos 0x0
 primary
+rate 60.00
 output eDP
 mode 1920x1080
 pos 1920x0
+rate 60.00

.config/autorandr/laptop/config

@@ -1,4 +0,0 @@
-output eDP
-mode 1920x1080
-pos 0x0
-primary

.config/autorandr/laptop/setup

@@ -1 +0,0 @@
-eDP 00ffffffffffff0009e5d50800000000231d0104a5221378030b95935c59932a20505400000001010101010101010101010101010101043a803671381e403020360058c21000001a000000000000000000000000000000000000000000fe00424f452043510a202020202020000000fe004e5431353646484d2d4e34330a000e

.config/autorandr/settings.ini

@@ -0,0 +1,2 @@
+[config]
+skip-options=crtc,gamma,x-prop-colorspace,x-prop-max_bpc,x-prop-non_desktop,x-prop-scaling_mode,x-prop-tearfree,x-prop-underscan,x-prop-underscan_hborder,x-prop-underscan_vborder,

.config/nvim/init.lua

@@ -24,6 +24,7 @@ vim.o.ignorecase       = true
 vim.o.smartcase        = true
 
 vim.o.guicursor        = ""
+vim.o.mousemodel       = extend
 
 vim.o.path             = vim.o.path .. ",**"
 vim.o.suffixes         = vim.o.suffixes .. ",.pyc,.hi"
@@ -44,8 +45,6 @@ vim.o.lazyredraw       = true
 
 vim.o.complete         = vim.o.complete .. ",i"
 
-vim.o.mousemodel       = extend
-
 --------------------
 ----- packages -----
 --------------------

.config/nvim/lua/pack-treesitter.lua

@@ -1,3 +1,4 @@
+vim.cmd("packadd treesitter")
 require"nvim-treesitter.configs".setup {
     auto_install = true,
     highlight = {enable = true},

.config/nvim/pack/plugins/opt/treesitter

@@ -0,0 +1 @@
+Subproject commit 075a64addc33390028ea124a1046a43497f05cd1

.config/suckless/dwm-6.4/dwm.c

@@ -223,6 +223,7 @@ static void updatetitle(Client *c);
 static void updatewindowtype(Client *c);
 static void updatewmhints(Client *c);
 static void view(const Arg *arg);
+static void warp(const Monitor *m);
 static Client *wintoclient(Window w);
 static Monitor *wintomon(Window w);
 static int xerror(Display *dpy, XErrorEvent *ee);
@@ -820,7 +821,7 @@ focusmon(const Arg *arg)
 		return;
 	unfocus(selmon->sel, 0);
 	selmon = m;
-	focus(NULL);
+	warp(m);
 }
 
 void
@@ -1989,6 +1990,13 @@ view(const Arg *arg)
 	focus(getclientptr());
 }
 
+void
+warp(const Monitor *m)
+{
+    XWarpPointer(dpy, None, root, 0, 0, 0, 0, selmon->wx + selmon->ww / 2, selmon->wy + selmon->wh / 2);
+    focus(NULL);
+}
+
 Client *
 wintoclient(Window w)
 {

.config/zsh/.p10k.zsh

@@ -1,7 +1,7 @@
-# Generated by Powerlevel10k configuration wizard on 2023-11-07 at 21:34 CET.
+# Generated by Powerlevel10k configuration wizard on 2023-11-07 at 23:48 CET.
-# Based on romkatv/powerlevel10k/config/p10k-lean.zsh, checksum 03275.
+# Based on romkatv/powerlevel10k/config/p10k-lean.zsh, checksum 61526.
-# Wizard options: nerdfont-complete + powerline, small icons, unicode, lean, 1 line,
+# Wizard options: awesome-fontconfig + powerline + python, large icons, unicode, lean,
-# compact, few icons, concise, instant_prompt=quiet.
+# 1 line, compact, few icons, concise, instant_prompt=quiet.
 # Type `p10k configure` to generate another config.
 #
 # Config for Powerlevel10k with lean prompt style. Type `p10k configure` to generate
@@ -33,7 +33,9 @@
     # os_icon               # os identifier
     dir                     # current directory
     vcs                     # git status
-    prompt_char             # prompt symbol
+    command_execution_time  # duration of the last command
+    status                  # exit code of the last command
+    #prompt_char            # prompt symbol
   )
 
   # The list of segments shown on the right. Fill it with less important segments.
@@ -41,18 +43,16 @@
   # automatically hidden when the input line reaches it. Right prompt above the
   # last prompt line gets hidden if it would overlap with left prompt.
   typeset -g POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=(
-    status                  # exit code of the last command
-    command_execution_time  # duration of the last command
     background_jobs         # presence of background jobs
-    direnv                  # direnv status (https://direnv.net/)
+    # direnv                # direnv status (https://direnv.net/)
-    asdf                    # asdf version manager (https://github.com/asdf-vm/asdf)
+    # asdf                  # asdf version manager (https://github.com/asdf-vm/asdf)
     virtualenv              # python virtual environment (https://docs.python.org/3/library/venv.html)
-    anaconda                # conda environment (https://conda.io/)
+    # anaconda              # conda environment (https://conda.io/)
-    pyenv                   # python environment (https://github.com/pyenv/pyenv)
+    # pyenv                 # python environment (https://github.com/pyenv/pyenv)
-    goenv                   # go environment (https://github.com/syndbg/goenv)
+    # goenv                 # go environment (https://github.com/syndbg/goenv)
-    nodenv                  # node.js version from nodenv (https://github.com/nodenv/nodenv)
+    # nodenv                # node.js version from nodenv (https://github.com/nodenv/nodenv)
-    nvm                     # node.js version from nvm (https://github.com/nvm-sh/nvm)
+    # nvm                   # node.js version from nvm (https://github.com/nvm-sh/nvm)
-    nodeenv                 # node.js environment (https://github.com/ekalinin/nodeenv)
+    # nodeenv               # node.js environment (https://github.com/ekalinin/nodeenv)
     # node_version          # node.js version
     # go_version            # go version (https://golang.org)
     # rust_version          # rustc version (https://www.rust-lang.org)
@@ -61,43 +61,44 @@
     # laravel_version       # laravel php framework version (https://laravel.com/)
     # java_version          # java version (https://www.java.com/)
     # package               # name@version from package.json (https://docs.npmjs.com/files/package.json)
-    rbenv                   # ruby version from rbenv (https://github.com/rbenv/rbenv)
+    # rbenv                 # ruby version from rbenv (https://github.com/rbenv/rbenv)
-    rvm                     # ruby version from rvm (https://rvm.io)
+    # rvm                   # ruby version from rvm (https://rvm.io)
-    fvm                     # flutter version management (https://github.com/leoafarias/fvm)
+    # fvm                   # flutter version management (https://github.com/leoafarias/fvm)
-    luaenv                  # lua version from luaenv (https://github.com/cehoffman/luaenv)
+    # luaenv                # lua version from luaenv (https://github.com/cehoffman/luaenv)
-    jenv                    # java version from jenv (https://github.com/jenv/jenv)
+    # jenv                  # java version from jenv (https://github.com/jenv/jenv)
-    plenv                   # perl version from plenv (https://github.com/tokuhirom/plenv)
+    # plenv                 # perl version from plenv (https://github.com/tokuhirom/plenv)
-    perlbrew                # perl version from perlbrew (https://github.com/gugod/App-perlbrew)
+    # perlbrew              # perl version from perlbrew (https://github.com/gugod/App-perlbrew)
-    phpenv                  # php version from phpenv (https://github.com/phpenv/phpenv)
+    # phpenv                # php version from phpenv (https://github.com/phpenv/phpenv)
-    scalaenv                # scala version from scalaenv (https://github.com/scalaenv/scalaenv)
+    # scalaenv              # scala version from scalaenv (https://github.com/scalaenv/scalaenv)
-    haskell_stack           # haskell version from stack (https://haskellstack.org/)
+    # haskell_stack         # haskell version from stack (https://haskellstack.org/)
     kubecontext             # current kubernetes context (https://kubernetes.io/)
-    terraform               # terraform workspace (https://www.terraform.io)
+    # terraform             # terraform workspace (https://www.terraform.io)
     # terraform_version     # terraform version (https://www.terraform.io)
-    aws                     # aws profile (https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-profiles.html)
+    # aws                   # aws profile (https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-profiles.html)
-    aws_eb_env              # aws elastic beanstalk environment (https://aws.amazon.com/elasticbeanstalk/)
+    # aws_eb_env            # aws elastic beanstalk environment (https://aws.amazon.com/elasticbeanstalk/)
-    azure                   # azure account name (https://docs.microsoft.com/en-us/cli/azure)
+    # azure                 # azure account name (https://docs.microsoft.com/en-us/cli/azure)
-    gcloud                  # google cloud cli account and project (https://cloud.google.com/)
+    # gcloud                # google cloud cli account and project (https://cloud.google.com/)
-    google_app_cred         # google application credentials (https://cloud.google.com/docs/authentication/production)
+    # google_app_cred       # google application credentials (https://cloud.google.com/docs/authentication/production)
-    toolbox                 # toolbox name (https://github.com/containers/toolbox)
+    # toolbox               # toolbox name (https://github.com/containers/toolbox)
-    context                 # user@hostname
+    # context               # user@hostname
-    nordvpn                 # nordvpn connection status, linux only (https://nordvpn.com/)
+    # nordvpn               # nordvpn connection status, linux only (https://nordvpn.com/)
     ranger                  # ranger shell (https://github.com/ranger/ranger)
-    nnn                     # nnn shell (https://github.com/jarun/nnn)
+    # nnn                   # nnn shell (https://github.com/jarun/nnn)
-    lf                      # lf shell (https://github.com/gokcehan/lf)
+    # lf                    # lf shell (https://github.com/gokcehan/lf)
-    xplr                    # xplr shell (https://github.com/sayanarijit/xplr)
+    # xplr                  # xplr shell (https://github.com/sayanarijit/xplr)
     vim_shell               # vim shell indicator (:sh)
-    midnight_commander      # midnight commander shell (https://midnight-commander.org/)
+    # midnight_commander    # midnight commander shell (https://midnight-commander.org/)
-    nix_shell               # nix shell (https://nixos.org/nixos/nix-pills/developing-with-nix-shell.html)
+    # nix_shell             # nix shell (https://nixos.org/nixos/nix-pills/developing-with-nix-shell.html)
-    chezmoi_shell           # chezmoi shell (https://www.chezmoi.io/)
+    # chezmoi_shell         # chezmoi shell (https://www.chezmoi.io/)
     # vpn_ip                # virtual private network indicator
     # load                  # CPU load
     # disk_usage            # disk usage
     # ram                   # free RAM
     # swap                  # used swap
-    todo                    # todo items (https://github.com/todotxt/todo.txt-cli)
+    # todo                  # todo items (https://github.com/todotxt/todo.txt-cli)
-    timewarrior             # timewarrior tracking status (https://timewarrior.net/)
+    # timewarrior           # timewarrior tracking status (https://timewarrior.net/)
-    taskwarrior             # taskwarrior task count (https://taskwarrior.org/)
+    # taskwarrior           # taskwarrior task count (https://taskwarrior.org/)
+    # per_directory_history # Oh My Zsh per-directory-history local/global indicator
     # cpu_arch              # CPU architecture
     # time                  # current time
     # ip                    # ip address and bandwidth usage for a specified network interface
@@ -109,10 +110,10 @@
   )
 
   # Defines character set used by powerlevel10k. It's best to let `p10k configure` set it for you.
-  typeset -g POWERLEVEL9K_MODE=nerdfont-complete
+  typeset -g POWERLEVEL9K_MODE=awesome-fontconfig
   # When set to `moderate`, some icons will have an extra space after them. This is meant to avoid
   # icon overlap when using non-monospace fonts. When set to `none`, spaces are not added.
-  typeset -g POWERLEVEL9K_ICON_PADDING=none
+  typeset -g POWERLEVEL9K_ICON_PADDING=moderate
 
   # Basic style options that define the overall look of your prompt. You probably don't want to
   # change them.
@@ -190,9 +191,9 @@
   # Red prompt symbol if the last command failed.
   typeset -g POWERLEVEL9K_PROMPT_CHAR_ERROR_{VIINS,VICMD,VIVIS,VIOWR}_FOREGROUND=196
   # Default prompt symbol.
-  typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VIINS_CONTENT_EXPANSION=
+  typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VIINS_CONTENT_EXPANSION=''
   # Prompt symbol in command vi mode.
-  typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VICMD_CONTENT_EXPANSION=
+  typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VICMD_CONTENT_EXPANSION=''
   # Prompt symbol in visual vi mode.
   typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VIVIS_CONTENT_EXPANSION='V'
   # Prompt symbol in overwrite vi mode.
@@ -232,7 +233,7 @@
     .java-version
     .perl-version
     .php-version
-    .tool-version
+    .tool-versions
     .shorten_folder_marker
     .svn
     .terraform
@@ -418,11 +419,17 @@
       res+=" ${modified}wip"
     fi
 
-    # ⇣42 if behind the remote.
+    if (( VCS_STATUS_COMMITS_AHEAD || VCS_STATUS_COMMITS_BEHIND )); then
-    (( VCS_STATUS_COMMITS_BEHIND )) && res+=" ${clean}⇣${VCS_STATUS_COMMITS_BEHIND}"
+      # ⇣42 if behind the remote.
-    # ⇡42 if ahead of the remote; no leading space if also behind the remote: ⇣42⇡42.
+      (( VCS_STATUS_COMMITS_BEHIND )) && res+=" ${clean}⇣${VCS_STATUS_COMMITS_BEHIND}"
-    (( VCS_STATUS_COMMITS_AHEAD && !VCS_STATUS_COMMITS_BEHIND )) && res+=" "
+      # ⇡42 if ahead of the remote; no leading space if also behind the remote: ⇣42⇡42.
-    (( VCS_STATUS_COMMITS_AHEAD  )) && res+="${clean}⇡${VCS_STATUS_COMMITS_AHEAD}"
+      (( VCS_STATUS_COMMITS_AHEAD && !VCS_STATUS_COMMITS_BEHIND )) && res+=" "
+      (( VCS_STATUS_COMMITS_AHEAD  )) && res+="${clean}⇡${VCS_STATUS_COMMITS_AHEAD}"
+    elif [[ -n $VCS_STATUS_REMOTE_BRANCH ]]; then
+      # Tip: Uncomment the next line to display '=' if up to date with the remote.
+      # res+=" ${clean}="
+    fi
+
     # ⇠42 if behind the push remote.
     (( VCS_STATUS_PUSH_COMMITS_BEHIND )) && res+=" ${clean}⇠${VCS_STATUS_PUSH_COMMITS_BEHIND}"
     (( VCS_STATUS_PUSH_COMMITS_AHEAD && !VCS_STATUS_PUSH_COMMITS_BEHIND )) && res+=" "
@@ -855,6 +862,19 @@
   # Custom icon.
   # typeset -g POWERLEVEL9K_TASKWARRIOR_VISUAL_IDENTIFIER_EXPANSION='⭐'
 
+  ######[ per_directory_history: Oh My Zsh per-directory-history local/global indicator ]#######
+  # Color when using local/global history.
+  typeset -g POWERLEVEL9K_PER_DIRECTORY_HISTORY_LOCAL_FOREGROUND=135
+  typeset -g POWERLEVEL9K_PER_DIRECTORY_HISTORY_GLOBAL_FOREGROUND=130
+
+  # Tip: Uncomment the next two lines to hide "local"/"global" text and leave just the icon.
+  # typeset -g POWERLEVEL9K_PER_DIRECTORY_HISTORY_LOCAL_CONTENT_EXPANSION=''
+  # typeset -g POWERLEVEL9K_PER_DIRECTORY_HISTORY_GLOBAL_CONTENT_EXPANSION=''
+
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_PER_DIRECTORY_HISTORY_LOCAL_VISUAL_IDENTIFIER_EXPANSION='⭐'
+  # typeset -g POWERLEVEL9K_PER_DIRECTORY_HISTORY_GLOBAL_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
   ################################[ cpu_arch: CPU architecture ]################################
   # CPU architecture color.
   typeset -g POWERLEVEL9K_CPU_ARCH_FOREGROUND=172
@@ -1372,10 +1392,39 @@
   # Show azure only when the command you are typing invokes one of these tools.
   # Tip: Remove the next line to always show azure.
   typeset -g POWERLEVEL9K_AZURE_SHOW_ON_COMMAND='az|terraform|pulumi|terragrunt'
+
+  # POWERLEVEL9K_AZURE_CLASSES is an array with even number of elements. The first element
+  # in each pair defines a pattern against which the current azure account name gets matched.
+  # More specifically, it's P9K_CONTENT prior to the application of context expansion (see below)
+  # that gets matched. If you unset all POWERLEVEL9K_AZURE_*CONTENT_EXPANSION parameters,
+  # you'll see this value in your prompt. The second element of each pair in
+  # POWERLEVEL9K_AZURE_CLASSES defines the account class. Patterns are tried in order. The
+  # first match wins.
+  #
+  # For example, given these settings:
+  #
+  #   typeset -g POWERLEVEL9K_AZURE_CLASSES=(
+  #     '*prod*'  PROD
+  #     '*test*'  TEST
+  #     '*'       OTHER)
+  #
+  # If your current azure account is "company_test", its class is TEST because "company_test"
+  # doesn't match the pattern '*prod*' but does match '*test*'.
+  #
+  # You can define different colors, icons and content expansions for different classes:
+  #
+  #   typeset -g POWERLEVEL9K_AZURE_TEST_FOREGROUND=28
+  #   typeset -g POWERLEVEL9K_AZURE_TEST_VISUAL_IDENTIFIER_EXPANSION='⭐'
+  #   typeset -g POWERLEVEL9K_AZURE_TEST_CONTENT_EXPANSION='> ${P9K_CONTENT} <'
+  typeset -g POWERLEVEL9K_AZURE_CLASSES=(
+      # '*prod*'  PROD    # These values are examples that are unlikely
+      # '*test*'  TEST    # to match your needs. Customize them as needed.
+      '*'         OTHER)
+
   # Azure account name color.
-  typeset -g POWERLEVEL9K_AZURE_FOREGROUND=32
+  typeset -g POWERLEVEL9K_AZURE_OTHER_FOREGROUND=32
   # Custom icon.
-  # typeset -g POWERLEVEL9K_AZURE_VISUAL_IDENTIFIER_EXPANSION='⭐'
+  # typeset -g POWERLEVEL9K_AZURE_OTHER_VISUAL_IDENTIFIER_EXPANSION='⭐'
 
   ##########[ gcloud: google cloud account and project (https://cloud.google.com/) ]###########
   # Show gcloud only when the command you are typing invokes one of these tools.
@@ -1541,7 +1590,7 @@
   # Show battery in yellow when it's discharging.
   typeset -g POWERLEVEL9K_BATTERY_DISCONNECTED_FOREGROUND=178
   # Battery pictograms going from low to high level of charge.
-  typeset -g POWERLEVEL9K_BATTERY_STAGES='\uf58d\uf579\uf57a\uf57b\uf57c\uf57d\uf57e\uf57f\uf580\uf581\uf578'
+  typeset -g POWERLEVEL9K_BATTERY_STAGES=('%K{232}▁' '%K{232}▂' '%K{232}▃' '%K{232}▄' '%K{232}▅' '%K{232}▆' '%K{232}▇' '%K{232}█')
   # Don't show the remaining time to charge/discharge.
   typeset -g POWERLEVEL9K_BATTERY_VERBOSE=false
 

.config/zsh/.zshrc

@@ -1,7 +1,9 @@
-autoload -U compinit colors
+autoload -U bashcompinit compinit colors
+zmodload zsh/complist
 
 fpath=("$ZDOTDIR/completions" $fpath)
 compinit -d "$XDG_CACHE_HOME/.zcompdump-$ZSH_VERSION"
+bashcompinit
 
 colors
 
@@ -25,8 +27,8 @@ setopt AUTO_CD
 setopt HIST_IGNORE_DUPS
 setopt HIST_IGNORE_SPACE
 setopt SHARE_HISTORY
+setopt EXTENDED_HISTORY
 
-################# TODO ################3
 export PAGER=less
 export LESS_TERMCAP_mb="${fg_bold[red]}"
 export LESS_TERMCAP_md="${fg_bold[red]}"
@@ -35,30 +37,18 @@ export LESS_TERMCAP_so="${fg_bold[yellow]}${bg[blue]}"
 export LESS_TERMCAP_se="${reset_color}"
 export LESS_TERMCAP_us="${fg_bold[green]}"
 export LESS_TERMCAP_ue="${reset_color}"
+export GROFF_NO_SGR=1
 
 . <(dircolors)
 zstyle ':completion:*' list-colors "${(s.:.)LS_COLORS}"
 
-# fixme - the load process here seems a bit bizarre
-zmodload -i zsh/complist
-
 WORDCHARS=''
 
-# should this be in keybindings?
-bindkey -M menuselect '^o' accept-and-infer-next-history
 zstyle ':completion:*:*:*:*:*' menu select
-
 zstyle ':completion:*' matcher-list 'r:|=*' 'l:|=* r:|=*'
-
-# Complete . and .. special directories
-zstyle ':completion:*' special-dirs true
-
 zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#) ([0-9a-z-]#)*=01;34=0=01'
 
 # disable named-directories autocompletion
 zstyle ':completion:*:cd:*' tag-order local-directories directory-stack path-directories
 
-# automatically load bash completion functions
-autoload -U +X bashcompinit && bashcompinit
-
 # vim: ft=zsh

.config/zsh/aliases/general.zsh

@@ -1,31 +1,28 @@
-# system
 alias update='sudo pacman -Syu && flatpak update && config submodule update --remote --recursive --init'
-alias pac='sudo pacman'
+alias pac='sudo pacman'      \
-alias vi='$EDITOR'
+      vi='$EDITOR'           \
-alias qcp='qcp -o tabsize=4'
+      qcp='qcp -o tabsize=4' \
-alias qmv='qmv -o tabsize=4'
+      qmv='qmv -o tabsize=4'
 
-# conf
+alias config='git --git-dir="$HOME/.dotfiles/" --work-tree="$HOME"' \
-alias config='git --git-dir="$HOME/.dotfiles/" --work-tree="$HOME"'
+      viconf='(cd "$XDG_CONFIG_HOME/nvim" && $EDITOR .)'            \
-alias viconf='(cd "$XDG_CONFIG_HOME/nvim" && $EDITOR .)'
+      wconf='(cd "$XDG_CONFIG_HOME/sway" && $EDITOR .)'             \
-alias wconf='(cd "$XDG_CONFIG_HOME/sway" && $EDITOR .)'
+      zconf='(cd "$ZDOTDIR/" && $EDITOR .) && . "$ZDOTDIR/.zshrc"'
-alias zconf='(cd "$ZDOTDIR/" && $EDITOR .) && . "$ZDOTDIR/.zshrc"'
 
-# dev
+alias valgrind='epitest valgrind' \
-alias valgrind='epitest valgrind'
+      ssh='TERM=linux ssh'
 
-# alias
 function coloralias() {
     $1 $(echo - "${@:2}" | sed 's/--color=\w\+/--color=always/')
 }
 
-alias _='sudo '
+alias _='sudo '                       \
-alias sudo='sudo '
+      sudo='sudo '                    \
-alias watch='coloralias watch -c -- '
+      watch='coloralias watch -c -- ' \
-alias xargs='xargs '
+      xargs='xargs '
 
 function j() {
-    local dests=($(find . -mount -maxdepth 5 -type d -path "*/$1" 2> /dev/null))
+    local dests=("${(@f)$(find . -mount -name "$1*" -type d 2> /dev/null)}")
     local dest="${dests:-$1}"
 
     [ -n "${dests[2]}" ] && dest="$(printf '%s\n' "${dests[@]}" | fzf)"
@@ -36,21 +33,26 @@ function tmp() {
     cd "$(mktemp -dt "$1"XXX)"
 }
 
-alias -g ...='../..'
+alias -g ...='../..'         \
-alias -g ....='../../..'
+         ....='../../..'     \
-alias -g .....='../../../..'
+         .....='../../../..' \
-alias -g ......='../../../../..'
+         ......='../../../../..'
 
-alias ls='ls --color=tty'
+alias cp="cp -vi" \
-alias lsa='ls -lah'
+      mv="mv -vi" \
-alias l='ls -lah'
+      rm="rm -v" \
-alias ll='ls -lh'
+      mkdir="mkdir -v" \
-alias la='ls -lAh'
+      rsync="rsync -P"
+
+alias ls='ls --color=tty' \
+      l='ls -lah'         \
+      ll='ls -lh'         \
+      la='ls -lAh'
 
 alias diff='diff --color'
 
-alias grep="grep --color=auto --exclude-dir={.bzr,CVS,.git,.hg,.svn,.idea,.tox}"
+alias grep="grep --color=auto --exclude-dir={.bzr,CVS,.git,.hg,.svn,.idea,.tox}"     \
-alias egrep="grep -E --color=auto --exclude-dir={.bzr,CVS,.git,.hg,.svn,.idea,.tox}"
+      egrep="grep -E --color=auto --exclude-dir={.bzr,CVS,.git,.hg,.svn,.idea,.tox}" \
-alias fgrep="grep -F --color=auto --exclude-dir={.bzr,CVS,.git,.hg,.svn,.idea,.tox}"
+      fgrep="grep -F --color=auto --exclude-dir={.bzr,CVS,.git,.hg,.svn,.idea,.tox}"
 
 # vim: ft=zsh

.config/zsh/completions/_j

@@ -1,3 +1,3 @@
 #compdef j
 
-_arguments "1: :(**/"$1")"
+_arguments "1: :($(find . -mount -name "$1*" -type d -printf "'%P' " 2> /dev/null))"

.config/zsh/powerlevel10k

@@ -1 +1 @@
-Subproject commit 017395a266aa15011c09e64e44a1c98ed91c478c
+Subproject commit 174ce9bf0166c657404a21f4dc9608da935f7325

.gitmodules

@@ -10,6 +10,9 @@
 [submodule ".config/nvim/pack/plugins/opt/telescope"]
 	path = .config/nvim/pack/plugins/opt/telescope
 	url = https://github.com/nvim-telescope/telescope.nvim.git
+[submodule ".config/nvim/pack/plugins/opt/treesitter"]
+	path = .config/nvim/pack/plugins/opt/treesitter
+	url = https://github.com/nvim-treesitter/nvim-treesitter.git
 [submodule ".config/zsh/powerlevel10k"]
 	path = .config/zsh/powerlevel10k
 	url = https://github.com/romkatv/powerlevel10k.git

.xinitrc

@@ -1,9 +1,7 @@
 #!/bin/sh
 
-# bar
-#(i3status | while read line; do xsetroot -name "$line"; done) &
-
 # startup
+autorandr -c                                         &
 xss-lock -n screensaver -- lock                      &
 /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1          || # arch
     /usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1 || # debian
@@ -11,6 +9,6 @@ xss-lock -n screensaver -- lock                      &
 picom                                                &
 gammastep 2> /dev/null                               &
 sbar                                                 &
-./keepass/start.sh                                   &
+"$HOME/keepass/keepassxc"                            &
 
-exec dbus-launch dwm
+exec dbus-launch .config/suckless/dwm-6.4/dwm

bin/keepassxc

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-KEEPASS="$HOME/keepass"
-
-/usr/bin/keepassxc --config "$KEEPASS/keepassxc.ini" "$KEEPASS/Passwords.kdbx"

bin/lock

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-i3lock -ftni "$XDG_CONFIG_HOME/wallpapers/lock.png"
+exec i3lock -ftni "$XDG_CONFIG_HOME/wallpapers/lock.png"

bin/sbar

@@ -40,7 +40,7 @@ update_wlp() {
     [ -z "$ssid" ] && wlp='⚠' && return
     [ -z "$sig"  ] && sig=0
 
-    # https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/blob/main/src/libnmc-base/nm-client-utils.c#L628
+    # https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/blob/d9b06a95/src/libnmc-base/nm-client-utils.c#L628
     { [ "$sig" -gt 5600 ] && wlp="▂▄▆█ $ssid"; } ||
     { [ "$sig" -gt 3850 ] && wlp="▂▄▆_ $ssid"; } ||
     { [ "$sig" -gt 1650 ] && wlp="▂▄__ $ssid"; } ||

bin/screensaver

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-feh --fullscreen "$XDG_CONFIG_HOME/wallpapers/lock.png"
+exec feh --fullscreen "$XDG_CONFIG_HOME/wallpapers/lock.png"