various updates

arch_linux_init/utils.bash

@@ -30,6 +30,7 @@ pacaur -S \
 	pass \
 	bash-completion \
 	avr-libc avr-gcc dfu-programmer dfu-util \
+	reptyr \
 	--noconfirm --noedit
 
 sudo ln -s /usr/bin/google-chrome-unstable /usr/bin/chrome

arch_linux_init/xorg.bash

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
 
 sudo pacman -S xorg-xinit xorg-server xorg-xrdb --noconfirm
+pacaur -S gtk-theme-arc gtk-engine-murrine --noconfirm
 

colors/gen/gen.bash

@@ -6,22 +6,27 @@ source "$DIR/variables.bash"
 mkdir -p "$DOTFILES_PATH/colors/gen/vendor"
 
 B16_DIR="$DOTFILES_PATH/colors/gen/vendor/base16-builder"
+COLORS_PATH="$B16_DIR/output"
+
 if [ -d "$B16_DIR" ]; then
   echo "Skipping repo pull down..."
+	rm -rf "$COLORS_PATH"
+	mkdir -p "$COLORS_PATH"
 else
   git clone https://github.com/lytedev/base16-builder.git "$DOTFILES_PATH/colors/gen/vendor/base16-builder"
 fi
 
-cd "$DOTFILES_PATH/colors/gen/schemes"
+"$DOTFILES_PATH/colors/gen/vendor/base16-builder/base16" -t vim -s "$DOTFILES_PATH/colors/gen/schemes/donokai.yml"
-cp * "$DOTFILES_PATH/colors/gen/vendor/base16-builder/schemes"
+"$DOTFILES_PATH/colors/gen/vendor/base16-builder/base16" -t xresources -s "$DOTFILES_PATH/colors/gen/schemes/donokai.yml"
-cd -
+"$DOTFILES_PATH/colors/gen/vendor/base16-builder/base16" -t shell -s "$DOTFILES_PATH/colors/gen/schemes/donokai.yml"
-
-"$DOTFILES_PATH/colors/gen/vendor/base16-builder/base16" -t vim
-"$DOTFILES_PATH/colors/gen/vendor/base16-builder/base16" -t xresources
-"$DOTFILES_PATH/colors/gen/vendor/base16-builder/base16" -t shell
 
 COLORS_PATH=$DOTFILES_PATH/colors/gen/vendor/base16-builder/output
+
+rm -f "$DOTFILES_PATH/colors/xresources"
+rm -f "$DOTFILES_PATH/colors/vim"
+rm -f "$DOTFILES_PATH/colors/shell"
 cp "$COLORS_PATH/xresources/base16-donokai.dark.xresources" "$DOTFILES_PATH/colors/xresources"
 cp "$COLORS_PATH/vim/base16-donokai.vim" "$DOTFILES_PATH/colors/vim"
 cp "$COLORS_PATH/shell/base16-donokai.dark.sh" "$DOTFILES_PATH/colors/shell"
+chmod +x "$DOTFILES_PATH/colors/shell"
 

colors/gen/schemes/exp-donokai.yml

@@ -0,0 +1,19 @@
+scheme: "Donokai"
+author: "Wimer Hazenberg (http://www.monokai.nl)"
+base00: "111111"
+base01: "383830"
+base02: "49483e"
+base03: "75715e"
+base04: "a59f85"
+base05: "f8f8f2"
+base06: "f5f4f1"
+base07: "f9f8f5"
+base08: "00aaff"
+base09: "00aaff"
+base0A: "00aaff"
+base0B: "00aaff"
+base0C: "00aaff"
+base0D: "00aaff"
+base0E: "00aaff"
+base0F: "00aaff"
+

scripts/reload_xresources.sh

@@ -0,0 +1,44 @@
+#!/bin/sh
+
+source "$DOTFILES_PATH/variables.bash"
+source "$DOTFILES_PATH/scripts/get_color.sh"
+source "$DOTFILES_PATH/scripts/get_x_fonts.sh"
+
+# cat ../colors/xresources | \
+# 	sed -n 's/.*base\([0-9A-F]*\)\s\(.*\)$/\1 \2/p' | \
+# 	(while read line; do printf '\033]4;%s;%s' $line; done;)
+
+printf '\33]50;%s\007' "xft:$PRIMARY_FONT_FAMILY_WITH_SIZE"
+printf '\33]11;%s\007' "#$(get_color 00)"
+printf '\33]10;%s\007' "#$(get_color 05)"
+
+XRES_FILE="$HOME/.Xresources.colors"
+
+read -d '' map << EOF
+$(cat "$XRES_FILE" | \
+	sed -n 's/.*\(base[0-9A-F]*\)\s*\(#.*\)$/\1 \2/p')
+EOF
+
+read -d '' values << EOF
+$(cat "$XRES_FILE" | \
+	sed -n 's/.*color\([0-9]*\):\s*\(base.*\)$/\1 \2/p')
+EOF
+
+declare -A maparr
+while read -r line; do
+	read -a a <<< $line
+	maparr[${a[0]}]=${a[1]}
+done <<< "$map"
+
+declare -A previous_colors
+while read -r line; do
+	read -a a <<< $line
+	col=${maparr[${a[1]}]}
+	if [ ${a[0]} -gt "8" ]; then
+		col=${maparr[${previous_colors["color$(expr ${a[0]} - 8)"]}]}
+	fi
+	printf '\33]4;%s;%s\007' ${a[0]} $col
+	previous_colors["color${a[0]}"]="${a[1]}"
+done <<< "$values"
+
+

