.alias

@@ -1,5 +1,5 @@
 # utils
-alias ls="eza --group-directories-first -gm"
+alias ls="exa --group-directories-first -gm"
 alias ll="ls -lhF"
 alias lt="ll -TL $1"
 alias ld="ll -d"

.void.bash_aliases

@@ -3,6 +3,10 @@
 # import general use aliases
 [[ -r ~/.alias ]] && . ~/.alias
 
+# config files
+alias cb="vim ~/.config/bspwm/bspwmrc"
+alias cs="vim ~/.config/sxhkd/sxhkdrc"
+
 # xbps-install
 # use xtools instead
 # alias xin="doas xbps-install -S"
@@ -24,3 +28,4 @@ alias xcln="xr -oO"
 # Docker
 alias dc=docker-compose
 
+command -v 2>&1 >/dev/null thefuck && eval "$(thefuck --alias)"

.void.bashrc

@@ -8,39 +8,29 @@
 [[ $- != *i* ]] && return
 
 #################################
-# Mandatory source files
+# - bash_aliases
 # - bash-completion
-# - bash-aliases
-# - ps1 # replaced by starship, legacy
 
 # always bash-completion first
-[[ -r /usr/share/bash-completion/bash_completion ]] &&\
+[[ -r /usr/share/bash-completion/bash_completion ]] && . /usr/share/bash-completion/bash_completion
-    source /usr/share/bash-completion/bash_completion
 
 # custom bash-completions
-[[ -d ~/.config/completions ]] &&\
+[ -d ~/.config/completions ] && { for i in ~/.config/completions/*; do source $i; done }
-    { for i in ~/.config/completions/*; do source $i; done }
 
 # source distro and general purpose aliases
-[[ -r ~/.bash_aliases ]] &&\
+[[ -r ~/.bash_aliases ]] && . ~/.bash_aliases
-    source ~/.bash_aliases
+
+# integrate git prompt functions
+# will break PS1 if not used
+[[ -f /usr/share/git/git-prompt.sh ]] && . /usr/share/git/git-prompt.sh
+
+# kube-ps1
+# located in ~/git/kube-ps1
+[[ -r ~/git/kube-ps1/kube-ps1.sh ]] && . ~/git/kube-ps1/kube-ps1.sh
 
 # set PS1 from file
 # USE ONLY AFTER GIT PROMPT
-[[ -r ~/.ps1 ]] &&\
+[[ -r ~/.ps1 ]] && . ~/.ps1
-    source ~/.ps1
-
-#################################
-# Optional source files
-
-# BEGIN_KITTY_SHELL_INTEGRATION
-[[ -n "$KITTY_INSTALLATION_DIR" ]] &&\
-    [[ -e "$KITTY_INSTALLATION_DIR/shell-integration/bash/kitty.bash" ]] &&\
-    source "$KITTY_INSTALLATION_DIR/shell-integration/bash/kitty.bash"
-# END_KITTY_SHELL_INTEGRATION
-
-# Google CLI
-[[ -r ~/.googlerc ]] && source ~/.googlerc
 
 #################################
 # don't put duplicate lines or lines starting with space in the history.
@@ -61,18 +51,16 @@ shopt -s checkwinsize
 [ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
 
 #################################
-# Hooks
+# - hooks
-# - direnv
-# - starship
-# - zoxide
 
 command -v direnv &>/dev/null && eval "$(direnv hook bash)"
 command -v starship &>/dev/null && eval "$(starship init bash)"
-command -v zoxide &>/dev/null && eval "$(zoxide init --cmd cd bash)"
 
-#################################
+# - env vars
-# Environment variables
 
 export XBPS_DISTDIR="$HOME/git/void-packages"
 export SVDIR="$HOME/sv"
 
+# BEGIN_KITTY_SHELL_INTEGRATION
+if test -n "$KITTY_INSTALLATION_DIR" -a -e "$KITTY_INSTALLATION_DIR/shell-integration/bash/kitty.bash"; then source "$KITTY_INSTALLATION_DIR/shell-integration/bash/kitty.bash"; fi
+# END_KITTY_SHELL_INTEGRATION

.void.pkgs

@@ -1,143 +1,95 @@
-ImageMagick
-ModemManager
 NetworkManager
-amdvlk
+PrismLauncher
-amdvlk-32bit
+Signal-Desktop
-ansible
-arandr
-aws-cli
 base-system
 bash-completion
 bat
 bind-utils
-borg
+blanket
 bpytop
-bsdtar
 chrome-gnome-shell
 chromium
-chrony
+containerd
-cri-tools
-cryptsetup
-dino
 direnv
 docker
-docker-compose
+dos2unix
 easyeffects
-easyrsa
 elixir
-elogind
+exa
-eog
-extension-manager
-eza
-fff
 ffmpeg
 firefox
+flatpak
 font-awesome5
 font-fira-otf
-fprintd
+fzf
-gdm
+gdm-settings
 git
 gnome
-gnome-boxes
+gnome-menus
-go
 grub-x86_64-efi
-gtk-engine-murrine
 gvfs-smb
+helvum
 hplip
 htop
-hydrus
 jq
-k9s
 keepassxc
 kitty
 krita
-kubectl
-kubernetes
-kubernetes-helm
 lapce
 lesspipe
-libcanberra-gtk
-libcgroup-utils
 libdrm-32bit
-libidn
+libgcc-32bit
-libreoffice
+libgda
-libreoffice-gnome
+libstdc++-32bit
 libu2f-host
-lightdm
+lutris
-linux5.19
-linux5.19-headers
-lvm2
-mesa-dri-32bit
-mesa-vaapi
-mesa-vdpau
-mesa-vulkan-radeon
 mgba-qt
+mpc
 mpd
-nautilus
+mpdscribble
 ncmpcpp
-neofetch
 neovim
 nerd-fonts
 net-tools
 noto-fonts-cjk
 noto-fonts-emoji
-noto-fonts-ttf
+ntfs-3g
-noto-fonts-ttf-extra
+nvidia
-nushell
+nvidia-libs-32bit
-openvpn
+obs
-operator-sdk
+openjdk17-jre
-papirus-folders
+openntpd
-papirus-icon-theme
-patch
 pavucontrol
-piper
+picard
 pipewire
-podman
+protontricks
-powertop
+qbittorrent
-pulseaudio-utils
+qpwgraph
-python3
+qv4l2
-python3-ansible-lint
-python3-pip
-python3-psutil
-python3-s-tui
-rsync
 sassc
 socklog-void
-squid
 srain
 starship
 steam
-strace
 syncthing
-syncthing-gtk
-terraform
-thefuck
 thunderbird
-tlp
-tlp-rdw
-tlpui
-tmux
-tuxedo-keyboard
-unzip
-v4l2loopback
 vim
-virt-manager
 vlc
 void-repo-multilib
 void-repo-multilib-nonfree
 void-repo-nonfree
+vorbis-tools
 vscode
-vsv
+vulkan-loader-32bit
-vulkan-loader
 wget
+wine
+wireguard
 wireplumber
-xclip
+wl-clipboard
 xdg-user-dirs
-xdg-user-dirs-gtk
+xeyes
 xmirror
-xorg
+xorg-input-drivers
 xournalpp
+xprop
 xtools
-yq
-zoxide
-zstd

.void.pkgs-src

@@ -1,2 +1,2 @@
 discord
-kubectx-bash
+sayonara-player