From 8d3f9c8a1d5d2890edf4d793b23f569dd8031d8e Mon Sep 17 00:00:00 2001
From: Severin Kaderli <severin.kaderli@gmail.com>
Date: Wed, 13 Feb 2019 00:47:10 +0100
Subject: [PATCH] More config cleanup

Signed-off-by: Severin Kaderli <severin.kaderli@gmail.com>
---
 .gitlab-ci.yml                              |  4 +--
 README.md                                   |  2 +-
 install.sh                                  |  7 ++---
 post-install.sh                             |  2 +-
 system/.aliases                             |  7 +++--
 system/.bashrc                              |  6 +++++
 system/.config/X11/xsetup                   |  2 +-
 system/.config/npm/config                   |  4 +++
 system/.config/polybar/config               |  4 +--
 system/.env                                 | 29 ++++++++++++---------
 system/{ => .local}/bin/gw2.sh              |  0
 system/{ => .local}/bin/increase_volume.sh  |  0
 system/{ => .local}/bin/music.sh            |  0
 system/{ => .local}/bin/power.sh            |  0
 system/{ => .local}/bin/resolution.sh       |  0
 system/{ => .local}/bin/screenlock.sh       |  0
 system/{ => .local}/bin/server.sh           |  0
 system/{ => .local}/bin/submodule_update.sh |  0
 system/{ => .local}/bin/twitch.sh           |  0
 system/{ => .local}/bin/upgrade.sh          |  0
 system/{ => .local}/bin/utils.sh            |  4 +--
 system/{ => .local}/bin/watch.sh            |  0
 22 files changed, 44 insertions(+), 27 deletions(-)
 create mode 100644 system/.config/npm/config
 rename system/{ => .local}/bin/gw2.sh (100%)
 rename system/{ => .local}/bin/increase_volume.sh (100%)
 rename system/{ => .local}/bin/music.sh (100%)
 rename system/{ => .local}/bin/power.sh (100%)
 rename system/{ => .local}/bin/resolution.sh (100%)
 rename system/{ => .local}/bin/screenlock.sh (100%)
 rename system/{ => .local}/bin/server.sh (100%)
 rename system/{ => .local}/bin/submodule_update.sh (100%)
 rename system/{ => .local}/bin/twitch.sh (100%)
 rename system/{ => .local}/bin/upgrade.sh (100%)
 rename system/{ => .local}/bin/utils.sh (98%)
 rename system/{ => .local}/bin/watch.sh (100%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index be4b0d5..a9f49c5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,10 +4,10 @@ before_script:
   - apt-get update && apt-get install -y --no-install-recommends shellcheck
   - shopt -s expand_aliases
   - alias shellcheck="shellcheck -x --exclude=SC2034,SC1091,SC1090"
-  
+
 Lint:
   script:
-    - shellcheck ./system/bin/*
+    - shellcheck ./system/.local/bin/*
     - shellcheck ./system/.aliases
     - shellcheck ./system/.bash_logout
     - shellcheck ./system/.bash_profile
diff --git a/README.md b/README.md
index bb12342..6d4d8ed 100644
--- a/README.md
+++ b/README.md
@@ -98,7 +98,7 @@ This folder contains my configuration for the X-Server.
 ### `.config/Trolltech.conf`
 This file contains my QT4 configuration.
 
-### `bin`
+### `.local/bin`
 This folder contains a bunch of scripts that I use. Some of them are used by
 Polybar or i3 and others are used directly and some like `utils.sh` contain
 functions that I use in other scripts.
diff --git a/install.sh b/install.sh
index f5ddd72..dc36a99 100755
--- a/install.sh
+++ b/install.sh
@@ -13,7 +13,7 @@
 #
 # USAGE:
 # ./install.sh
-. ./system/bin/utils.sh
+. ./system/.local/bin/utils.sh
 
 #######################################
 # Configuration variables
@@ -47,6 +47,7 @@ LINKED_FILES_HOME=(
     ".config/httpie"
     ".config/i3"
     ".config/mpv"
+    ".config/npm"
     ".config/polybar"
     ".config/redshift"
     ".config/streamlink"
@@ -57,7 +58,7 @@ LINKED_FILES_HOME=(
     ".config/wget"
     ".config/X11"
     ".env"
-    "bin"
+    ".local/bin"
 )
 
 # Groups the user should be added to
@@ -102,7 +103,7 @@ do
 done
 
 print_header "Give permissions"
-set_permission severin 744 "${HOME}/bin"
+set_permission severin 744 "${XDG_BIN_HOME}"
 
 print_header "Add user to groups"
 for group in "${ADD_GROUPS[@]}"
diff --git a/post-install.sh b/post-install.sh
index 808f464..0a3aa04 100755
--- a/post-install.sh
+++ b/post-install.sh
@@ -13,7 +13,7 @@
 #
 # USAGE:
 # ./post-install.sh
-. ./system/bin/utils.sh
+. ./system/.local/bin/utils.sh
 
 #######################################
 # Configuration variables
diff --git a/system/.aliases b/system/.aliases
index bcf2ea7..35f2b26 100644
--- a/system/.aliases
+++ b/system/.aliases
@@ -31,7 +31,10 @@ alias pj="cd ~/Projects"
 alias e="code"
 
 # Alias for wget to use XDG directories
-alias wget="wget --hsts-file=\"${XDG_CACHE_HOME}/wget-hsts\""
+alias wget='wget --hsts-file="${XDG_CACHE_HOME}/wget-hsts"'
 
 # Alias for svn to use XDG directories
-alias svn="svn --config-dir \"${XDG_CONFIG_HOME}/subversion\""
\ No newline at end of file
+alias svn='svn --config-dir "${XDG_CONFIG_HOME}/subversion"'
+
+# Alias for gpg2 to use XDG directories
+alias gpg2='gpg2 --homedir "${XDG_DATA_HOME}/gnupg"'
\ No newline at end of file
diff --git a/system/.bashrc b/system/.bashrc
index 6c87f89..9e45024 100644
--- a/system/.bashrc
+++ b/system/.bashrc
@@ -17,6 +17,12 @@ shopt -s histappend
 shopt -s checkwinsize
 shopt -s globstar
 
+# XDG_Base_Directories
+export XDG_CONFIG_HOME="${HOME}/.config"
+export XDG_CACHE_HOME="${HOME}/.cache"
+export XDG_DATA_HOME="${HOME}/.local/share"
+export XDG_BIN_HOME="${HOME}/.local/bin"
+
 # Sourcing environment variables
 if [ -f "${HOME}/.env" ]; then
     . "${HOME}/.env"
diff --git a/system/.config/X11/xsetup b/system/.config/X11/xsetup
index c425a10..0625114 100644
--- a/system/.config/X11/xsetup
+++ b/system/.config/X11/xsetup
@@ -31,4 +31,4 @@ xrdb -merge "${XDG_CONFIG_HOME}/X11/xresources"
 # Start ibus
 #ibus-daemon -drx
 
-. "${HOME}/bin/resolution.sh"
+. "${XDG_BIN_HOME}/resolution.sh"
diff --git a/system/.config/npm/config b/system/.config/npm/config
new file mode 100644
index 0000000..a598afa
--- /dev/null
+++ b/system/.config/npm/config
@@ -0,0 +1,4 @@
+prefix=${XDG_DATA_HOME}/npm
+cache=${XDG_CACHE_HOME}/npm
+tmp=${XDG_RUNTIME_DIR}/npm
+init-module=${XDG_CONFIG_HOME}/npm/config/npm-init.js
\ No newline at end of file
diff --git a/system/.config/polybar/config b/system/.config/polybar/config
index c5997ef..6e467cd 100644
--- a/system/.config/polybar/config
+++ b/system/.config/polybar/config
@@ -239,7 +239,7 @@ label = %output%
 
 interval = 5
 
-click-left = $HOME/bin/power.sh
+click-left = ${XDG_BIN_HOME}/power.sh
 
 
 #######################################
@@ -247,7 +247,7 @@ click-left = $HOME/bin/power.sh
 #######################################
 [module/music]
 type = custom/script
-exec = $HOME/bin/music.sh
+exec = ${XDG_BIN_HOME}/music.sh
 
 format = <label>
 label = %output%
diff --git a/system/.env b/system/.env
index 54fbf17..9f2ac1a 100644
--- a/system/.env
+++ b/system/.env
@@ -11,12 +11,7 @@
 #
 # USAGE:
 # This script is sourced by .bashrc
-. "${HOME}/bin/utils.sh"
-
-# XDG_Base_Directories
-export XDG_CONFIG_HOME="${HOME}/.config"
-export XDG_CACHE_HOME="${HOME}/.cache"
-export XDG_DATA_HOME="${HOME}/.local/share"
+. "${XDG_BIN_HOME}/utils.sh"
 
 # XDG Overrides for unsupported programs 
 export HTTPIE_CONFIG_DIR="${XDG_CONFIG_HOME}/httpie"
@@ -31,6 +26,14 @@ export GTK_RC_FILES="${XDG_CONFIG_HOME}/gtk-1.0/gtkrc"
 export GTK2_RC_FILES="${XDG_CONFIG_HOME}/gtk-2.0/gtkrc"
 export XINITRC="${XDG_CONFIG_HOME}/X11/xinitrc"
 export XSERVERRC="${XDG_CONFIG_HOME}/X11/xserverrc"
+export NPM_CONFIG_USERCONFIG="${XDG_CONFIG_HOME}/npm/config"
+export NODE_REPL_HISTORY="${XDG_DATA_HOME}/node/repl_history"
+export GOPATH="${XDG_DATA_HOME}/go"
+export GNUPGHOME="${XDG_DATA_HOME}/gnupg"
+export GEM_HOME="${XDG_DATA_HOME}/gem"
+export GEM_SPEC_CACHE="${XDG_CACHE_HOME}/gem/specs"
+mkdir -p "${XDG_DATA_HOME}/wine/prefixes"
+export WINEPREFIX="${XDG_DATA_HOME}/wine/prefixes/default"
 
 # Bash
 export HISTCONTROL=ignoreboth
@@ -43,7 +46,7 @@ export EDITOR="$VISUAL"
 export TERMINAL=termite
 
 # QT
-export T_QPA_PLATFORMTHEME=gtk2
+export QT_QPA_PLATFORMTHEME=gtk2
 export QT_STYLE_OVERRIDE=gtk2
 
 # Ibus
@@ -51,14 +54,14 @@ export GTK_IM_MODULE=xim
 export XMODIFIERS=@im=ibus
 export QT_IM_MODULE=xim
 
-# Node.js
-export npm_config_prefix="$HOME/.node_modules"
-
-# Go
-export GOPATH=$HOME/go
 
 # Adding folders to the PATH variable
-export PATH="${PATH}:${CARGO_HOME}/bin:${HOME}/bin:${npm_config_prefix}/bin:${GOPATH/}bin:${HOME}/.config/composer/vendor/bin"
+export PATH="${PATH}:${HOME}/.local/bin"
+export PATH="${PATH}:${CARGO_HOME}/bin"
+export PATH="${PATH}:${XDG_DATA_HOME}/npm/bin"
+export PATH="${PATH}:${GOPATH}/bin"
+export PATH="${PATH}:${GEM_HOME}/bin"
+export PATH="${PATH}:${XDG_CONFIG_HOME}/composer/vendor/bin"
 
 # Set bash prompt
 set_bash_prompt() {
diff --git a/system/bin/gw2.sh b/system/.local/bin/gw2.sh
similarity index 100%
rename from system/bin/gw2.sh
rename to system/.local/bin/gw2.sh
diff --git a/system/bin/increase_volume.sh b/system/.local/bin/increase_volume.sh
similarity index 100%
rename from system/bin/increase_volume.sh
rename to system/.local/bin/increase_volume.sh
diff --git a/system/bin/music.sh b/system/.local/bin/music.sh
similarity index 100%
rename from system/bin/music.sh
rename to system/.local/bin/music.sh
diff --git a/system/bin/power.sh b/system/.local/bin/power.sh
similarity index 100%
rename from system/bin/power.sh
rename to system/.local/bin/power.sh
diff --git a/system/bin/resolution.sh b/system/.local/bin/resolution.sh
similarity index 100%
rename from system/bin/resolution.sh
rename to system/.local/bin/resolution.sh
diff --git a/system/bin/screenlock.sh b/system/.local/bin/screenlock.sh
similarity index 100%
rename from system/bin/screenlock.sh
rename to system/.local/bin/screenlock.sh
diff --git a/system/bin/server.sh b/system/.local/bin/server.sh
similarity index 100%
rename from system/bin/server.sh
rename to system/.local/bin/server.sh
diff --git a/system/bin/submodule_update.sh b/system/.local/bin/submodule_update.sh
similarity index 100%
rename from system/bin/submodule_update.sh
rename to system/.local/bin/submodule_update.sh
diff --git a/system/bin/twitch.sh b/system/.local/bin/twitch.sh
similarity index 100%
rename from system/bin/twitch.sh
rename to system/.local/bin/twitch.sh
diff --git a/system/bin/upgrade.sh b/system/.local/bin/upgrade.sh
similarity index 100%
rename from system/bin/upgrade.sh
rename to system/.local/bin/upgrade.sh
diff --git a/system/bin/utils.sh b/system/.local/bin/utils.sh
similarity index 98%
rename from system/bin/utils.sh
rename to system/.local/bin/utils.sh
index cef3ddc..b108722 100755
--- a/system/bin/utils.sh
+++ b/system/.local/bin/utils.sh
@@ -15,7 +15,7 @@
 #######################################
 # Directory variables
 #######################################
-DIR="$( cd "$(dirname "${BASH_SOURCE[0]}" )" && cd ../../ && pwd)"
+DIR="$( cd "$(dirname "${BASH_SOURCE[0]}" )" && cd ../../../ && pwd)"
 SYSTEM_DIR="${DIR}/system"
 PACKAGES_DIR="${DIR}/packages"
 
@@ -102,4 +102,4 @@ function enable_service() {
 function copy_udev_rule() {
     print_log "Copying ${YELLOW}$(basename "${1}")${RESET} to ${YELLOW}/etc/udev/rules.d/${RESET}"
     sudo cp "${1}" "/etc/udev/rules.d/"
-}
\ No newline at end of file
+}
diff --git a/system/bin/watch.sh b/system/.local/bin/watch.sh
similarity index 100%
rename from system/bin/watch.sh
rename to system/.local/bin/watch.sh