void

- enter the void 🪐
git clone git://git.acid.vegas/archlinux.git
Log | Files | Refs | Archive

commit bcfcb83737d3b42778cdd234ca76a47cd2794444
parent ff932574e226b35b4ef5c5fbc7a8427bd24f8c27
Author: acidvegas <acid.vegas@acid.vegas>
Date: Tue, 22 Oct 2024 20:17:20 -0400

Updated, cleaned up config paths, etc

Diffstat:
A.bashrc | 23+++++++++++++++++++++++
Dbash/.bashrc | 19-------------------
Dbash/.bashrc_thin | 37-------------------------------------
Rxorg/.xinitrc -> config/X11/xinitrc | 0
Ralacritty/.alacritty.toml -> config/alacritty/alacritty.toml | 0
Rcmus/autosave -> config/cmus/autosave | 0
Rdunst/dunstrc -> config/dunst/dunstrc | 0
Rgit/.gitconfig -> config/git/gitconfig | 0
Rtmux/.tmux.conf -> config/tmux/tmux.conf | 0
Rscripts/art/cowboy.txt -> local/bin/scripts/art/cowboy.txt | 0
Rscripts/art/htp.txt -> local/bin/scripts/art/htp.txt | 0
Rscripts/art/pussybones.txt -> local/bin/scripts/art/pussybones.txt | 0
Rscripts/bomber -> local/bin/scripts/bomber | 0
Rscripts/cmus-now -> local/bin/scripts/cmus-now | 0
Rscripts/gitremote -> local/bin/scripts/gitremote | 0
Rscripts/gotimon -> local/bin/scripts/gotimon | 0
Rscripts/irc-post-commit-hook -> local/bin/scripts/irc-post-commit-hook | 0
Rscripts/mutag -> local/bin/scripts/mutag | 0
Rscripts/pmf -> local/bin/scripts/pmf | 0
Rscripts/shotz -> local/bin/scripts/shotz | 0
Rscripts/statusbar -> local/bin/scripts/statusbar | 0
Rscripts/todo -> local/bin/scripts/todo | 0
Rscripts/torwall -> local/bin/scripts/torwall | 0
Rscripts/zbm -> local/bin/scripts/zbm | 0
Rbash/.bash_aliases -> local/share/bash/bash_aliases | 0
Rbash/.bash_fun -> local/share/bash/bash_fun | 0
Rbash/.bash_functions -> local/share/bash/bash_functions | 0
Rbash/.bash_recon -> local/share/bash/bash_recon | 0
Rgpg/gpg.conf -> local/share/gnupg/gpg.conf | 0
Msetup | 36+++++++++++++++++-------------------

30 files changed, 40 insertions(+), 75 deletions(-)

diff --git a/.bashrc b/.bashrc
@@ -0,0 +1,23 @@
+[[ $- != *i* ]] && return
+
+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
+
+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: "
+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
diff --git a/bash/.bashrc b/bash/.bashrc
@@ -1,19 +0,0 @@
-[[ $- != *i* ]] && return
-
-export LC_CTYPE=en_US.UTF-8
-export LC_ALL=en_US.UTF-8
-
-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
-
-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
diff --git a/bash/.bashrc_thin b/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
diff --git a/xorg/.xinitrc b/config/X11/xinitrc
diff --git a/alacritty/.alacritty.toml b/config/alacritty/alacritty.toml
diff --git a/cmus/autosave b/config/cmus/autosave
diff --git a/dunst/dunstrc b/config/dunst/dunstrc
diff --git a/git/.gitconfig b/config/git/gitconfig
diff --git a/tmux/.tmux.conf b/config/tmux/tmux.conf
diff --git a/scripts/art/cowboy.txt b/local/bin/scripts/art/cowboy.txt
diff --git a/scripts/art/htp.txt b/local/bin/scripts/art/htp.txt
diff --git a/scripts/art/pussybones.txt b/local/bin/scripts/art/pussybones.txt
diff --git a/scripts/bomber b/local/bin/scripts/bomber
diff --git a/scripts/cmus-now b/local/bin/scripts/cmus-now
diff --git a/scripts/gitremote b/local/bin/scripts/gitremote
diff --git a/scripts/gotimon b/local/bin/scripts/gotimon
diff --git a/scripts/irc-post-commit-hook b/local/bin/scripts/irc-post-commit-hook
diff --git a/scripts/mutag b/local/bin/scripts/mutag
diff --git a/scripts/pmf b/local/bin/scripts/pmf
diff --git a/scripts/shotz b/local/bin/scripts/shotz
diff --git a/scripts/statusbar b/local/bin/scripts/statusbar
diff --git a/scripts/todo b/local/bin/scripts/todo
diff --git a/scripts/torwall b/local/bin/scripts/torwall
diff --git a/scripts/zbm b/local/bin/scripts/zbm
diff --git a/bash/.bash_aliases b/local/share/bash/bash_aliases
diff --git a/bash/.bash_fun b/local/share/bash/bash_fun
diff --git a/bash/.bash_functions b/local/share/bash/bash_functions
diff --git a/bash/.bash_recon b/local/share/bash/bash_recon
diff --git a/gpg/gpg.conf b/local/share/gnupg/gpg.conf
diff --git a/setup b/setup
@@ -98,7 +98,7 @@ setup_packages() {
 	fi
 	xbps-install -y cargo checkbashisms go make patch pkg-config python3 python3-pip
 	xbps-install -y ansible aws-cli python3-aiodns python3-aiofiles python3-aiohttp python3-boto3 python3-Flask terraform
-	xbps-install -y bluetuith 
+	xbps-install -y bluetuith
 
 	# Essentials
 	if [ $REMOTE = "dropbear" ]; then
@@ -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/cmus && wget -O $HOME/.config/cmus/autosave $GIT_URL/cmus/autosave
+    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 $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/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
 
-	wget -O $HOME/.xinitrc $GIT_URL/xorg/.xinitrc
+	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/*
 
-	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