work on bar stuff

colors/gen/gen.bash

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+v=$(ruby --version)
+if [[ $? -eq 0 ]]; then
 	SCHEME="donokai"
 	if [[ -n $1 ]]; then
 		SCHEME=$1
@@ -37,5 +39,8 @@ chmod +x "$DOTFILES_PATH/colors/shell"
 
 	xrdb -merge "$DOTFILES_PATH/colors/xresources"
 	source "$DOTFILES_PATH/scripts/reload_xresources.sh"
-source "$DOTFILES_PATH/wm/bspwm_config" > /dev/null
-kill -SIGUSR1 $(cat "$BAR_PID_FILE")
+	source "$DOTFILES_PATH/env/wm/bspwm_config" > /dev/null
+	# kill -SIGUSR1 $(cat "$BAR_PID_FILE")
+else
+	echo "Ruby isn't installed."
+fi

colors/gen/schemes/donokai.yml

@@ -16,4 +16,3 @@ base0C: "a1efe4" # cyan
 base0D: "66d9ef" # blue
 base0E: "ae81ff" # purple
 base0F: "cc6633" # pale orange
-

colors/shell

@@ -1,6 +1,6 @@
 #!/bin/sh
-# Base16 Bright - Shell color setup script
-# Chris Kempson (http://chriskempson.com)
+# Base16 Donokai - Shell color setup script
+# Wimer Hazenberg (http://www.monokai.nl)
 
 if [ "${TERM%%-*}" = 'linux' ]; then
     # This script doesn't support linux console (use 'vconsole' template instead)
@@ -8,30 +8,30 @@ if [ "${TERM%%-*}" = 'linux' ]; then
 fi
 
 color00="11/11/11" # Base 00 - Black
-color01="fb/01/20" # Base 08 - Red
-color02="a1/c6/59" # Base 0B - Green
-color03="fd/a3/31" # Base 0A - Yellow
-color04="6f/b3/d2" # Base 0D - Blue
-color05="d3/81/c3" # Base 0E - Magenta
-color06="76/c7/b7" # Base 0C - Cyan
-color07="e0/e0/e0" # Base 05 - White
-color08="b0/b0/b0" # Base 03 - Bright Black
+color01="f9/26/72" # Base 08 - Red
+color02="a6/e2/2e" # Base 0B - Green
+color03="f4/bf/75" # Base 0A - Yellow
+color04="66/d9/ef" # Base 0D - Blue
+color05="ae/81/ff" # Base 0E - Magenta
+color06="a1/ef/e4" # Base 0C - Cyan
+color07="f8/f8/f2" # Base 05 - White
+color08="75/71/5e" # Base 03 - Bright Black
 color09=$color01 # Base 08 - Bright Red
 color10=$color02 # Base 0B - Bright Green
 color11=$color03 # Base 0A - Bright Yellow
 color12=$color04 # Base 0D - Bright Blue
 color13=$color05 # Base 0E - Bright Magenta
 color14=$color06 # Base 0C - Bright Cyan
-color15="ff/ff/ff" # Base 07 - Bright White
-color16="fc/6d/24" # Base 09
-color17="be/64/3c" # Base 0F
-color18="30/30/30" # Base 01
-color19="50/50/50" # Base 02
-color20="d0/d0/d0" # Base 04
-color21="f5/f5/f5" # Base 06
-color_foreground="e0/e0/e0" # Base 05
+color15="f9/f8/f5" # Base 07 - Bright White
+color16="fd/97/1f" # Base 09
+color17="cc/66/33" # Base 0F
+color18="38/38/30" # Base 01
+color19="49/48/3e" # Base 02
+color20="a5/9f/85" # Base 04
+color21="f5/f4/f1" # Base 06
+color_foreground="f8/f8/f2" # Base 05
 color_background="11/11/11" # Base 00
-color_cursor="e0/e0/e0" # Base 05
+color_cursor="f8/f8/f2" # Base 05
 
 if [ -n "$TMUX" ]; then
   # tell tmux to pass the escape sequences through
@@ -82,12 +82,12 @@ printf $printf_template 21 $color21
 # foreground / background / cursor color
 if [ -n "$ITERM_SESSION_ID" ]; then
   # iTerm2 proprietary escape codes
-  printf $printf_template_custom Pg e0e0e0 # forground
+  printf $printf_template_custom Pg f8f8f2 # forground
   printf $printf_template_custom Ph 111111 # background
