From 97e81c911e52179a3f0eebc9effdf2466e9b7f4a Mon Sep 17 00:00:00 2001
From: Alex <alex@ahubbard.xyz>
Date: Sat, 12 Mar 2022 23:15:13 -0600
Subject: [PATCH] cleanup of .profile

---
 .config/shell/cleanup.sh           | 33 +++++++++++++
 .config/shell/wayland.sh           | 10 ++++
 .local/installers/artix-install.sh | 13 ++---
 .local/scripts/update-hosts        |  4 +-
 .profile                           | 79 ++++++++++--------------------
 5 files changed, 80 insertions(+), 59 deletions(-)
 create mode 100755 .config/shell/cleanup.sh
 create mode 100755 .config/shell/wayland.sh

diff --git a/.config/shell/cleanup.sh b/.config/shell/cleanup.sh
new file mode 100755
index 0000000..ac88e72
--- /dev/null
+++ b/.config/shell/cleanup.sh
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+#remove things from $HOME
+export XDG_CONFIG_HOME="$HOME/.config"
+export XDG_CONFIG_DIRS="$HOME/.config"
+export XDG_DATA_HOME="$HOME/.local/share"
+export XDG_CACHE_HOME="$HOME/.cache"
+export XDG_DOCUMENTS_DIR="$HOME/docs"
+export XDG_DOWNLOAD_DIR="$HOME/dl"
+export XDG_MUSIC_DIR="$HOME/media/audio/music"
+export XDG_PICTURES_DIR="$HOME/media/img"
+export XDG_VIDEOS_DIR="$HOME/media/video"
+export HISTFILE="$XDG_DATA_HOME"/bash/history
+#XDG_DESKTOP_DIR="$HOME/Desktop"
+#XDG_PUBLICSHARE_DIR="$HOME/Public"
+#XDG_TEMPLATES_DIR="$HOME/Templates"
+
+export NOTMUCH_CONFIG="${XDG_CONFIG_HOME:-$HOME/.config}/notmuch-config"
+export GTK2_RC_FILES="${XDG_CONFIG_HOME:-$HOME/.config}/gtk-2.0/gtkrc-2.0"
+export WGETRC="${XDG_CONFIG_HOME:-$HOME/.config}/wget/wgetrc"
+export INPUTRC="${XDG_CONFIG_HOME:-$HOME/.config}/inputrc"
+#export ALSA_CONFIG_PATH="$XDG_CONFIG_HOME/alsa/asoundrc"
+export WINEPREFIX="$XDG_DATA_HOME/wineprefixes/default"
+export STACK_ROOT="$XDG_DATA_HOME"/stack
+export PASSWORD_STORE_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/password-store"
+export GNUPGHOME="$XDG_DATA_HOME/gnupg"
+export CARGO_HOME="${XDG_DATA_HOME:-$HOME/.local/share}/cargo"
+export GOPATH="${XDG_DATA_HOME:-$HOME/.local/share}/go"
+export ANSIBLE_CONFIG="${XDG_CONFIG_HOME:-$HOME/.config}/ansible/ansible.cfg"
+export TMUX_TMPDIR="$XDG_RUNTIME_DIR"
+export ANDROID_SDK_HOME="${XDG_CONFIG_HOME:-$HOME/.config}/android"
+export MBSYNCRC="${XDG_CONFIG_HOME:-$HOME/.config}/mbsync/config"
+export ELECTRUMDIR="${XDG_DATA_HOME:-$HOME/.local/share}/electrum"
diff --git a/.config/shell/wayland.sh b/.config/shell/wayland.sh
new file mode 100755
index 0000000..714c1f1
--- /dev/null
+++ b/.config/shell/wayland.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+BEMENU_CONF="$HOME/.config/bemenu/bemenu_opts.sh"
+[ -f "$BEMENU_CONF" ] && . "$BEMENU_CONF" 
+#End wayland config
+
+#make librewolf use wayland
+export GDK_BACKEND=wayland 
+export MOZ_ENABLE_WAYLAND=1
+
diff --git a/.local/installers/artix-install.sh b/.local/installers/artix-install.sh
index a356f6c..4ce8f82 100755
--- a/.local/installers/artix-install.sh
+++ b/.local/installers/artix-install.sh
@@ -8,18 +8,19 @@ echo "    press return to begin installation. crtl + c to cancel"
 read input
 
 #####################################################################
