Let my HOME alone 1/2

Xresources

@@ -1,4 +0,0 @@
-#include ".Xresources.d/xft"
-#include ".Xresources.d/theme"
-#include ".Xresources.d/xterm"
-#include ".Xresources.d/urxvt"

bower

@@ -1 +0,0 @@
-.cache/bower

cargo

@@ -1 +0,0 @@
-.cache/cargo

config/Xresources/main

@@ -0,0 +1,4 @@
+#include ".config/Xresources/xft"
+#include ".config/Xresources/theme"
+#include ".config/Xresources/xterm"
+#include ".config/Xresources/urxvt"

config/autorandr/postswitch

@@ -22,5 +22,5 @@ if [ ! -e "$filepath" ]; then
     wget -c "$url" -O "$filepath"
 fi
 
-feh --bg-fill "$filepath"
+feh --no-fehbg --bg-fill "$filepath"
 

config/git/config

@@ -4,7 +4,7 @@
 	signingkey = D8A7ECA00A8CD3DD
 [core]
 	editor = nvim
-	excludesfile = ~/.gitignore
+	excludesfile = ~/.config/git/gitignore
 [push]
 	default = matching
 [alias]

config/git/gitk

@@ -0,0 +1,62 @@
+set mainfont {sans 9}
+set textfont {monospace 9}
+set uifont {sans 9 bold}
+set tabstop 8
+set findmergefiles 0
+set maxgraphpct 50
+set maxwidth 16
+set cmitmode patch
+set wrapcomment none
+set autoselect 1
+set autosellen 40
+set showneartags 1
+set maxrefs 20
+set visiblerefs {"master"}
+set hideremotes 0
+set showlocalchanges 1
+set datetimeformat {%Y-%m-%d %H:%M:%S}
+set limitdiffs 1
+set uicolor grey85
+set want_ttk 1
+set bgcolor white
+set fgcolor black
+set uifgcolor black
+set uifgdisabledcolor #999
+set colors {"#00ff00" red blue magenta darkgrey brown orange}
+set diffcolors {red "#00a000" blue}
+set mergecolors {red blue "#00ff00" purple brown "#009090" magenta "#808000" "#009000" "#ff0080" cyan "#b07070" "#70b0f0" "#70f0b0" "#f0b070" "#ff70b0"}
+set markbgcolor #e0e0ff
+set diffcontext 3
+set selectbgcolor gray85
+set foundbgcolor yellow
+set currentsearchhitbgcolor orange
+set extdifftool meld
+set perfile_attrs 0
+set headbgcolor #00ff00
+set headfgcolor black
+set headoutlinecolor black
+set remotebgcolor #ffddaa
+set tagbgcolor yellow
+set tagfgcolor black
+set tagoutlinecolor black
+set reflinecolor black
+set filesepbgcolor #aaaaaa
+set filesepfgcolor black
+set linehoverbgcolor #ffff80
+set linehoverfgcolor black
+set linehoveroutlinecolor black
+set mainheadcirclecolor yellow
+set workingfilescirclecolor red
+set indexcirclecolor #00ff00
+set circlecolors {white blue gray blue blue}
+set linkfgcolor blue
+set circleoutlinecolor black
+set geometry(main) 1920x1012+0+18
+set geometry(state) normal
+set geometry(topwidth) 1920
+set geometry(topheight) 225
+set geometry(pwsash0) "480 1"
+set geometry(pwsash1) "720 1"
+set geometry(botwidth) 600
+set geometry(botheight) 782
+set permviews {}

config/pulse/client.conf

@@ -0,0 +1,2 @@
+auth-cookie = .config/pulse/esd-auth-cookie
+cookie-file = .config/pulse/pulse-cookie

config/scripts/mel

@@ -63,7 +63,7 @@ config = None
 def notmuch_new():
     close_database()
     log.info("Indexing mails")
-    notmuchConfigPath = os.path.expanduser("~/.notmuchrc") # TODO Better
+    notmuchConfigPath = os.path.expanduser("~/.config/notmuch-config") # TODO Better
     cmd = ["notmuch", "--config", notmuchConfigPath, "new"]
     log.debug(" ".join(cmd))
     subprocess.run(cmd)
@@ -532,7 +532,7 @@ if __name__ == "__main__":
     def func_fetch(args):
         # Fetch mails
         log.info("Fetching mails")
