shell: bash append history, aliases, hs alias, move zsh unalias

kakoune/.config/kak/kakrc

@@ -8,7 +8,7 @@ hook global ModuleLoaded wayland %{
 }
 
 hook global WinCreate .* %{
-    add-highlighter window/number-lines number-lines -relative -hlcursor
+    add-highlighter window/number-lines number-lines -relative -hlcursor -min-digits 3
 }
 
 hook global BufCreate .*\.templ %{ set buffer filetype templ }

shell/.bashrc

@@ -5,12 +5,19 @@
 # If not running interactively, don't do anything
 [[ $- != *i* ]] && return
 
-alias ls='ls --color=auto'
+shopt -s histappend
+PROMPT_COMMAND="history -a; history -n; $PROMPT_COMMAND"
+
 PS1='\e[34m\u@\h\e[0m \e[32m\W\e[0m \$ '
 
+HISTTIMEFORMAT='%F %R  '
+
 function before_command() { echo -ne '\e[2 q'; }
 trap before_command DEBUG
 
+# Aliases.
+for f in ~/.config/shellconfig/*.sh; do source "$f"; done
+
 if [[ -f /usr/share/bash-completion/bash_completion ]]; then
     . /usr/share/bash-completion/bash_completion
 fi

shell/.config/shellconfig/aliases.sh

@@ -1,30 +1,18 @@
 alias v=nvim
 alias k=kak
-alias kd='kak -s "$(basename $PWD)"'
-alias ll='ls -l'
+alias hs='history $HISTSIZE | rg'
+alias kc='kak -c "$(kak -l | kff)"'
+alias kf='fd -t f | kff | xargs kd'
+alias kh='fd -H -t f | kff | xargs kd'
+alias ll='ls -l --color=auto'
+alias ls='ls --color=auto'
 alias tl='tmux list-sessions'
 alias rgh='rg -.'
 alias fdh='fd -H'
 alias lg=lazygit
+alias z='cd $(fd -t d --one-file-system . ~ | kff)'
 
-if alias st > /dev/null; then
-	alias gst='_vcs status'
-	unalias st
-fi
-if alias r > /dev/null; then
-	unalias r
-fi
-
-if which eza > /dev/null; then
-	alias ls='eza --icons'
-	alias tree='eza --tree --icons'
-elif which exa > /dev/null; then
-	alias ls='exa --icons'
-	alias tree='exa --tree --icons'
-else
-	eval $(dircolors)
-	alias ls='ls --color=auto'
-fi
+eval $(dircolors)
 
 alias nocaps='setxkbmap pl -option ctrl:nocaps'
 alias fixdp='xrandr --output DP-0 --right-of DP-2'
@@ -38,12 +26,6 @@ a4i() {
 	fi
 }
 
-kc() {
-    local Q="${@:-}"
-    local NAME=$(kak -l | fzy -q "$Q")
-    [ -n "$NAME" ] && kak -c "$NAME"
-}
-
 tn() {
 	if [ $# -eq 0 ]; then
 		tmux new

shell/.config/shellconfig/aliases.zsh

@@ -2,3 +2,11 @@ alias hs='history -$HISTSIZE | rg'
 
 alias -s pdf=zathura
 alias -s {jpg,jpeg,png}=sxiv
+
+if alias st > /dev/null; then
+	alias gst='_vcs status'
+	unalias st
+fi
+if alias r > /dev/null; then
+	unalias r
+fi

shell/.profile

@@ -14,6 +14,8 @@ export EDITOR=kak
 export VISUAL=kak
 
 export BAT_THEME='Catppuccin Frappe'
+export XDG_RUNTIME_DIR="$HOME/local/run"
+export KFF_DEFAULT_COMMAND='fd -t f'
 
 # if running bash
 if [ -n "$BASH_VERSION" ]; then

xsession/.Xresources

@@ -3,6 +3,7 @@
 #if HEIGHT >= 2160
 Xft.dpi: 160
 Xcursor.size: 48
+Xcursor.theme: Vanilla-DMZ
 polybar.height: 40
 #else
 Xft.dpi: 107