-  printf $printf_template_custom Pi e0e0e0 # bold color
-  printf $printf_template_custom Pj 505050 # selection color
-  printf $printf_template_custom Pk e0e0e0 # selected text color
-  printf $printf_template_custom Pl e0e0e0 # cursor
+  printf $printf_template_custom Pi f8f8f2 # bold color
+  printf $printf_template_custom Pj 49483e # selection color
+  printf $printf_template_custom Pk f8f8f2 # selected text color
+  printf $printf_template_custom Pl f8f8f2 # cursor
   printf $printf_template_custom Pm 111111 # cursor text
 else
   printf $printf_template_var 10 $color_foreground

colors/vim

@@ -1,5 +1,5 @@
-" Base16 Bright (https://github.com/chriskempson/base16)
-" Scheme: Chris Kempson (http://chriskempson.com)
+" Base16 Donokai (https://github.com/chriskempson/base16)
+" Scheme: Wimer Hazenberg (http://www.monokai.nl)
 
 " This enables the coresponding base16-shell script to run so that
 " :colorscheme works in terminals supported by base16-shell scripts
@@ -7,27 +7,27 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-bright.".&background.".sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-donokai.".&background.".sh"
   endif
 endif
 
 " GUI color definitions
 let s:gui00 = "111111"
-let s:gui01 = "303030"
-let s:gui02 = "505050"
-let s:gui03 = "b0b0b0"
-let s:gui04 = "d0d0d0"
-let s:gui05 = "e0e0e0"
-let s:gui06 = "f5f5f5"
-let s:gui07 = "ffffff"
-let s:gui08 = "fb0120"
-let s:gui09 = "fc6d24"
-let s:gui0A = "fda331"
-let s:gui0B = "a1c659"
-let s:gui0C = "76c7b7"
-let s:gui0D = "6fb3d2"
-let s:gui0E = "d381c3"
-let s:gui0F = "be643c"
+let s:gui01 = "383830"
+let s:gui02 = "49483e"
+let s:gui03 = "75715e"
+let s:gui04 = "a59f85"
+let s:gui05 = "f8f8f2"
+let s:gui06 = "f5f4f1"
+let s:gui07 = "f9f8f5"
+let s:gui08 = "f92672"
+let s:gui09 = "fd971f"
+let s:gui0A = "f4bf75"
+let s:gui0B = "a6e22e"
+let s:gui0C = "a1efe4"
+let s:gui0D = "66d9ef"
+let s:gui0E = "ae81ff"
+let s:gui0F = "cc6633"
 
 " Terminal color definitions
 let s:cterm00 = "00"
@@ -59,7 +59,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-bright"
+let g:colors_name = "base16-donokai"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)

colors/xresources