sh/bashrc

@@ -3,104 +3,105 @@ export DOTFILES_PATH=$HOME/.dotfiles
 BASE16_SHELL="$DOTFILES_PATH/colors/shell"
 [[ -s "$BASE16_SHELL" ]] && source "$BASE16_SHELL"
 
-# disable ctrl-s terminal freeze
+if [ -t 0 ]; then
-[[ $- == *i* ]] && stty -ixon
+	# disable ctrl-s terminal freeze
+	[[ $- == *i* ]] && stty -ixon
 
-# filesystem aliases
+	# filesystem aliases
-alias lx='ls -lXB' # order by filetype
+	alias lx='ls -lXB' # order by filetype
-alias lk='ls -lSr' # order by filesize reversed
+	alias lk='ls -lSr' # order by filesize reversed
-alias lt='ls -ltr' # order by file modified time
+	alias lt='ls -ltr' # order by file modified time
-alias lc='ls -ltcr' # order by filectime
+	alias lc='ls -ltcr' # order by filectime
-alias lu='ls -ltur' # order by file access time
+	alias lu='ls -ltur' # order by file access time
-alias ls='ls -h --color --group-directories-first' # flat view w/ directories first
+	alias ls='ls -h --color --group-directories-first' # flat view w/ directories first
-alias l='ls -h --color --group-directories-first' # same as above
+	alias l='ls -h --color --group-directories-first' # same as above
-alias ll='ls -lv --group-directories-first' # non-flat view
+	alias ll='ls -lv --group-directories-first' # non-flat view
-alias lm='ll | more'
+	alias lm='ll | more'
-alias lr='ll -R' # please don't
+	alias lr='ll -R' # please don't
-alias la='ll -A' # show all
+	alias la='ll -A' # show all
-alias tree='tree -Csuh'
+	alias tree='tree -Csuh'
 
-# navigation aliases
+	# navigation aliases
-alias cd..="cd .."
+	alias cd..="cd .."
-alias ..="cd .."
+	alias ..="cd .."
-alias ...="cd ../.."
+	alias ...="cd ../.."
-alias ....="cd ../../.."
+	alias ....="cd ../../.."
-alias .....="cd ../../../.."
+	alias .....="cd ../../../.."
-alias ......="cd ../../../../.."
+	alias ......="cd ../../../../.."
 
-# tmux aliases
+	# tmux aliases
-alias tmux='TERM=screen-256color-bce tmux' # syntax higlighting for vim in tmux
+	alias tmux='TERM=screen-256color-bce tmux' # syntax higlighting for vim in tmux
-alias tmnew="tmux new -s"
+	alias tmnew="tmux new -s"
-alias tmls="tmux list-sessions"
+	alias tmls="tmux list-sessions"
-alias tmatt="tmux attach -t"
+	alias tmatt="tmux attach -t"
 
-# git aliases
+	# git aliases
-alias gs="git status"
+	alias gs="git status"
-alias gl="git log"
+	alias gl="git log"
-alias gpl="git pull"
+	alias gpl="git pull"
-alias gp="git push"
+	alias gp="git push"
-alias gac="git add -A && git commit -m"
+	alias gac="git add -A && git commit -m"
 
-# networking aliases
+	# networking aliases
-alias p="ping 8.8.8.8"
+	alias p="ping 8.8.8.8"
 
-# emacs aliases
+	# emacs aliases
-alias emacs="emacs -nw"
+	alias emacs="emacs -nw"
 
-# arch aliases
+	# arch aliases
-alias archupdate="pacaur -Syyu --noconfirm --noedit"
+	alias archupdate="pacaur -Syyu --noconfirm --noedit"
 
