From 56266b3e0dea13ca58277d12e72b43f12ad9fbb5 Mon Sep 17 00:00:00 2001
From: tdro <tdro@users.noreply.github.com>
Date: Tue, 1 Mar 2022 07:26:56 -0500
Subject: .bash_profile: Cleanup and reorder environment variables

---
 .bash_profile | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

(limited to '.bash_profile')

diff --git a/.bash_profile b/.bash_profile
index f1080ed..1fc44a9 100644
--- a/.bash_profile
+++ b/.bash_profile
@@ -9,7 +9,6 @@ prefixPath() {
   export PATH;
 }
 
-# path exports
 prefixPath "$HOME/.local/bin";
 prefixPath "$HOME/.local/bin/scripts";
 
@@ -18,27 +17,24 @@ prefixPath "$HOME/.local/bin/scripts";
   && command -v nix && "$HOME"/.local/bin/scripts/nix-xorg-conf > "$HOME"/.config/X11/xorg.conf.d/00-modules.conf \
   && exec sx;
 
-# set umask
 umask 0022;
 
-# set prompt
 PS1_USER='$(E=$? && [ "$E" = 0 ] || echo "$E ")\[\e[0;34m\]\W\[\e[0m\] \[\e[0;34m\]\$\[\e[0m\] '
 PS1_ROOT='$(E=$? && [ "$E" = 0 ] || echo "$E ")\[\e[0;31m\]\W\[\e[0m\] \[\e[0;31m\]\$\[\e[0m\] '
 PS1_SSHD='$(E=$? && [ "$E" = 0 ] || echo "$E ")\[\e[0;32m\]\W\[\e[0m\] \[\e[0;32m\]\$\[\e[0m\] '
 
-# export prompt
 [ "$EUID" != 0 ] && export PS1="$PS1_USER";
 [ "$EUID" = 0 ] && export PS1="$PS1_ROOT";
 
-# ssh set prompt
 [ -n "$SSH_CLIENT" ] && [ "$EUID" != 0 ] && export PS1="$PS1_SSHD";
 
-# xdg exports
 export XDG_CACHE_HOME="$HOME/.cache"
 export XDG_CONFIG_HOME="$HOME/.config"
 export XDG_DATA_HOME="$HOME/.local/share"
 
-# general exports
+export DESKTOP_SESSION=gnome
+export XDG_CURRENT_DESKTOP=gnome
+
 export BROWSER=browser;
 export CARGO_HOME="$XDG_CACHE_HOME/cargo"
 export DOWNLOAD_KEYSERVER="hkp://keyserver.ubuntu.com"
@@ -47,6 +43,7 @@ export FZF_DIRECTORY_MARKS=$XDG_CONFIG_HOME/fzf/marks/directories
 export FZF_FILE_MARKS=$XDG_CONFIG_HOME/fzf/marks/files
 export GNUPGHOME="$XDG_DATA_HOME/gnupg"
 export GOPATH="$XDG_DATA_HOME/go"
+export GTK2_RC_FILES="$HOME/.gtkrc-2.0"
 export GTK_OVERLAY_SCROLLING=0
 export HISTCONTROL=ignoreboth:erasedups
 export HISTFILESIZE=-1
@@ -67,16 +64,10 @@ export TERMINAL=urxvt
 export TEXINPUTS=$XDG_DATA_HOME/tex:
 export WEECHAT_HOME="$XDG_CONFIG_HOME/weechat"
 
-# themes
-export DESKTOP_SESSION=gnome
-export XDG_CURRENT_DESKTOP=gnome
-export GTK2_RC_FILES="$HOME/.gtkrc-2.0"
-
 command -v rsvg-convert > /dev/null 2>&1 && \
   GDK_PIXBUF_MODULE_FILE=$(printf "%s" "$HOME"/.nix-profile/lib/gdk-pixbuf*/*/loaders.cache) && \
   export GDK_PIXBUF_MODULE_FILE
 
-# fzf settings
 export FZF_DEFAULT_OPTS="\
  --inline-info \
  --color=fg:255,hl:203 \
@@ -84,5 +75,4 @@ export FZF_DEFAULT_OPTS="\
  --color=info:188,prompt:69,pointer:199 \
  --color=marker:109,spinner:236,header:255"
 
-# source bashrc
 [ -z "$BASH_PROFILE" ] && . "$HOME/.bashrc"
-- 
cgit v1.2.3