Compare commits

...

6 Commits

Author SHA1 Message Date
fanyx 07823387dc Update current workstation packages 2024-02-21 14:17:40 +01:00
fanyx 7c2eabe85c Install zoxide 2024-02-21 14:17:40 +01:00
fanyx bf43ddb8e4 Move shell sourcing up 2024-02-21 14:17:40 +01:00
fanyx 2a9338a410 Cleanup mandatory source files, PS1 migrated to starship anyways 2024-02-21 14:17:40 +01:00
fanyx fac9598c3f Cleanup 2024-02-21 14:17:40 +01:00
fanyx a6560c03dd Use eza instead of exa 2024-02-21 14:17:40 +01:00
5 changed files with 116 additions and 61 deletions

2
.alias
View File

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

View File

@ -3,10 +3,6 @@
# 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"
@ -28,4 +24,3 @@ alias xcln="xr -oO"
# Docker
alias dc=docker-compose
command -v 2>&1 >/dev/null thefuck && eval "$(thefuck --alias)"

View File

@ -8,29 +8,39 @@
[[ $- != *i* ]] && return
#################################
# - bash_aliases
# Mandatory source files
# - bash-completion
# - bash-aliases
# - ps1 # replaced by starship, legacy
# always bash-completion first
[[ -r /usr/share/bash-completion/bash_completion ]] && . /usr/share/bash-completion/bash_completion
[[ -r /usr/share/bash-completion/bash_completion ]] &&\
source /usr/share/bash-completion/bash_completion
# custom bash-completions
[ -d ~/.config/completions ] && { for i in ~/.config/completions/*; do source $i; done }
[[ -d ~/.config/completions ]] &&\
{ for i in ~/.config/completions/*; do source $i; done }
# source distro and general purpose aliases
[[ -r ~/.bash_aliases ]] && . ~/.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
[[ -r ~/.bash_aliases ]] &&\
source ~/.bash_aliases
# set PS1 from file
# USE ONLY AFTER GIT PROMPT
[[ -r ~/.ps1 ]] && . ~/.ps1
[[ -r ~/.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.
@ -51,16 +61,18 @@ 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

View File

@ -1,95 +1,143 @@
ImageMagick
ModemManager
NetworkManager
PrismLauncher
Signal-Desktop
amdvlk
amdvlk-32bit
ansible
arandr
aws-cli
base-system
bash-completion
bat
bind-utils
blanket
borg
bpytop
bsdtar
chrome-gnome-shell
chromium
containerd
chrony
cri-tools
cryptsetup
dino
direnv
docker
dos2unix
docker-compose
easyeffects
easyrsa
elixir
exa
elogind
eog
extension-manager
eza
fff
ffmpeg
firefox
flatpak
font-awesome5
font-fira-otf
fzf
gdm-settings
fprintd
gdm
git
gnome
gnome-menus
gnome-boxes
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
libgcc-32bit
libgda
libstdc++-32bit
libidn
libreoffice
libreoffice-gnome
libu2f-host
lutris
lightdm
linux5.19
linux5.19-headers
lvm2
mesa-dri-32bit
mesa-vaapi
mesa-vdpau
mesa-vulkan-radeon
mgba-qt
mpc
mpd
mpdscribble
nautilus
ncmpcpp
neofetch
neovim
nerd-fonts
net-tools
noto-fonts-cjk
noto-fonts-emoji
ntfs-3g
nvidia
nvidia-libs-32bit
obs
openjdk17-jre
openntpd
noto-fonts-ttf
noto-fonts-ttf-extra
nushell
openvpn
operator-sdk
papirus-folders
papirus-icon-theme
patch
pavucontrol
picard
piper
pipewire
protontricks
qbittorrent
qpwgraph
qv4l2
podman
powertop
pulseaudio-utils
python3
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
vulkan-loader-32bit
vsv
vulkan-loader
wget
wine
wireguard
wireplumber
wl-clipboard
xclip
xdg-user-dirs
xeyes
xdg-user-dirs-gtk
xmirror
xorg-input-drivers
xorg
xournalpp
xprop
xtools
yq
zoxide
zstd

View File

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