From 20815810c3a973e51050fbd87cff8189ed34b867 Mon Sep 17 00:00:00 2001
From: Connor Olding <cloningdonor@gmail.com>
Date: Wed, 6 May 2015 14:22:04 -0700
Subject: [PATCH 1/3] stuff for shift-jis binary dumps

---
 home/-shrc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/home/-shrc b/home/-shrc
index e1d27e3..7bef698 100644
--- a/home/-shrc
+++ b/home/-shrc
@@ -18,6 +18,9 @@ r="$HOME/.gem/ruby/2.2.0/bin"
 mkdir -p "$r" && ADDPATH "$r"
 unset r
 
+export GOPATH="$HOME/go"
+ADDPATH "$GOPATH/bin"
+
 ify() {
     [ $# -ge 2 ] || return
     local ex=$1
@@ -50,7 +53,6 @@ export MAKEFLAGS="-j2"
 export VST_SDK_DIR="$HOME/src/vstsdk2.4"
 
 export EDITOR='vim -p'
-export GOPATH="$HOME/go"
 
 # colors
 for x in ls dir vdir grep fgrep egrep; do
@@ -89,6 +91,8 @@ alias counts='find . | wc -l'
 alias exts='print -l *(:e:l) | sort | uniq -c | sort -n'
 alias meow='( cd ~/play/meow; ~/sh/meow.sh/run -pa )'
 alias nocom='grep -oP --line-buffered --color=never "^[^#]+"'
+alias jrep='grep -aPo "[\x{20}-\x{7E}\x{4E00}-\x{9FFF}\x{3040}-\x{30FF}]+"'
+alias bomb='uconv -f utf-8 -t utf-8 --add-signature'
 alias unwrap='awk '\''BEGIN{RS="\n\n";FS="\n"}{for(i=1;i<=NF;i++)printf "%s ",$i;print "\n"}'\'
 alias picky='{ pacman -Qgq base base-devel | tee -; pacman -Qtnq; } | sort | uniq -u'
 alias unused='{ pacman -Qt; pacman -Qe | tee -; } | sort | uniq -u'

From a690002d7fe1a3bd2aae3e88e7e7d4a24644820b Mon Sep 17 00:00:00 2001
From: Connor Olding <cloningdonor@gmail.com>
Date: Mon, 11 May 2015 12:35:05 -0700
Subject: [PATCH 2/3] this was wrong for a damn year

---
 mpv/config                   | 7 -------
 input.conf => mpv/input.conf | 0
 2 files changed, 7 deletions(-)
 delete mode 100644 mpv/config
 rename input.conf => mpv/input.conf (100%)

diff --git a/mpv/config b/mpv/config
deleted file mode 100644
index ff894f3..0000000
--- a/mpv/config
+++ /dev/null
@@ -1,7 +0,0 @@
-[default]
-volume=70
-#af=drc
-msg-level=all=info
-osd-level=1
-#border=no
-vo=vaapi
diff --git a/input.conf b/mpv/input.conf
similarity index 100%
rename from input.conf
rename to mpv/input.conf

From 0fa41698abd77d668863fcb774b8fe09a53ac5e6 Mon Sep 17 00:00:00 2001
From: Connor Olding <cloningdonor@gmail.com>
Date: Mon, 11 May 2015 12:48:12 -0700
Subject: [PATCH 3/3] sweep up some dead files

---
 home/conkyrc | 20 --------------------
 home/xinitrc | 19 -------------------
 install      |  4 ++--
 3 files changed, 2 insertions(+), 41 deletions(-)
 delete mode 100644 home/conkyrc
 delete mode 100644 home/xinitrc

diff --git a/home/conkyrc b/home/conkyrc
deleted file mode 100644
index 0843b81..0000000
--- a/home/conkyrc
+++ /dev/null
@@ -1,20 +0,0 @@
-background yes
-own_window yes
-own_window_type desktop
-own_window_transparent yes
-own_window_hints undecorated,below,sticky,skip_taskbar,skip_pager
-double_buffer yes
-use_xft yes
-xftfont DejaVu Sans Mono:size=12
-gap_x 18
-gap_y 18
-alignment bottom_left
-
-TEXT
-${color grey} RAM:$color $mem / $memmax $alignr($memperc%)
-${color grey}Swap:$color $swap / $swapmax $alignr($swapperc%)
-${color grey} CPU:$color ${cpugraph 24,210}
-${color grey}Proc:$color $processes $color($running_processes)\
-   ${color grey}Up:$color ${upspeed eth0} ${color grey}Down:$color ${downspeed eth0}
-${color lightgrey}${top name 1} ${top pid 1} ${top cpu 1} ${top mem 1}
-${color lightgrey}${top name 2} ${top pid 2} ${top cpu 2} ${top mem 2}
diff --git a/home/xinitrc b/home/xinitrc
deleted file mode 100644
index c2a2e5b..0000000
--- a/home/xinitrc
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# ~/.xinitrc
-#
-# Executed by startx (run your window manager from here)
-
-if [ -d /etc/X11/xinit/xinitrc.d ]; then
-  for f in /etc/X11/xinit/xinitrc.d/*; do
-    [ -x "$f" ] && . "$f"
-  done
-  unset f
-fi
-
-#glxinfo
-
-# exec gnome-session
-# exec startkde
-# exec startxfce4
-# ...or the Window Manager of your choice
diff --git a/install b/install
index 0bffe5f..3c206ca 100755
--- a/install
+++ b/install
@@ -53,8 +53,8 @@ PATH="${PATH:?No existing PATH}:$rc/sh"
 
 backup_dir="$rc/backup-$(date '+%s')"
 
-for f in .bashrc .zshrc .-shrc .vimrc .conkyrc \
-  .inputrc .screenrc .xinitrc .indent.pro .uncrustify.cfg; do
+for f in .bashrc .zshrc .-shrc .vimrc \
+  .inputrc .screenrc .indent.pro .uncrustify.cfg; do
     dotless "$f"
     r="$rc/home/$REPLY"
     hardlink "$f" "$r"