-        mbsyncConfigPath = os.path.expanduser("~/.mbsyncrc") # TODO Better
+        mbsyncConfigPath = os.path.expanduser("~/.config/mbsyncrc") # TODO Better
         cmd = ["mbsync", "--config", mbsyncConfigPath, "--all"]
         subprocess.run(cmd)
 

config/scripts/melConf

@@ -183,7 +183,7 @@ for name, account in accounts.items():
         secconf += "\nCertificateFile {certificate}".format(**account)
     imappassEscaped = account["imappass"].replace("\\", "\\\\")
     mbsyncStr += MBSYNC_ACCOUNT.format(**account, secconf=secconf, imappassEscaped=imappassEscaped)
-mbsyncFilepath = os.path.join(os.path.expanduser('~'), '.mbsyncrc')
+mbsyncFilepath = os.path.join(os.path.expanduser('~'), '.config/mel/mbsyncrc')
 with open(mbsyncFilepath, 'w') as f:
     f.write(mbsyncStr)
 
@@ -208,7 +208,7 @@ tls on
 msmtpStr = MSMTP_BEGIN
 for name, account in accounts.items():
     msmtpStr += MSMTP_ACCOUNT.format(**account)
-mbsyncFilepath = os.path.join(os.path.expanduser('~'), '.msmtprc')
+mbsyncFilepath = os.path.join(os.path.expanduser('~'), '.config/msmtp/config')
 with open(mbsyncFilepath, 'w') as f:
     f.write(msmtpStr)
 
@@ -241,7 +241,7 @@ other_email = mails.copy()
 other_email.remove(general["main"]["from"])
 other_email = ";".join(other_email)
 notmuchStr = NOTMUCH_BEGIN.format(**general, other_email=other_email)
-mbsyncFilepath = os.path.join(os.path.expanduser('~'), '.notmuchrc')
+mbsyncFilepath = os.path.join(os.path.expanduser('~'), '.config/notmuch-config')
 with open(mbsyncFilepath, 'w') as f:
     f.write(notmuchStr)
 

config/shell/commonrc

@@ -29,4 +29,4 @@ FZF_COMPLETION_OPTS="${FZF_CTRL_T_OPTS}"
 ## FUNCTIONS
 
 ## MISC
-trysource ~/.gscripts/gprofile
+trysource ~/.config/gscripts/gprofile

config/shell/shenv

@@ -13,13 +13,34 @@ export BROWSER=firefox
 # Program-specific
 
 [ -z "$SSH_AUTH_SOCK"  ] && [ -x "$(command -v ssh-agent)" ] && eval "$(ssh-agent -s)"
-export GOPATH=$HOME/.cache/go
-# export JAVA_FONTS=/usr/share/fonts/TTF
+
+direnv() { # environment variable name, path
+    export "$1"="$2"
+    mkdir -p "$2"
+}
+
+export JAVA_FONTS=/usr/share/fonts/TTF # 2019-04-25 Attempt to remove .java/fonts remove if it didn't work
 # export ANDROID_HOME=/opt/android-sdk
 # export ARDUINO=/usr/share/arduino
 # export ARDUINO_DIR=$ARDUINO
 # export ARDMK_VENDOR=archlinux-arduino
 
+direnv GOPATH "$HOME/.cache/go"
+direnv CARGOHOME "$HOME/.cache/cargo" # There are config in there that we can version if one want
+direnv CCACHE_BASEDIR "$HOME/.cache/ccache"
+export CCACHE_CONFIGPATH="$HOME/.config/ccache.conf"
+direnv GNUPGHOME "$HOME/.config/gnupg"
+export INPUTRC="$HOME/.config/inputrc"
+export LESSHISTFILE="$HOME/.cache/lesshst"
+direnv MONO_GAC_PREFIX "$HOME/.cache/mono"
+export NODE_REPL_HISTORY="$HOME/.cache/node_repl_history"
+direnv npm_config_cache "$HOME/.cache/npm"
+direnv PARALLEL_HOME "$HOME/.cache/parallel"
+
+
+# For programs that think $HOME is a reasonable place to put their junk
+direnv JUNKHOME "$HOME/.cache/junkhome"
+
 # Path
 
 # Function stolen from Arch Linux /etc/profile