-# wm aliases
+	# wm aliases
-alias startbar="source $DOTFILES_PATH/wm/extras/bar/start.bash"
+	alias startbar="source $DOTFILES_PATH/wm/extras/bar/start.bash"
 
-export EDITOR="vim"
+	export EDITOR="vim"
-if command -v nvim >/dev/null 2>&1; then
+	if command -v nvim >/dev/null 2>&1; then
-  alias vim="nvim"
+		alias vim="nvim"
-  alias ovim="\\vim"
+		alias ovim="\\vim"
-  export EDITOR="nvim"
+		export EDITOR="nvim"
+	fi
+
+	# prompt
+	COLOR_RESET='\[\e[0m\]'
+	PROMPT_SUCCESS_COLOR='\[\e[0;34m\]'
+	PROMPT_FAILURE_COLOR='\[\e[0;31m\]'
+	DIR_COLOR='\[\e[0;33m\]'
+	sps() {
+		name="$PWD"
+		[[ "$name" =~ ^"$HOME"(/|$) ]] && name="~${name#$HOME}"
+		curdir=$(echo "$PWD" | sed -r 's|.*/(.+)$|\1|g')
+		name=$(echo "$name" | sed -r 's|/(..)[^/]*|/\1|g' | sed -r 's|(.*/)(.+)$|\1|g')
+		[[ "$name" == "~" ]] && curdir=""
+		echo "$name$curdir"
+	}
+	prompt_command_func()
+	{
+		RET=$?
+		if [ $RET -eq 0 ]; then
+			STATUS_COLOR=$PROMPT_SUCCESS_COLOR
+		else
+			STATUS_COLOR=$PROMPT_FAILURE_COLOR
+		fi;
+		PS1="$STATUS_COLOR\u@\h$COLOR_RESET $DIR_COLOR$(eval "sps")$COLOR_RESET "
+	}
+	export PROMPT_COMMAND="prompt_command_func"
+
+	# man pages with vim
+	vman() {
+		vim -c "SuperMan $*"
+
+		if [ "$?" != "0" ]; then
+			echo "No manual entry for $*"
+		fi
+	}
+	alias _man="man"
+	alias man="vman"
+
+	complete -cf sudo
+	complete -cf man
+
+	# allow a per-device script that is pulled in
+	if [ -a "$HOME/.bashrc_env" ]; then
+		. "$HOME/.bashrc_env"
+	fi
 fi
-
-# prompt
-COLOR_RESET='\[\e[0m\]'
-PROMPT_SUCCESS_COLOR='\[\e[0;34m\]'
-PROMPT_FAILURE_COLOR='\[\e[0;31m\]'
-DIR_COLOR='\[\e[0;33m\]'
-sps() {
-  name="$PWD"
-  [[ "$name" =~ ^"$HOME"(/|$) ]] && name="~${name#$HOME}"
-  curdir=$(echo "$PWD" | sed -r 's|.*/(.+)$|\1|g')
-  name=$(echo "$name" | sed -r 's|/(..)[^/]*|/\1|g' | sed -r 's|(.*/)(.+)$|\1|g')
-  [[ "$name" == "~" ]] && curdir=""
-  echo "$name$curdir"
-}
-prompt_command_func()
-{
-  RET=$?
-  if [ $RET -eq 0 ]; then
-    STATUS_COLOR=$PROMPT_SUCCESS_COLOR
-  else
-    STATUS_COLOR=$PROMPT_FAILURE_COLOR
-  fi;
-  PS1="$STATUS_COLOR\u@\h$COLOR_RESET $DIR_COLOR$(eval "sps")$COLOR_RESET "
-}
-export PROMPT_COMMAND="prompt_command_func"
-
-# man pages with vim
-vman() {
-  vim -c "SuperMan $*"
-
-  if [ "$?" != "0" ]; then
-    echo "No manual entry for $*"
-  fi
-}
-alias _man="man"
-alias man="vman"
-
-complete -cf sudo
-complete -cf man
-
-# allow a per-device script that is pulled in
-if [ -a "$HOME/.bashrc_env" ]; then
-  . "$HOME/.bashrc_env"
-fi
-

variables.bash

@@ -5,8 +5,8 @@
 
 export DOTFILES_PATH="$HOME/.dotfiles"
 export REPOSITORY_PATH="$HOME/Documents/open-source"
-export WINDOW_GAP=0
+export WINDOW_GAP=5
-export BORDER_WIDTH=0
+export BORDER_WIDTH=1
 
 source "$DOTFILES_PATH/scripts/get_x_fonts.sh"
 source "$DOTFILES_PATH/scripts/get_color.sh"

vim/config/init.vim

