words are hard

1 files changed, 25 insertions, 12 deletions

diff --git a/.bashrc b/.bashrc
index 15df153..a7196b3 100644
--- a/.bashrc
+++ b/.bashrc
@@ -56,11 +56,6 @@ if [ -n "$force_color_prompt" ]; then
     fi
 fi
 
-if [ "$color_prompt" = yes ]; then
-    PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
-else
-    PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
-fi
 unset color_prompt force_color_prompt
 
 # If this is an xterm set the title to user@host:dir
@@ -114,17 +109,35 @@ fi
 # Set vi mode as the default mode
 set -o vi
 
+# Groff shenanigans
+groffe(){
+    groff -Kutf8 -Tpdf -mec -ms $1.ms > $1.pdf
+}
+
+# Opam configuration
+test -r /home/filipek/.opam/opam-init/init.sh && . /home/filipek/.opam/opam-init/init.sh > /dev/null 2> /dev/null || true
+
 # Set options for some frequently used programs
 export LS_OPTIONS='-lha --color=auto'
 export TAR_EXTRACT='-xvzf'
 export TAR_ARCHIVE='-cvzf'
 export MKDIR_OPTIONS='-p'
+export RSYNC_OPTIONS='-rtvzP'
+export MANPAGER="vim -M +MANPAGER - "
 
-# Groff shenanigans
-groffe(){
-    groff -Kutf8 -Tpdf -mec -ms $1.ms > $1.pdf
-}
+export PATH=$HOME/.scripts:$HOME/.cargo/bin:$PATH
+export EDITOR="vim"
+export BROWSER="librewolf"
 
-# Bind Esc to CapsLock and vice versa
-export MANPAGER="vim -M +MANPAGER - "
-setxkbmap -option caps:swapescape
+# GPG Config
+GPG_TTY=$(tty)
+export GPG_TTY
+
+# Prompt colors
+export PS1="\[$(tput setaf 2)\]\u\[$(tput setaf 35)\]@\[$(tput setaf 10)\]\h \[$(tput setaf 33)\]\w \[$(tput sgr0)\]$ "
+
+# Run these scripts at login
+bash remaps
+
+source auxless
+source add-alias