@@ -1,22 +1,22 @@
-! Base16 Bright
-! Scheme: Chris Kempson (http://chriskempson.com)
+! Base16 Donokai
+! Scheme: Wimer Hazenberg (http://www.monokai.nl)
 
 #define base00 #111111
-#define base01 #303030
-#define base02 #505050
-#define base03 #b0b0b0
-#define base04 #d0d0d0
-#define base05 #e0e0e0
-#define base06 #f5f5f5
-#define base07 #ffffff
-#define base08 #fb0120
-#define base09 #fc6d24
-#define base0A #fda331
-#define base0B #a1c659
-#define base0C #76c7b7
-#define base0D #6fb3d2
-#define base0E #d381c3
-#define base0F #be643c
+#define base01 #383830
+#define base02 #49483e
+#define base03 #75715e
+#define base04 #a59f85
+#define base05 #f8f8f2
+#define base06 #f5f4f1
+#define base07 #f9f8f5
+#define base08 #f92672
+#define base09 #fd971f
+#define base0A #f4bf75
+#define base0B #a6e22e
+#define base0C #a1efe4
+#define base0D #66d9ef
+#define base0E #ae81ff
+#define base0F #cc6633
 
 *foreground:   base05
 *background:   base00

env/sh/shell_funcs

@@ -7,9 +7,12 @@ export -f calc
 
 stopbar() {
 	if [[ -f "$BAR_PID_FILE" ]]; then
-		echo 
-		kill -SIGINT $(cat "$BAR_PID_FILE")
+		kill -SIGTERM $(cat "$BAR_PID_FILE")
+		kill -SIGTERM $(cat "$BAR_PID_FILE"*.pid)
+		kill -SIGTERM $(cat "$BAR_PATH"/modules/*.pid)
 		rm -f "$BAR_PID_FILE"
+		rm "$BAR_PID_FILE"*.pid
+		rm "$BAR_PATH"/modules/*.pid
 	else
 		echo "Bar is not running."
 	fi

env/wm/extras/bar/colors.bash

@@ -1,7 +1,7 @@
 export COLOR_FOREGROUND="#$(get_color 05 | awk '{print toupper($0)}')"
 export COLOR_DARK="#$(get_color 02 | awk '{print toupper($0)}')"
 export COLOR_BACKGROUND="#$(get_color 00 | awk '{print toupper($0)}')"
-export COLOR_HIGHLIGHT="#$(get_color 0D | awk '{print toupper($0)}')"
+export COLOR_HIGHLIGHT="#$(get_color 0E | awk '{print toupper($0)}')"
 export COLOR_URGENT="#$(get_color 08 | awk '{print toupper($0)}')"
 
 export COLOR_S1="#$(get_color 0E | awk '{print toupper($0)}')"

env/wm/extras/bar/formatter.bash

@@ -37,7 +37,7 @@ register_bar_module() {
 export -f register_bar_module
 
 for f in "$BAR_PATH/modules/"*-bm.bash; do
-  echo -e "$f" >> "$BAR_LOG"
+  # echo -e "$f" >> "$BAR_LOG"
 	for bl in "$BLACKLISTED_BAR_MODULES"; do
 		if [[ "$f" = "$BAR_PATH/modules/"$bl-bm.bash ]]; then
 			f=""
@@ -51,9 +51,9 @@ done
 while read -r line; do
   # echo -e "Bar Line: $line" >> "$BAR_LOG"
   for i in ${!MODULE_MATCH[@]}; do
-		echo ${!MODULE_MATCH[@]} >> $BAR_LOG
+		# echo ${!MODULE_MATCH[@]} >> $BAR_LOG
     if [[ $line == ${MODULE_MATCH[$i]} ]]; then
-      echo -e "Bar Module Update: [$i] Matched ${MODULE_MATCH[$i]} with $line" >> "$BAR_LOG"
+      # echo -e "Bar Module Update: [$i] Matched ${MODULE_MATCH[$i]} with $line" >> "$BAR_LOG"
       MODULE_CONTENT[$i]="$("${MODULE_CALLBACK[$i]}" "$line")"
       # echo -e "New Module Content: "${MODULE_CONTENT[$i]} >> "$BAR_LOG"
     fi

env/wm/sxhkdrc

@@ -160,6 +160,10 @@ super + shift + alt + ctrl + r
 super + Return
 	urxvtc
 
+super + shift + Return
+	urxvtc -geometry 80x24; \
+	bspc node -t floating
+
 # spawn the app launcher
 super + space
 	rofi -show run -font "$PRIMARY_FONT_FAMILY $PRIMARY_FONT_SIZE" -lines 16 -width 10 -padding 8 -fuzzy -bw "$BORDER_WIDTH" -color-enabled -color-window "#$(get_color 00)","#$(get_color 0D)","#$(get_color 0D)","#$(get_color 00)" -color-normal "#$(get_color 00)","#$(get_color 06)","#$(get_color 00)","#$(get_color 0D)","#$(get_color 00)" -separator-style none -hide-scrollbar

env/x/xresources

@@ -5,17 +5,17 @@
 
 #define emacspfont Monaco 9
 
-# I like this font on my desktop (use in `~/.Xresources.env`!)
-##define primaryfont xft:lemon-11
-##define primaryletterspace 0
+! I like this font on my desktop (use in `~/.Xresources.env`!)
+!#define primaryfont xft:lemon-11
+!#define primaryletterspace 0
 
-# I like this font on my desktop for code streaming
-##define primaryfont xft:Monaco-9
-##define primaryletterspace -2
+! I like this font on my desktop for code streaming
+!#define primaryfont xft:Monaco-9
+!#define primaryletterspace -2
 
-# I like this font on my laptop
-#define primaryfont xft:Monaco-11
-##define primaryletterspace -1
+! I like this font on my laptop
+!#define primaryfont xft:Monaco-11
+!#define primaryletterspace -1
 
 *font: primaryfont
 *faceName: primaryfont

os/arch_linux/3-utils.bash

@@ -50,6 +50,7 @@ pacaur -S \
 	lib32-nvidia-beta \
 	pmount \
 	qt5-webengine \
+	ruby \
 	--noconfirm --noedit
 
 # sudo ln -s /usr/bin/google-chrome-unstable /usr/bin/chrome

variables.bash

@@ -24,7 +24,7 @@ export BLACKLISTED_BAR_MODULES=""
 export REPOSITORY_PATH="$NICE_HOME/code/open-source"
 
 # the width of the border around the bspwm windows
-export BORDER_WIDTH=1
+export BORDER_WIDTH=0
 
 # the gap between bspwm windows
 export WINDOW_GAP=5