-sh ./artix/repo-enable.sh
-sh ./artix/config.sh
-sh ./artix/devel.sh
-sh ./artix/gaming.sh
-sh ./artix/runit-config.sh
-sh ./artix/wireless.sh
+sh ./artix/repo-enable.sh #enables arch repos, lib32 multilib, community, and prompts for universe repo
 
 sudo sh -c 'pacman -S - < artix/pkgs/base.txt' 
 sudo sh -c 'pacman -S - < artix/pkgs/user.txt' 
 sudo sh -c 'pacman -S - < artix/pkgs/wm.txt' 
 sudo sh -c 'yay -S - < artix/pkgs/aur.txt' 
 
+sh ./artix/devel.sh
+sh ./artix/gaming.sh
+sh ./artix/runit-config.sh
+sh ./artix/wireless.sh
+sh ./artix/config.sh   
+
 #install local git repos, needed for wm.txt
 sh ~/.local/scripts/install.sh add-repos ~/.local/installers/repos.txt
 
diff --git a/.local/scripts/update-hosts b/.local/scripts/update-hosts
index 1f48ee6..a69681a 100755
--- a/.local/scripts/update-hosts
+++ b/.local/scripts/update-hosts
@@ -8,6 +8,8 @@
 #
 # ==================
 
+BLOCKFILE="$HOME/.config/blocklist"
+
 update() {
     mkdir -p ~/.local/share/update_hosts
     cd ~/.local/share/update_hosts
@@ -26,7 +28,7 @@ update() {
 
     curl https://raw.githubusercontent.com/StevenBlack/hosts/master/alternates/porn/hosts -o ./.sb_hosts
 
-    [ -f "~/.config/blocklist" ] && sed 's/^/127.0.0.1    /g' ~/.config/blocklist > ./blocklist
+    [ -f "$BLOCKFILE" ] && echo "blocklist file found." && sed 's/^/127.0.0.1    /g' "$BLOCKFILE" > ./blocklist
 
     if [ -f "./blocklist" ]; then
         cat ./.hosts.orig ./.swc_hosts ./.sb_hosts ./blocklist  > ./hosts
diff --git a/.profile b/.profile
index 5878e8b..9c1129a 100644
--- a/.profile
+++ b/.profile
@@ -3,11 +3,9 @@
 # Get the aliases and functions
 #[ -f $HOME/.bashrc ] && . $HOME/.bashrc
 
-#Wayland config
-BEMENU_CONF="$HOME/.config/bemenu/bemenu_opts.sh"
-[ -f "$BEMENU_CONF" ] && . "$BEMENU_CONF" 
-#End wayland config
-
+#source ~/.config/shell config files
+. "$HOME"/.config/shell/cleanup.sh
+. "$HOME"/.config/shell/wayland.sh
 
 #export PF_ASCII="artix"  #set ascii art for pfetch
 # OFF by default: shell editor wm de palette
@@ -15,59 +13,36 @@ export PF_INFO="ascii title os kernel uptime pkgs memory shell wm"
 
 export XCURSOR_THEME=Adwaita
 
-#make librewolf use wayland
-export GDK_BACKEND=wayland 
-export MOZ_ENABLE_WAYLAND=1
-
-#remove things from $HOME
-export XDG_CONFIG_HOME="$HOME/.config"
-export XDG_CONFIG_DIRS="$HOME/.config"
-export XDG_DATA_HOME="$HOME/.local/share"
-export XDG_CACHE_HOME="$HOME/.cache"
-export XDG_DOCUMENTS_DIR="$HOME/docs"
-export XDG_DOWNLOAD_DIR="$HOME/dl"
-export XDG_MUSIC_DIR="$HOME/media/audio/music"
-export XDG_PICTURES_DIR="$HOME/media/img"
-export XDG_VIDEOS_DIR="$HOME/media/video"
-export HISTFILE="$XDG_DATA_HOME"/bash/history
-#XDG_DESKTOP_DIR="$HOME/Desktop"
-#XDG_PUBLICSHARE_DIR="$HOME/Public"
-#XDG_TEMPLATES_DIR="$HOME/Templates"
-
-export ZDOTDIR="$HOME/.config/zsh"
-export NOTMUCH_CONFIG="${XDG_CONFIG_HOME:-$HOME/.config}/notmuch-config"
-export GTK2_RC_FILES="${XDG_CONFIG_HOME:-$HOME/.config}/gtk-2.0/gtkrc-2.0"
-export WGETRC="${XDG_CONFIG_HOME:-$HOME/.config}/wget/wgetrc"
-export INPUTRC="${XDG_CONFIG_HOME:-$HOME/.config}/inputrc"
-#export ALSA_CONFIG_PATH="$XDG_CONFIG_HOME/alsa/asoundrc"
-export WINEPREFIX="$XDG_DATA_HOME/wineprefixes/default"
-export STACK_ROOT="$XDG_DATA_HOME"/stack
-export PASSWORD_STORE_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/password-store"
-export GNUPGHOME="$XDG_DATA_HOME/gnupg"
-export CARGO_HOME="${XDG_DATA_HOME:-$HOME/.local/share}/cargo"
-export GOPATH="${XDG_DATA_HOME:-$HOME/.local/share}/go"
-export ANSIBLE_CONFIG="${XDG_CONFIG_HOME:-$HOME/.config}/ansible/ansible.cfg"
-
 #other settings
 #export QT_QPA_PLATFORMTHEME="gtk2"  # Have QT use gtk2 theme. must have qt5-styleplugins installed
 export QT_QPA_PLATFORMTHEME="qt5ct"  #have QT use qt5ct theme  
 
-export LESSHISTFILE=/dev/null
+export LESSHISTFILE="-"
+
+export ZDOTDIR="$HOME/.config/zsh"
 
 #get colored man pages
-export LESS_TERMCAP_mb=$'\e[1;32m'
-export LESS_TERMCAP_md=$'\e[1;32m'
-export LESS_TERMCAP_me=$'\e[0m'
-export LESS_TERMCAP_se=$'\e[0m'
-export LESS_TERMCAP_so=$'\e[01;33m'
-export LESS_TERMCAP_ue=$'\e[0m'
-export LESS_TERMCAP_us=$'\e[1;4;31m'
+#export LESS_TERMCAP_mb=$'\e[1;32m'
+#export LESS_TERMCAP_md=$'\e[1;32m'
+#export LESS_TERMCAP_me=$'\e[0m'
+#export LESS_TERMCAP_se=$'\e[0m'
+#export LESS_TERMCAP_so=$'\e[01;33m'
+#export LESS_TERMCAP_ue=$'\e[0m'
+#export LESS_TERMCAP_us=$'\e[1;4;31m'
+
+export LESS_TERMCAP_mb="$(printf '%b' '')"
+export LESS_TERMCAP_md="$(printf '%b' '')"
+export LESS_TERMCAP_me="$(printf '%b' '')"
+export LESS_TERMCAP_so="$(printf '%b' '')"
+export LESS_TERMCAP_se="$(printf '%b' '')"
+export LESS_TERMCAP_us="$(printf '%b' '')"
+export LESS_TERMCAP_ue="$(printf '%b' '')"
 
 export MANPAGER=less
 
 #set preferred programs
-export EDITOR=vim
-export VISUAL=vim
+export EDITOR=nvim
+export VISUAL=nvim
 export BROWSER=browser.sh
 export TERMINAL=alacritty
 
@@ -79,10 +54,10 @@ export SFEED_URL_FILE="$HOME/.local/share/sfeed/read"
 . "$HOME"/.config/lf/lf-icons.sh
 
 # Add ~/.local/bin/ ~/.local/scripts/ and to PATH
-    export PATH="$HOME/.local/bin:$PATH"
-    export PATH="$HOME/.local/appimages:$PATH"
-    export PATH="$HOME/.local/scripts:$PATH"
-    #export PATH=$GOPATH/bin:$PATH
+export PATH="$HOME/.local/bin:$PATH"
+export PATH="$HOME/.local/appimages:$PATH"
+export PATH="$HOME/.local/scripts:$PATH"
+#export PATH=$GOPATH/bin:$PATH
 
 export MANPATH="$MANPATH:/usr/local/man/"