Updated, cleaned up config paths, etc

.bashrc

@@ -3,14 +3,18 @@
 export LC_CTYPE=en_US.UTF-8
 export LC_ALL=en_US.UTF-8
 
+export GNUPGHOME="$HOME/.local/share/gnupg"
 export GPG_TTY=$(tty)
 
 export GOPATH=$HOME/dev/go
 export CARGO_HOME=$HOME/dev/cargo
 export PATH=$PATH:/opt:$HOME/.local/bin:$HOME/dev/go/bin:$HOME/dev/cargo/bin:$GOPATH/bin
 
-[ -f $HOME/.bash_aliases   ] && source $HOME/.bash_aliases
-[ -f $HOME/.bash_functions ] && source $HOME/.bash_functions
+export XINITRC="$HOME/.config/X11/xinitrc"
+
+for item in $(ls $HOME/.local/share/bash); do
+    source $HOME/.local/share/bash/$item
+done
 
 if [ "$(id -u)" -eq 0 ]; then
     export PS1="\e[38;5;237m\T\e[0m \e[38;5;196m\u@\h\e[0m \e[38;5;226m\w \e[0m: "

bash/.bashrc_thin

@@ -1,37 +0,0 @@
-[[ $- != *i* ]] && return
-
-# colors
-alias diff='diff --color=auto'
-alias dmesg='dmesg --color=auto'
-alias dir='dir --color=auto'
-alias egrep='egrep --color=auto'
-alias grep='grep --color=auto'
-alias fgrep='fgrep --color=auto'
-alias ip='ip -color=auto'
-alias ls='ls --color=auto'
-alias ncdu='ncdu --color dark -rr'
-alias tree='tree -C'
-alias vdir='vdir --color=auto'
-
-# rewrites
-alias cp='cp -i'
-alias mv='mv -i'
-alias vlock='vlock -a'
-alias wget='wget -q --show-progress'
-
-# scripts
-alias dbc='~/.scripts/dbc'
-alias pass='~/.scripts/pass'
-
-# random
-alias up='sudo mount -o remount,rw /boot && sudo xbps-install -Su && sudo vkpurge rm all && sudo mount -o remount,ro /boot'
-
-rnd() {
-	cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w $1 | head -n 1
-}
-
-if [ "$(id -u)" -eq 0 ]; then
-    export PS1="\e[38;5;237m\T\e[0m \e[38;5;196m\u@\h\e[0m \e[38;5;226m\w \e[0m: "
-else
-    export PS1="\e[38;5;237m\T\e[0m \e[38;5;41m\u@\h\e[0m \e[38;5;69m\w \e[0m: "
-fi

setup

@@ -138,28 +138,26 @@ setup_packages() {
 
 
 setup_configs() {
-	wget -O $HOME/.alacritty.toml $GIT_URL/alacritty/.alacritty.toml
-	wget -O $HOME/.tmux.conf $GIT_URL/tmux/.tmux.conf
-
-	for item in bashrc bash_aliases bash_functions; do
-		wget -O $HOME/.$item $GIT_URL/bash/.$item
-	done
-
+    mkdir -p $HOME/.config/alacritty/ && wget -O $HOME/.config/alacritty/alacritty.toml $GIT_URL/config/alacritty/alacritty.toml
    	mkdir -p $HOME/.config/cmus  && wget -O $HOME/.config/cmus/autosave $GIT_URL/cmus/autosave
 	mkdir -p $HOME/.config/dunst && wget -O $HOME/.config/dunst/dunstrc $GIT_URL/dunst/dunstrc
+	mkdir -p $HOME/.config/git   && wget -O $HOME/.config/git/gitconfig $GIT_URL/config/git/gitconfig
+	mkdir -p $HOME/.config/tmux  && wget -O $HOME/.config/tmux/tmux.conf $GIT_URL/config/tmux/tmux.conf
+	mkdir -p $HOME/.config/X11/  && wget -O $HOME/.config/X11/xinitrc    $GIT_URL/config/X11/xinitrc
 
-	wget -O $HOME/.gitconfig $GIT_URL/git/.gitconfig
+	mkdir -p $HOME/.local/share/bash
+	for item in bash_aliases bash_functions bash_fun bash_recon; do
+		wget -O $HOME/.local/share/bash/$item $GIT_URL/local/share/bash/$item
+	done
+	wget -O $HOME/.bashrc $GIT_URL/.bashrc
 
-	mkdir $HOME/.gnupg && wget -O $HOME/.gnupg/gpg.conf $GIT_URL/gpg/gpg.conf
-	printf "pinentry-program /usr/bin/pinentry-curses\ndefault-cache-ttl 3600" > $HOME/.gnupg/gpg-agent.conf
-	#printf "pinentry-program /usr/bin/pinentry-dmenu\ndefault-cache-ttl 3600" > $HOME/.gnupg/gpg-agent.conf
-	chmod 700 $HOME/.gnupg && chmod 600 $HOME/.gnupg/*
+	mkdir -p $HOME/.local/share/gnupg && wget -O $HOME/.local/share/gnupg/gpg.conf $GIT_URL/local/share/gnupg/gpg.conf
+	printf "pinentry-program /usr/bin/pinentry-curses\ndefault-cache-ttl 3600" > $HOME/.local/share/gnupg/gpg-agent.conf
+	chmod 700 $HOME/.local/share/gnupg && chmod 600 $HOME/.local/share/gnupg/*
 
-	wget -O $HOME/.xinitrc $GIT_URL/xorg/.xinitrc
-
-	mkdir $HOME/.scripts
-	for SCRIPT in cmus-now gitremote irc-post-commit-hook mutag pmf shotz statusbar todo torwall; do
-		wget -O $HOME/.scripts/$SCRIPT $GIT_URL/scripts/$SCRIPT && chmod +x $HOME/.scripts/$SCRIPT
+	mkdir -p $HOME/.local/bin/scripts
+	for SCRIPT in cmus-now gitremote irc-post-commit-hook mutag pmf shotz statusbar todo; do
+		wget -O $HOME/.local/bin/scripts/$SCRIPT $GIT_URL/scripts/$SCRIPT && chmod +x $HOME/.scripts/$SCRIPT
 	done
 	wget -O $HOME/.scripts/dbc https://raw.githubusercontent.com/acidvegas/dbc/main/dbc && chmod +x $HOME/.scripts/dbc