@@ -64,7 +64,7 @@ Plug 'elixir-lang/vim-elixir', {'for': ['elixir']}
 Plug 'wavded/vim-stylus', {'for': ['styl', 'stylus', 'vue']}
 Plug 'rust-lang/rust.vim', {'for': ['rs', 'rust']}
 Plug 'plasticboy/vim-markdown', {'for': ['md', 'markdown']}
-Plug 'digitaltoad/vim-jade', {'for': ['jade', 'vue']}
+Plug 'digitaltoad/vim-jade', {'for': ['pug', 'jade', 'vue']}
 Plug 'freitass/todo.txt-vim', {'for': ['todo']}
 Plug 'leafo/moonscript-vim', {'for': ['moon', 'moonscript']}
 Plug 'evidens/vim-twig'

wm/bspwm_config

@@ -9,10 +9,10 @@ source "$DOTFILES_PATH/scripts/get_x_fonts.sh"
 # bspc config active_border_color   "#$(get_color 0D)"
 # bspc config presel_feedback_color "#$(get_color 0D)"
 
-bspc config normal_border_color   "#$(get_color 00)"
+bspc config normal_border_color   "#$(get_color 01)"
-bspc config focused_border_color  "#$(get_color 00)"
+bspc config focused_border_color  "#$(get_color 0D)"
-bspc config active_border_color   "#$(get_color 00)"
+bspc config active_border_color   "#$(get_color 0C)"
-bspc config presel_feedback_color "#$(get_color 00)"
+bspc config presel_feedback_color "#$(get_color 04)"
 bspc config border_width          "$BORDER_WIDTH"
 bspc config split_ratio           0.50
 bspc config borderless_monocle    true

x/gtk2rc

@@ -1,3 +1,3 @@
-gtk-icon-theme-name = "Adwaita"
+gtk-icon-theme-name = "elementary"
-gtk-theme-name = "Raleigh"
+gtk-theme-name = "Arc-Dark"
-gtk-font-name = "Monaco 9"
+gtk-font-name = "Terminus 9"

x/gtk3settings.ini

@@ -1,4 +1,4 @@
 [Settings]
 gtk-icon-theme-name = Adwaita
-gtk-theme-name = Adwaita
+gtk-theme-name = Arc-Dark
 gtk-font-name = Monaco 9

x/link.bash

@@ -6,12 +6,12 @@ source "$DIR/variables.bash"
 mkdir -p "$HOME/.config/gtk-3.0"
 rm -f "$HOME/.xinitrc"
 rm -f "$HOME/.Xresources"
-rm -f "$HOME/.config/gtkrc-2.0"
+rm -f "$HOME/.gtkrc-2.0"
 rm -f "$HOME/.config/gtk-3.0/settings.ini"
 ln -s "$DOTFILES_PATH/x/xinitrc" "$HOME/.xinitrc"
 ln -s "$DOTFILES_PATH/x/xresources" "$HOME/.Xresources"
 ln -s "$DOTFILES_PATH/x/gtk3settings.ini" "$HOME/.config/gtk-3.0/settings.ini"
-ln -s "$DOTFILES_PATH/x/gtk2rc" "$HOME/.config/gtkrc-2.0"
+ln -s "$DOTFILES_PATH/x/gtk2rc" "$HOME/.gtkrc-2.0"
 
 sudo mkdir -p /root/.gtk-3.0/
 sudo mkdir -p /root/.config/gtk-3.0/
@@ -22,5 +22,8 @@ sudo ln -s "$DOTFILES_PATH/x/gtk2rc" "/root/.gtkrc-2.0"
 sudo ln -s "$DOTFILES_PATH/x/gtk3settings.ini" "/root/.gtk-3.0/settings.ini"
 sudo ln -s "$DOTFILES_PATH/x/gtk3settings.ini" "/root/.config/gtk-3.0/settings.ini"
 
+sudo rm -f "/etc/udev/rules.d/90-usb-device-plugin.rules"
+sudo ln -s "$DOTFILES_PATH/x/udev_rules/90-usb-device-plugin.rules" "/etc/udev/rules.d/90-usb-device-plugin.rules"
+
 source "$DOTFILES_PATH/x/xloadresources"
 

x/udev_rules/90-usb-device-plugin.rules

@@ -0,0 +1 @@
+TTRS{idVendor}=="152d", ATTRS{idProduct}=="2329", RUN+="xset r rate 300 80"

x/xresources

@@ -24,3 +24,6 @@ URxvt.internalBorder: 5
 
 Xcursor.theme: human
 
+URxvt.perl-ext-common: default,matcher
+URxvt.url-launcher: /usr/bin/xdg-open
+URxvt.matcher.button: 1