@@ -40,7 +61,7 @@ appendpath() {
 appendpath '/usr/lib/ccache/bin'
 appendpath "${GOPATH}/bin"
 appendpath "$HOME/.local/bin"
-appendpath "$HOME/.scripts"
+appendpath "$HOME/.config/scripts"
 
 # If running on termux, load those extra scripts
 [ -d /data/data/com.termux/ ] && (

config/shell/shrc

@@ -35,6 +35,24 @@ alias n='urxvtc &'
 alias x='startx; logout'
 alias nx='nvidia-xrun; logout'
 
+# For programs that think $HOME is a reasonable place to put their junk
+alias adb='HOME=$JUNKHOME adb'
+alias audacity='HOME=$JUNKHOME audacity'
+alias binwalk='HOME=$JUNKHOME binwalk' # Should use .config according to the GitHub code though
+alias cabal='HOME=$JUNKHOME cabal' # TODO May have options but last time I tried it it crashed
+alias cmake='HOME=$JUNKHOME cmake'
+alias ddd='HOME=$JUNKHOME ddd'
+alias ghidra='HOME=$JUNKHOME ghidra'
+alias itch='HOME=$JUNKHOME itch'
+# TODO Maybe we can do something about node-gyp
+
+alias bower='bower --config.storage.packages=~/.cache/bower/packages --config.storage.registry=~/.cache/bower/registry --config.storage.links=~/.cache/bower/links'
+alias gdb='gdb -x $HOME/.config/gdbinit'
+alias iftop='iftop -c $HOME/.config/iftoprc'
+alias lmms='lmms --config $HOME/.config/lmmsrc.xml'
+
+# TODO ruby's gem when I find a use for it
+
 # FUNCTIONS
 trysource() {
     if [ -f "$1" ]

config/systemd/user/melfetch.service

@@ -3,4 +3,4 @@ Description=Meh mail client new mail fetcher
 
 [Service]
 Type=oneshot
-ExecStart=/home/geoffrey/.scripts/mel fetch
+ExecStart=/home/geoffrey/.config/scripts/mel fetch

dmrc

@@ -1,3 +0,0 @@
-[Desktop]
-Language=fr_FR.utf8
-Session=i3

face.icon

@@ -1 +0,0 @@
-.face

gem

@@ -1 +0,0 @@
-.cache/gem

gtkrc-2.0

@@ -1,19 +0,0 @@
-# DO NOT EDIT! This file will be overwritten by LXAppearance.
-# Any customization should be done in ~/.gtkrc-2.0.mine instead.
-
-include "/home/geoffrey/.gtkrc-2.0.mine"
-gtk-theme-name="Greenbird"
-gtk-icon-theme-name="Faenza-Green"
-gtk-font-name="Sans 10"
-gtk-cursor-theme-name="Menda-Cursor"
-gtk-cursor-theme-size=0
-gtk-toolbar-style=GTK_TOOLBAR_BOTH
-gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
-gtk-button-images=1
-gtk-menu-images=1
-gtk-enable-event-sounds=1
-gtk-enable-input-feedback-sounds=1
-gtk-xft-antialias=1
-gtk-xft-hinting=1
-gtk-xft-hintstyle="hintslight"
-gtk-xft-rgba="rgb"

icon

@@ -1 +0,0 @@
-.face

m2

@@ -1 +0,0 @@
-.cache/m2

mplayer/config

@@ -1,3 +0,0 @@
-# Write your default config options here!
-
-

npm

@@ -1 +0,0 @@
-.cache/npm

nv

@@ -1 +0,0 @@
-.cache/nv

xinitrc

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 #
 # ~/.xinitrc
 #
@@ -11,6 +11,6 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then
   unset f
 fi
 
-[ -f /etc/xprofile ] && source /etc/xprofile
-[ -f ~/.xprofile ] && source ~/.xprofile
+[ -f /etc/xprofile ] && . /etc/xprofile
+[ -f ~/.xprofile ] && . ~/.xprofile
 

xprofile

@@ -7,7 +7,7 @@
 #
 
 
-[ -f ~/.Xresources ] && xrdb ~/.Xresources
+[ -f ~/.config/Xresources/main ] && xrdb -I"$HOME" ~/.config/Xresources/main
 xset b off
 
 export GTK2_RC_FILES="$HOME/.gtkrc-2.0"
@@ -40,16 +40,17 @@ tryDM() {
             xmonad            ) executable=xmonad;;
             *) executable=$1;;
         esac
-        path=$(which $executable 2> /dev/null)
-        if [ $? -eq 0 ]; then
+        if commannd -v "$executable"
+        then
             found=1
-            exec $path $parameters
+            exec "$executable" $parameters
         fi
     fi
 }
 
-if [ ! -z $1 ]; then
-    tryDM $1
+if [ -n "$1" ]
+then
+    tryDM "$1"
 fi
 tryDM i3
 tryDM xfce4