From b2a78a9b67170e5faa72577fcacc6c850da9e824 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 9 Nov 2014 19:17:35 -0700 Subject: [PATCH 001/115] switched vars for yoga2 --- conkyrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conkyrc b/conkyrc index b2177f6..a26568e 100644 --- a/conkyrc +++ b/conkyrc @@ -12,4 +12,4 @@ total_run_times 0 use_spacer none TEXT -${exec ~/bin/volume.sh} ${battery BAT1} ${wireless_essid wlp0s29f7u1} ${addr wlp0s29f7u1} $time +${exec ~/bin/volume.sh} ${battery BAT1} ${wireless_essid wlp1s0} ${addr wlp1s0} $time From bde2a68aeb3fae2698ad14c4cadfbc4f3fc0c121 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 9 Nov 2014 19:18:25 -0700 Subject: [PATCH 002/115] new pulseaudio start method --- xinitrc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xinitrc b/xinitrc index 3ad4811..033c0de 100644 --- a/xinitrc +++ b/xinitrc @@ -2,6 +2,7 @@ #exec openbox-session conky | while read -r; do xsetroot -name "$REPLY"; done & redshift & -pulseaudio --start & +#pulseaudio --start & +start-pulseaudio-x11 google-musicmanager & exec dbus-launch --exit-with-session --sh-syntax dwm From c0517b131dc71b84d51ab1fbb1e49123ee0c3709 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 9 Nov 2014 19:20:09 -0700 Subject: [PATCH 003/115] increased dpi for 3200x1800 resolution --- Xresources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Xresources b/Xresources index 641c1f9..d9a651b 100644 --- a/Xresources +++ b/Xresources @@ -1,5 +1,5 @@ !Xft settings -Xft*dpi: 96 +Xft*dpi:192 Xft*antialias: true Xft*hinting: true Xft*hintstyle: full From 1ab1cbdc93529b52814e681a575a7f29a5579cdc Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 9 Nov 2014 19:25:13 -0700 Subject: [PATCH 004/115] increase font size for 3200x1800 resolution --- dwm.config.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dwm.config.h b/dwm.config.h index d969f3b..73894ec 100644 --- a/dwm.config.h +++ b/dwm.config.h @@ -3,7 +3,8 @@ #include /*Needed for mulitmedia keys*/ /* appearance */ -static const char font[] = "Inconsolata:size=9"; +//static const char font[] = "Ohsnap.Icons:size=12"; +static const char font[] = "Inconsolata-12"; static const char normbordercolor[] = "#444444"; static const char normbgcolor[] = "#222222"; static const char normfgcolor[] = "#bbbbbb"; @@ -21,7 +22,7 @@ static const char *tags[] = { "term", "coms", "www", "dev", "work", "6", "7", "8 static const Rule rules[] = { /* class instance title tags mask isfloating monitor */ { "Gimp", NULL, NULL, 0, True, -1 }, - { "Firefox", NULL, NULL, 1 << 8, False, -1 }, + { "Firefox", NULL, NULL, 1, False, -1 }, }; /* layout(s) */ @@ -48,7 +49,7 @@ static const Layout layouts[] = { #define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } } /* commands */ -static const char *dmenucmd[] = { "dmenu_run", "-fn", "Inconsolata-9", "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL }; +static const char *dmenucmd[] = { "dmenu_run", "-fn", "Inconsolata-12", "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL }; static const char *termcmd[] = { "termite", NULL }; /*functions for volume control*/ static const char *upvol[] = { "amixer", "sset", "Master", "1%+", NULL}; From d89a180398c6a1f3f735139cc313bee4c4e7e676 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 9 Nov 2014 19:25:41 -0700 Subject: [PATCH 005/115] increase font size for 3200x1800 resolution --- termite.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/termite.config b/termite.config index 8b66cc1..909419d 100644 --- a/termite.config +++ b/termite.config @@ -1,6 +1,6 @@ #Customizations [options] -font = Inconsolata 10 +font = Inconsolata 12 # Solarized dark color scheme From 0272acd0278289ef6b23f9ae742db2e2c0a2fbd0 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 9 Nov 2014 19:28:56 -0700 Subject: [PATCH 006/115] use words do to ohsnap being too small --- volume.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/volume.sh b/volume.sh index ed0e314..9a83405 100755 --- a/volume.sh +++ b/volume.sh @@ -3,7 +3,7 @@ mute=`amixer get Master | grep "Front Left:" | awk '{print $6}'` if [ $mute == "[on]" ] then vol=`amixer get Master | grep "Front Left:" | awk '{print $5}' | tr -d '[]'` - echo $vol + echo "vol" $vol else - echo "Mute" + echo "mute" fi From 4f9016bfef1d6f8c6d1aeae3af753dc4c1f08e73 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 9 Nov 2014 20:45:44 -0700 Subject: [PATCH 007/115] added chrome and power.sh to yoga2 branch --- chrome | 2 ++ power.sh | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100755 chrome create mode 100755 power.sh diff --git a/chrome b/chrome new file mode 100755 index 0000000..0af4562 --- /dev/null +++ b/chrome @@ -0,0 +1,2 @@ +#!/bin/bash +exec google-chrome-beta --disk-cache-dir="/tmp/ewpt3ch-cache" diff --git a/power.sh b/power.sh new file mode 100755 index 0000000..2fee9cf --- /dev/null +++ b/power.sh @@ -0,0 +1,22 @@ +#!/bin/bash +if `acpi -a | grep -q on` +then + echo "Â" +else + bat=`acpi -b | awk '{print $4}'` + bat="${bat%%%*}" #remove percent + if [[ $bat -gt 75 ]] + then + echo "ó" + elif [[ $bat -gt 25 ]] + then + if [[ $bat -gt 45 ]] + then + echo "ò" + else + echo "ò" $bat"%" + fi + else + echo "ñ" $bat"%" + fi +fi From bb79497d94a3ac4c47de53e91daf2bd8e7588bfb Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 9 Nov 2014 20:47:55 -0700 Subject: [PATCH 008/115] added cmus-stats.sh to conky --- conkyrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conkyrc b/conkyrc index a26568e..7d78556 100644 --- a/conkyrc +++ b/conkyrc @@ -12,4 +12,4 @@ total_run_times 0 use_spacer none TEXT -${exec ~/bin/volume.sh} ${battery BAT1} ${wireless_essid wlp1s0} ${addr wlp1s0} $time +${exec ~/bin/cmus-stats.sh} ${exec ~/bin/volume.sh} ${battery BAT1} ${wireless_essid wlp1s0} ${addr wlp1s0} $time From d7bd0fc127240cc5032565e70005f830df30f0ed Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 9 Nov 2014 20:49:46 -0700 Subject: [PATCH 009/115] added cmus-stats to yoga2 branch --- cmus-stats.sh | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100755 cmus-stats.sh diff --git a/cmus-stats.sh b/cmus-stats.sh new file mode 100755 index 0000000..d5cf5ee --- /dev/null +++ b/cmus-stats.sh @@ -0,0 +1,19 @@ +#!/bin/bash +if [ -x /usr/bin/cmus-remote ] +then + status=`cmus-remote -Q | grep status | awk '{print $2}'` + if [ $status == "paused" ] + then + status="ç" + else + status="æ" + fi + duration=`cmus-remote -Q | grep duration | awk '{print $2}'` + position=`cmus-remote -Q | grep position | awk '{print $2}'` + ((timeleft = $duration - $position)) + ((timelefth = timeleft / 60)) + ((timeleftm = timeleft % 60)) + artist=`cmus-remote -Q | grep -w artist | cut -d ' ' -f3-` + song=`cmus-remote -Q | grep title | cut -d ' ' -f3-` + echo $artist'-'$song $status $timelefth':'$timeleftm +fi From 208ad8f89ed9e68c81c3e0a11479b66871fe575d Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 29 Mar 2015 21:37:30 -0600 Subject: [PATCH 010/115] commented out btsync, testing syncthing --- bashrc | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/bashrc b/bashrc index e49d5c8..3e5ed87 100644 --- a/bashrc +++ b/bashrc @@ -18,7 +18,7 @@ fi #source /etc/profile.d/bash-completion.sh source ~/todo.txt-cli/todo_completion alias emacs='emacs -nw' -alias t='$HOME/Dropbox/todo/todo.sh -d $HOME/Dropbox/todo/todo.cfg' +alias t='clear && $HOME/Dropbox/todo/todo.sh -d $HOME/Dropbox/todo/todo.cfg' alias nano='nano -w' alias ls='ls --color=auto' alias grep='grep --color=auto' @@ -29,18 +29,17 @@ PATH="/home/ewpt3ch/bin:${PATH}:./:" export VMWARE_USE_SHIPPED_GTK="yes" export EDITOR=vim export PAGER=less +export LIBVA_DRIVER_NAME=vdpau #create cache-dir for chrome mkdir -p /tmp/ewpt3ch-cache -keychain -q ~/.ssh/id_ecdsa ~/.ssh/id_rsa -. ~/.keychain/$HOSTNAME-sh -. ~/.keychain/$HOSTNAME-sh-gpg +eval $(keychain --eval --agents ssh -Q --quiet ~/.ssh/id_ecdsa ~/.ssh/id_rsa) #Check if dropbox is running if dropbox.py running ; then #start dropbox ~/bin/dropbox.py start fi #check if btsync running and start -if ! ps -A | grep -q btsync ; then +#if ! ps -A | grep -q btsync ; then #start btsync - btsync --config ~/.config/btsync/btsync.conf -fi +# btsync --config ~/.config/btsync/btsync.conf +#fi From 8b716cff1e1c7b08b210d94f4e887ec74e6d11d0 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 29 Mar 2015 21:38:42 -0600 Subject: [PATCH 011/115] 4 tagkeys from 9 --- dwm.config.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dwm.config.h b/dwm.config.h index 73894ec..4772b39 100644 --- a/dwm.config.h +++ b/dwm.config.h @@ -17,7 +17,7 @@ static const Bool showbar = True; /* False means no bar */ static const Bool topbar = True; /* False means bottom bar */ /* tagging */ -static const char *tags[] = { "term", "coms", "www", "dev", "work", "6", "7", "8", "9" }; +static const char *tags[] = { "term", "work", "www", "dev" }; static const Rule rules[] = { /* class instance title tags mask isfloating monitor */ @@ -93,11 +93,6 @@ static Key keys[] = { TAGKEYS( XK_2, 1) TAGKEYS( XK_3, 2) TAGKEYS( XK_4, 3) - TAGKEYS( XK_5, 4) - TAGKEYS( XK_6, 5) - TAGKEYS( XK_7, 6) - TAGKEYS( XK_8, 7) - TAGKEYS( XK_9, 8) { MODKEY|ShiftMask, XK_q, quit, {0} }, }; From d8e3a9eb7802cf89dd5eb3e311b1498e7fcdbcac Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 29 Mar 2015 21:39:56 -0600 Subject: [PATCH 012/115] redshift added manual location --- redshift | 2 ++ 1 file changed, 2 insertions(+) diff --git a/redshift b/redshift index fd19c4a..72384de 100644 --- a/redshift +++ b/redshift @@ -3,6 +3,8 @@ temp-day=6300 temp-night=4000 transition=1 +location-provider=manual + [manual] ;denver From acc70400352b41775aa5e9b7f1d9a67a40612b01 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 29 Mar 2015 21:40:36 -0600 Subject: [PATCH 013/115] added termite to TERM --- dircolors.ansi-dark | 1 + 1 file changed, 1 insertion(+) diff --git a/dircolors.ansi-dark b/dircolors.ansi-dark index fad41ce..2b6dd40 100644 --- a/dircolors.ansi-dark +++ b/dircolors.ansi-dark @@ -97,6 +97,7 @@ TERM xterm-256color TERM xterm-88color TERM xterm-color TERM xterm-debian +TERM xterm-termite # EIGHTBIT, followed by '1' for on, '0' for off. (8-bit output) EIGHTBIT 1 From a28f3f35f133d5ca64b36950bd5ac9daf50c0ff9 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 5 Apr 2015 23:28:53 -0600 Subject: [PATCH 014/115] set firefox to open on current tag(s) --- dwm.config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dwm.config.h b/dwm.config.h index 4772b39..7b820cd 100644 --- a/dwm.config.h +++ b/dwm.config.h @@ -22,7 +22,7 @@ static const char *tags[] = { "term", "work", "www", "dev" }; static const Rule rules[] = { /* class instance title tags mask isfloating monitor */ { "Gimp", NULL, NULL, 0, True, -1 }, - { "Firefox", NULL, NULL, 1, False, -1 }, + { "Firefox", NULL, NULL, 0, False, -1 }, }; /* layout(s) */ From 57ba97faafddf843082cf64e3f5ef4ce8a8f8fc7 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Fri, 17 Apr 2015 22:11:17 -0600 Subject: [PATCH 015/115] added network speed and glyphs to conky --- conkyrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conkyrc b/conkyrc index 7d78556..78942c2 100644 --- a/conkyrc +++ b/conkyrc @@ -12,4 +12,4 @@ total_run_times 0 use_spacer none TEXT -${exec ~/bin/cmus-stats.sh} ${exec ~/bin/volume.sh} ${battery BAT1} ${wireless_essid wlp1s0} ${addr wlp1s0} $time +${exec ~/bin/cmus-stats.sh} ${exec ~/bin/volume.sh} ${battery_short BAT1} ${wireless_essid wlp1s0} ${addr wlp1s0} ↓${downspeed wlp1s0} ↑${upspeed wlp1s0} $time From 3fce05bae3c0cf0ec5251ddbac7ebae512c107b4 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Fri, 17 Apr 2015 22:27:01 -0600 Subject: [PATCH 016/115] cpu % and mem % added to conky --- conkyrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conkyrc b/conkyrc index 78942c2..2a20770 100644 --- a/conkyrc +++ b/conkyrc @@ -12,4 +12,4 @@ total_run_times 0 use_spacer none TEXT -${exec ~/bin/cmus-stats.sh} ${exec ~/bin/volume.sh} ${battery_short BAT1} ${wireless_essid wlp1s0} ${addr wlp1s0} ↓${downspeed wlp1s0} ↑${upspeed wlp1s0} $time +${exec ~/bin/cmus-stats.sh} ${exec ~/bin/volume.sh} ${battery_short BAT1} C${cpu}% M${memperc}% ${wireless_essid wlp1s0} ${addr wlp1s0} ↓${downspeed wlp1s0} ↑${upspeed wlp1s0} $time From 129084cc57b1d2ff01294eee37e848f1b57aa92d Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Fri, 24 Apr 2015 20:20:42 -0600 Subject: [PATCH 017/115] switched battery placement to beginning of bar --- conkyrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conkyrc b/conkyrc index 2a20770..cf02ebb 100644 --- a/conkyrc +++ b/conkyrc @@ -12,4 +12,4 @@ total_run_times 0 use_spacer none TEXT -${exec ~/bin/cmus-stats.sh} ${exec ~/bin/volume.sh} ${battery_short BAT1} C${cpu}% M${memperc}% ${wireless_essid wlp1s0} ${addr wlp1s0} ↓${downspeed wlp1s0} ↑${upspeed wlp1s0} $time +${battery_short BAT1} ${exec ~/bin/cmus-stats.sh} ${exec ~/bin/volume.sh} C${cpu}% M${memperc}% ${wireless_essid wlp1s0} ${addr wlp1s0} ↓${downspeed wlp1s0} ↑${upspeed wlp1s0} $time From 602796a23625f6c46738295027d9e806e397faf3 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Wed, 29 Apr 2015 22:27:14 -0600 Subject: [PATCH 018/115] changed play symbol for cmus --- cmus-stats.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmus-stats.sh b/cmus-stats.sh index d5cf5ee..41be64e 100755 --- a/cmus-stats.sh +++ b/cmus-stats.sh @@ -4,7 +4,7 @@ then status=`cmus-remote -Q | grep status | awk '{print $2}'` if [ $status == "paused" ] then - status="ç" + status="→" else status="æ" fi From 0c9d12dae123833b287c69dc3a4facd00c8eed79 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Wed, 29 Apr 2015 22:46:29 -0600 Subject: [PATCH 019/115] changed termite config colors to term.sexy solarized dark output --- termite.config | 57 +++++++++++++++++++++++++++++++------------------- 1 file changed, 35 insertions(+), 22 deletions(-) diff --git a/termite.config b/termite.config index 909419d..b7b4f0a 100644 --- a/termite.config +++ b/termite.config @@ -5,29 +5,42 @@ font = Inconsolata 12 # Solarized dark color scheme [colors] -foreground = #839496 -foreground_bold = #eee8d5 -#foreground_dim = #888888 -background = #002b36 -cursor = #93a1a1 -# if unset, will reverse foreground and background -#highlight = #839496 +# special +foreground = #93a1a1 +foreground_bold = #93a1a1 +cursor = #93a1a1 +background = #002b36 -# colors from color0 to color254 can be set -color0 = #073642 -color1 = #dc322f -color2 = #859900 -color3 = #b58900 -color4 = #268bd2 -color5 = #d33682 -color6 = #2aa198 -color7 = #eee8d5 -color8 = #002b36 -color9 = #cb4b16 -color10 = #586e75 -color11 = #657b83 -color12 = #839496 +# black +color0 = #002b36 +color8 = #657b83 + +# red +color1 = #dc322f +color9 = #dc322f + +# green +color2 = #859900 +color10 = #859900 + +# yellow +color3 = #b58900 +color11 = #b58900 + +# blue +color4 = #268bd2 +color12 = #268bd2 + +# magenta +color5 = #6c71c4 color13 = #6c71c4 -color14 = #93a1a1 + +# cyan +color6 = #2aa198 +color14 = #2aa198 + +# white +color7 = #93a1a1 color15 = #fdf6e3 + From 9aa8a44ee5862f38419d021cb20a9090a17aabda Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 17 May 2015 21:28:43 -0600 Subject: [PATCH 020/115] dwm config updated for colors --- dwm.config.h | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/dwm.config.h b/dwm.config.h index 7b820cd..98b24c5 100644 --- a/dwm.config.h +++ b/dwm.config.h @@ -1,16 +1,20 @@ /* See LICENSE file for copyright and license details. */ -/*includes*/ -#include /*Needed for mulitmedia keys*/ /* appearance */ -//static const char font[] = "Ohsnap.Icons:size=12"; static const char font[] = "Inconsolata-12"; -static const char normbordercolor[] = "#444444"; -static const char normbgcolor[] = "#222222"; -static const char normfgcolor[] = "#bbbbbb"; -static const char selbordercolor[] = "#005577"; -static const char selbgcolor[] = "#005577"; -static const char selfgcolor[] = "#eeeeee"; +#define NUMCOLORS 9 +static const char colors[NUMCOLORS][ColLast][9] = { + // border foreground background + { "#212121", "#696969", "#121212" }, // 0 = normal + { "#696969", "#E0E0E0", "#121212" }, // 1 = selected + { "#212121", "#CF4F88", "#121212" }, // 2 = red + { "#212121", "#53A6A6", "#121212" }, // 3 = green + { "#212121", "#914E89", "#121212" }, // 4 = yellow + { "#212121", "#4779B3", "#121212" }, // 5 = blue + { "#212121", "#47959E", "#121212" }, // 6 = cyan + { "#212121", "#7E62B3", "#121212" }, // 7 = magenta + { "#212121", "#899CA1", "#121212" }, // 8 = grey + }; static const unsigned int borderpx = 1; /* border pixel of windows */ static const unsigned int snap = 32; /* snap pixel */ static const Bool showbar = True; /* False means no bar */ @@ -40,8 +44,8 @@ static const Layout layouts[] = { /* key definitions */ #define MODKEY Mod1Mask #define TAGKEYS(KEY,TAG) \ - { MODKEY, KEY, toggleview, {.ui = 1 << TAG} }, \ - { MODKEY|ControlMask, KEY, view, {.ui = 1 << TAG} }, \ + { MODKEY, KEY, view, {.ui = 1 << TAG} }, \ + { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \ { MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \ { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} }, @@ -49,7 +53,7 @@ static const Layout layouts[] = { #define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } } /* commands */ -static const char *dmenucmd[] = { "dmenu_run", "-fn", "Inconsolata-12", "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL }; +static const char *dmenucmd[] = { "dmenu_run", "-fn", font, "-nb", colors[0][ColBG], "-nf", colors[0][ColFG], "-sb", colors[1][ColBG], "-sf", colors[1][ColFG], NULL }; static const char *termcmd[] = { "termite", NULL }; /*functions for volume control*/ static const char *upvol[] = { "amixer", "sset", "Master", "1%+", NULL}; @@ -91,7 +95,7 @@ static Key keys[] = { { MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } }, TAGKEYS( XK_1, 0) TAGKEYS( XK_2, 1) - TAGKEYS( XK_3, 2) + TAGKEYS( XK_3, 2) TAGKEYS( XK_4, 3) { MODKEY|ShiftMask, XK_q, quit, {0} }, }; From 912910809201afa3f5867af17d46d8b542b5d74e Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 17 May 2015 21:51:33 -0600 Subject: [PATCH 021/115] fixed missed XF86 key include dwm --- dwm.config.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dwm.config.h b/dwm.config.h index 98b24c5..1a9cd4f 100644 --- a/dwm.config.h +++ b/dwm.config.h @@ -1,4 +1,6 @@ /* See LICENSE file for copyright and license details. */ +/*includes*/ +#include /*Needed for mulitmedia keys*/ /* appearance */ static const char font[] = "Inconsolata-12"; From c3c626ff4726ff8d02d525fd33877c589d8b0ba9 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Mon, 18 May 2015 14:29:16 -0600 Subject: [PATCH 022/115] added pacman aliases --- bashrc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bashrc b/bashrc index 3e5ed87..d94c2c1 100644 --- a/bashrc +++ b/bashrc @@ -17,6 +17,9 @@ fi # Put your fun stuff here. #source /etc/profile.d/bash-completion.sh source ~/todo.txt-cli/todo_completion +#pacman aliases +alias pacupg='sudo pacman -Syu' +alias pacins='sudo pacman -U' alias emacs='emacs -nw' alias t='clear && $HOME/Dropbox/todo/todo.sh -d $HOME/Dropbox/todo/todo.cfg' alias nano='nano -w' From d3c99a252a174ba0c72ee39d616af8b33ffc0f89 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Mon, 18 May 2015 14:29:36 -0600 Subject: [PATCH 023/115] changed colors in dwm --- dwm.config.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dwm.config.h b/dwm.config.h index 1a9cd4f..0fd3c2f 100644 --- a/dwm.config.h +++ b/dwm.config.h @@ -7,9 +7,9 @@ static const char font[] = "Inconsolata-12"; #define NUMCOLORS 9 static const char colors[NUMCOLORS][ColLast][9] = { // border foreground background - { "#212121", "#696969", "#121212" }, // 0 = normal - { "#696969", "#E0E0E0", "#121212" }, // 1 = selected - { "#212121", "#CF4F88", "#121212" }, // 2 = red + { "#212121", "#00CC00", "#121212" }, // 0 = normal + { "#696969", "#99FF99", "#121212" }, // 1 = selected + { "#212121", "#CC0000", "#121212" }, // 2 = red { "#212121", "#53A6A6", "#121212" }, // 3 = green { "#212121", "#914E89", "#121212" }, // 4 = yellow { "#212121", "#4779B3", "#121212" }, // 5 = blue From 653cf53417544ca2f6bd21d9e6c46794109156f1 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 24 May 2015 19:33:54 -0600 Subject: [PATCH 024/115] changed cursor, removed colors --- Xresources | 57 +----------------------------------------------------- 1 file changed, 1 insertion(+), 56 deletions(-) diff --git a/Xresources b/Xresources index d9a651b..1834f0c 100644 --- a/Xresources +++ b/Xresources @@ -6,7 +6,7 @@ Xft*hintstyle: full Xft*rgba: rgb !Xcursor -Xcursor.theme: gentoo-blue +Xcursor.theme: Bluecurve Xcursor.size: 22 !xterm @@ -16,58 +16,3 @@ xterm*savelines: 4096 xterm*VT100.geometry: 80x32 xterm*faceName: incosolata-10 xterm*utf8: 1 - -#define S_base03 #002b36 -#define S_base02 #073642 -#define S_base01 #586e75 -#define S_base00 #657b83 -#define S_base0 #839496 -#define S_base1 #93a1a1 -#define S_base2 #eee8d5 -#define S_base3 #fdf6e3 -#define S_yellow #b58900 -#define S_orange #cb4b16 -#define S_red #dc322f -#define S_magenta #d33682 -#define S_violet #6c71c4 -#define S_blue #268bd2 -#define S_cyan #2aa198 -#define S_green #859900 - -*background: S_base03 -*foreground: S_base00 -*cursorColor: S_base1 -*pointerColorBackground:S_base01 -*pointerColorForeground:S_base1 - -!! black dark/light -*color0: S_base02 -*color8: S_base03 - -!! red dark/light -*color1: S_red -*color9: S_orange - -!! green dark/light -*color2: S_green -*color10: S_base01 - -!! yellow dark/light -*color3: S_yellow -*color11: S_base00 - -!! blue dark/light -*color4: S_blue -*color12: S_base0 - -!! magenta dark/light -*color5: S_magenta -*color13: S_violet - -!! cyan dark/light -*color6: S_cyan -*color14: S_base1 - -!! white dark/light -*color7: S_base2 -*color15: S_base3 From 1c60cb9771d5092f1c48f0ceea9f1b94ad9e887f Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 24 May 2015 21:12:29 -0600 Subject: [PATCH 025/115] initial commit of new dwmstart and dwmstatus --- dwm-start.sh | 13 +++++++++++++ dwmstatus.sh | 18 ++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100755 dwm-start.sh create mode 100755 dwmstatus.sh diff --git a/dwm-start.sh b/dwm-start.sh new file mode 100755 index 0000000..7b714d2 --- /dev/null +++ b/dwm-start.sh @@ -0,0 +1,13 @@ +#!/bin/sh +# Script to start dwm in loop + +while true; do + $HOME/bin/dwmstatus + sleep 2 +done & + +while true; do + dwm >/dev/null + # to log stderrors to a file + # dwm 2> ~/Build/dwm/dwm.log +done diff --git a/dwmstatus.sh b/dwmstatus.sh new file mode 100755 index 0000000..ce563e7 --- /dev/null +++ b/dwmstatus.sh @@ -0,0 +1,18 @@ +#!/bin/bash +# status script for dwm +# influenced by: +# https://bitbucket.org/jasonwryan/shiv/Scripts/dwm-status +# https://github.com/w0ng/bin/blob/master/dwm-statusbar +######################## +## eric@ewpt3ch.com #### +## dwmstatus ########### +######################## +# colors: + +dte(){ + dte="$(date "+%I:%M")" + echo -e "\x02$dte\x01" +} + +# Pipe to statusbar +xsetroot -name "$(dte) " From 9ec0623d57c53764c4d74ee6871cfa3bbcd996d0 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Mon, 25 May 2015 13:59:52 -0600 Subject: [PATCH 026/115] fixed font and tags for icons --- dwm.config.h | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/dwm.config.h b/dwm.config.h index 0fd3c2f..00d0efe 100644 --- a/dwm.config.h +++ b/dwm.config.h @@ -3,19 +3,20 @@ #include /*Needed for mulitmedia keys*/ /* appearance */ -static const char font[] = "Inconsolata-12"; +static const char font[] = "Inconsolataicon-12"; + #define NUMCOLORS 9 static const char colors[NUMCOLORS][ColLast][9] = { // border foreground background - { "#212121", "#00CC00", "#121212" }, // 0 = normal - { "#696969", "#99FF99", "#121212" }, // 1 = selected - { "#212121", "#CC0000", "#121212" }, // 2 = red - { "#212121", "#53A6A6", "#121212" }, // 3 = green - { "#212121", "#914E89", "#121212" }, // 4 = yellow - { "#212121", "#4779B3", "#121212" }, // 5 = blue - { "#212121", "#47959E", "#121212" }, // 6 = cyan - { "#212121", "#7E62B3", "#121212" }, // 7 = magenta - { "#212121", "#899CA1", "#121212" }, // 8 = grey + { "#212121", "#ADFF2F", "#2F4F4F" }, // 0 = normal + { "#696969", "#00CED1", "#2F4F4F" }, // 1 = selected + { "#212121", "#CC0000", "#2F4F4F" }, // 2 = red + { "#212121", "#53A6A6", "#2F4F4F" }, // 3 = green + { "#212121", "#914E89", "#2F4F4F" }, // 4 = yellow + { "#212121", "#4779B3", "#2F4F4F" }, // 5 = blue + { "#212121", "#47959E", "#2F4F4F" }, // 6 = cyan + { "#212121", "#7E62B3", "#2F4F4F" }, // 7 = magenta + { "#212121", "#899CA1", "#2F4F4F" }, // 8 = grey }; static const unsigned int borderpx = 1; /* border pixel of windows */ static const unsigned int snap = 32; /* snap pixel */ @@ -23,7 +24,7 @@ static const Bool showbar = True; /* False means no bar */ static const Bool topbar = True; /* False means bottom bar */ /* tagging */ -static const char *tags[] = { "term", "work", "www", "dev" }; +static const char *tags[] = { "\u01A0", "\u01A1 ", "\u01A2", "\u01A3 " }; static const Rule rules[] = { /* class instance title tags mask isfloating monitor */ From bf77e69dc2a7f0c30da715d2407e817ac2ed2069 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Mon, 25 May 2015 14:01:59 -0600 Subject: [PATCH 027/115] added BROWSER --- bashrc | 1 + 1 file changed, 1 insertion(+) diff --git a/bashrc b/bashrc index d94c2c1..a99f347 100644 --- a/bashrc +++ b/bashrc @@ -33,6 +33,7 @@ export VMWARE_USE_SHIPPED_GTK="yes" export EDITOR=vim export PAGER=less export LIBVA_DRIVER_NAME=vdpau +export BROWSER=firefox-developer #create cache-dir for chrome mkdir -p /tmp/ewpt3ch-cache eval $(keychain --eval --agents ssh -Q --quiet ~/.ssh/id_ecdsa ~/.ssh/id_rsa) From c2c27d893a58c62241fb0b296c42d7b1c57ca969 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Mon, 25 May 2015 14:03:57 -0600 Subject: [PATCH 028/115] changed log location --- dwm-start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dwm-start.sh b/dwm-start.sh index 7b714d2..1885525 100755 --- a/dwm-start.sh +++ b/dwm-start.sh @@ -9,5 +9,5 @@ done & while true; do dwm >/dev/null # to log stderrors to a file - # dwm 2> ~/Build/dwm/dwm.log + #dwm 2> /tmp/dwm.log done From 30b8a0a7408bc08b46296e01bd3fd7e203fa31ec Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Mon, 25 May 2015 18:12:43 -0600 Subject: [PATCH 029/115] battery, date, and music in dwmstatus --- dwmstatus.sh | 45 ++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 40 insertions(+), 5 deletions(-) diff --git a/dwmstatus.sh b/dwmstatus.sh index ce563e7..76d87ec 100755 --- a/dwmstatus.sh +++ b/dwmstatus.sh @@ -7,12 +7,47 @@ ## eric@ewpt3ch.com #### ## dwmstatus ########### ######################## -# colors: -dte(){ - dte="$(date "+%I:%M")" - echo -e "\x02$dte\x01" +# colors from dwm.config.h +color_normal="\x01" #normal +color_selected="\x02" #selected +color_blue="\x06" #blue +color_red="\x03" #red + +# Icon glyphs from Inconsolataicon +glyph_cpu="\u01B0" +glyph_mem="\u01B1" +glyph_dl="\u01A5" +glyph_ul="\u01A4" +glyph_pow="\u01B2" +glyph_clk="\u01Af" +glyph_bln="\u01AA" +glyph_msc="\u01AB" +glyph_vol="\u01AC" +glyph_mail="\u01AD" +glyph_wifi="\u01AE" + +# Song info +msc(){ + if [ -x /usr/bin/cmus-remote ] + then + artist=`cmus-remote -Q | grep -w artist | cut -d ' ' -f3-` + song=`cmus-remote -Q | grep title | cut -d ' ' -f3-` + song_info=${artist}-${song} + fi + + echo -ne "${glyph_msc} ${song_info}" } +dte(){ + datetime="$(date "+%F %T")" + echo -ne "${glyph_clk} ${datetime}" +} + +bat(){ + charge=`acpi -b | awk '{print +$4}'` + echo -ne "${glyph_pow} ${charge}%" +} + # Pipe to statusbar -xsetroot -name "$(dte) " +xsetroot -name "$(msc) $(bat) $(dte) " From 6f3baf9debbe96b83e49f7be2728a3b6d4ade58b Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Mon, 25 May 2015 18:51:34 -0600 Subject: [PATCH 030/115] added volume and mute --- dwmstatus.sh | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dwmstatus.sh b/dwmstatus.sh index 76d87ec..394a9cd 100755 --- a/dwmstatus.sh +++ b/dwmstatus.sh @@ -24,6 +24,7 @@ glyph_clk="\u01Af" glyph_bln="\u01AA" glyph_msc="\u01AB" glyph_vol="\u01AC" +glyph_mute="\u01B4" glyph_mail="\u01AD" glyph_wifi="\u01AE" @@ -39,15 +40,29 @@ msc(){ echo -ne "${glyph_msc} ${song_info}" } +#Date dte(){ datetime="$(date "+%F %T")" echo -ne "${glyph_clk} ${datetime}" } +#Power and Battery bat(){ charge=`acpi -b | awk '{print +$4}'` echo -ne "${glyph_pow} ${charge}%" } + +#Volume +vol(){ + mute=`amixer get Master | grep "Front Left:" | awk '{print $6}'` + if [ ${mute} == "[on]" ] + then + volume=`amixer get Master | grep "Front Left:" | awk '{print $5}' | tr -d '[]'` + echo -ne "${glyph_vol} ${volume}" + else + echo -ne "${glyph_mute}" + fi +} # Pipe to statusbar -xsetroot -name "$(msc) $(bat) $(dte) " +xsetroot -name "$(msc) $(vol) $(bat) $(dte) " From e0dc150571b6c9becee0b5d35256a613b3f876d9 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Mon, 25 May 2015 20:12:22 -0600 Subject: [PATCH 031/115] cpu and mem added to dwmstatus --- dwmstatus.sh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dwmstatus.sh b/dwmstatus.sh index 394a9cd..b9b9c20 100755 --- a/dwmstatus.sh +++ b/dwmstatus.sh @@ -63,6 +63,18 @@ vol(){ echo -ne "${glyph_mute}" fi } + +#Memory +mem(){ + memused="$(free -m | awk 'NR==2 {print $3}')" + echo -ne "${glyph_mem}${memused}M" +} + +#CPU +load(){ + cpu="$(uptime | awk '{print +$8, +$9, +$10}')" + echo -ne "${glyph_cpu} ${cpu}" +} # Pipe to statusbar -xsetroot -name "$(msc) $(vol) $(bat) $(dte) " +xsetroot -name "$(msc) $(load) $(mem) $(bat) $(vol) $(dte) " From 39908358c651ba11c2f4c96aaa1aa842de1fe7a8 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Mon, 25 May 2015 20:58:02 -0600 Subject: [PATCH 032/115] added network speed --- dwmstatus.sh | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/dwmstatus.sh b/dwmstatus.sh index b9b9c20..1273d8c 100755 --- a/dwmstatus.sh +++ b/dwmstatus.sh @@ -75,6 +75,29 @@ load(){ cpu="$(uptime | awk '{print +$8, +$9, +$10}')" echo -ne "${glyph_cpu} ${cpu}" } - + +#Network +rx_old=$(cat /sys/class/net/wlp1s0/statistics/rx_bytes) +tx_old=$(cat /sys/class/net/wlp1s0/statistics/rx_bytes) +while true; do + #get new rx/tx counts + rx_now=$(cat /sys/class/net/wlp1s0/statistics/rx_bytes) + tx_now=$(cat /sys/class/net/wlp1s0/statistics/rx_bytes) + #calculate rate (K) + let rx_rate=($rx_now-$rx_old)/1024 + let tx_rate=($tx_now-$tx_old)/1024 + rx_rate(){ + echo -ne "${glyph_dl} ${rx_rate}K" + } + tx_rate(){ + echo -ne "${glyph_ul} ${tx_rate}K" + } + # Pipe to statusbar -xsetroot -name "$(msc) $(load) $(mem) $(bat) $(vol) $(dte) " +xsetroot -name "$(msc) $(load) $(mem) $(rx_rate)$(tx_rate) $(bat) $(vol) $(dte) " + + #reset rates + rx_old=$rx_now + tx_old=$tx_now + sleep 1 +done From eabd9e1b36e802fe571b33949b94c82d183b84bf Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Thu, 28 May 2015 22:08:48 -0600 Subject: [PATCH 033/115] color changes --- dwm.config.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dwm.config.h b/dwm.config.h index 00d0efe..59cd99d 100644 --- a/dwm.config.h +++ b/dwm.config.h @@ -8,15 +8,15 @@ static const char font[] = "Inconsolataicon-12"; #define NUMCOLORS 9 static const char colors[NUMCOLORS][ColLast][9] = { // border foreground background - { "#212121", "#ADFF2F", "#2F4F4F" }, // 0 = normal - { "#696969", "#00CED1", "#2F4F4F" }, // 1 = selected - { "#212121", "#CC0000", "#2F4F4F" }, // 2 = red - { "#212121", "#53A6A6", "#2F4F4F" }, // 3 = green - { "#212121", "#914E89", "#2F4F4F" }, // 4 = yellow - { "#212121", "#4779B3", "#2F4F4F" }, // 5 = blue - { "#212121", "#47959E", "#2F4F4F" }, // 6 = cyan - { "#212121", "#7E62B3", "#2F4F4F" }, // 7 = magenta - { "#212121", "#899CA1", "#2F4F4F" }, // 8 = grey + { "#212121", "#00FFFF", "#2F4F4F" }, // 0 = normal + { "#696969", "#ADFF2F", "#2F4F4F" }, // 1 = selected + { "#212121", "#F8F8FF", "#C71585" }, // 2 = urgent + { "#212121", "#90EE90", "#778899" }, // 3 = important + { "#212121", "#FFFF00", "#2F4F4F" }, // 4 = yellow + { "#212121", "#00BFFF", "#2F4F4F" }, // 5 = blue + { "#212121", "#00FFFF", "#2F4F4F" }, // 6 = cyan + { "#212121", "#FF00FF", "#2F4F4F" }, // 7 = magenta + { "#212121", "#F5F5F5", "#2F4F4F" }, // 8 = grey }; static const unsigned int borderpx = 1; /* border pixel of windows */ static const unsigned int snap = 32; /* snap pixel */ From ada2ce5391735e2bc5574a78b1c8c0711fdfac72 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Thu, 28 May 2015 22:09:30 -0600 Subject: [PATCH 034/115] added colors --- dwmstatus.sh | 42 ++++++++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/dwmstatus.sh b/dwmstatus.sh index 1273d8c..fb1e44a 100755 --- a/dwmstatus.sh +++ b/dwmstatus.sh @@ -9,10 +9,15 @@ ######################## # colors from dwm.config.h -color_normal="\x01" #normal -color_selected="\x02" #selected -color_blue="\x06" #blue -color_red="\x03" #red +color_normal="\x01" #normal +color_selected="\x02" #selected +color_urgent="\x03" #urgent +color_important="\x04" #important +color_yellow="\x05" #yellow +color_blue="\x06" #blue +color_cyan="\x07" #cyan +color_magenta="\x08" #magenta +color_grey="\x09" #grey # Icon glyphs from Inconsolataicon glyph_cpu="\u01B0" @@ -37,19 +42,24 @@ msc(){ song_info=${artist}-${song} fi - echo -ne "${glyph_msc} ${song_info}" + echo -ne "${color_selected}${glyph_msc} ${song_info}${color_normal}" } #Date dte(){ datetime="$(date "+%F %T")" - echo -ne "${glyph_clk} ${datetime}" + echo -ne "${color_selected}${glyph_clk} ${datetime}${color_normal}" } #Power and Battery bat(){ charge=`acpi -b | awk '{print +$4}'` - echo -ne "${glyph_pow} ${charge}%" + if [ $charge -lt "25" ] + then + echo -ne "${color_urgent}${glyph_pow} ${charge}%${color_normal}" + else + echo -ne "${color_selected}${glyph_pow} ${charge}%${color_normal}" + fi } #Volume @@ -72,20 +82,20 @@ mem(){ #CPU load(){ - cpu="$(uptime | awk '{print +$8, +$9, +$10}')" + cpu="$(cat /proc/loadavg | awk '{print $1, $2, $3}')" echo -ne "${glyph_cpu} ${cpu}" } #Network rx_old=$(cat /sys/class/net/wlp1s0/statistics/rx_bytes) -tx_old=$(cat /sys/class/net/wlp1s0/statistics/rx_bytes) +tx_old=$(cat /sys/class/net/wlp1s0/statistics/tx_bytes) while true; do #get new rx/tx counts rx_now=$(cat /sys/class/net/wlp1s0/statistics/rx_bytes) - tx_now=$(cat /sys/class/net/wlp1s0/statistics/rx_bytes) - #calculate rate (K) - let rx_rate=($rx_now-$rx_old)/1024 - let tx_rate=($tx_now-$tx_old)/1024 + tx_now=$(cat /sys/class/net/wlp1s0/statistics/tx_bytes) + #calculate rate (K) divide by 1024 * polling rate (sleep below) + let rx_rate=($rx_now-$rx_old)/2048 + let tx_rate=($tx_now-$tx_old)/2048 rx_rate(){ echo -ne "${glyph_dl} ${rx_rate}K" } @@ -93,11 +103,11 @@ while true; do echo -ne "${glyph_ul} ${tx_rate}K" } -# Pipe to statusbar -xsetroot -name "$(msc) $(load) $(mem) $(rx_rate)$(tx_rate) $(bat) $(vol) $(dte) " + # Pipe to statusbar + xsetroot -name "$(msc) $(load) $(mem) $(rx_rate)$(tx_rate) $(bat) $(vol) $(dte) " #reset rates rx_old=$rx_now tx_old=$tx_now - sleep 1 + sleep 2 done From a51b25450f464790a4910f38be99d2c901fc0f34 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 31 May 2015 16:53:21 -0600 Subject: [PATCH 035/115] added loop for status --- dwm-start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dwm-start.sh b/dwm-start.sh index 1885525..4308cf8 100755 --- a/dwm-start.sh +++ b/dwm-start.sh @@ -3,7 +3,7 @@ while true; do $HOME/bin/dwmstatus - sleep 2 + sleep 2 done & while true; do From 216a6d33a826702ef83d397718bfd48b9e17cd3e Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 31 May 2015 16:55:56 -0600 Subject: [PATCH 036/115] added unclutter to hide mouse --- xinitrc | 1 + 1 file changed, 1 insertion(+) diff --git a/xinitrc b/xinitrc index 033c0de..d2df52e 100644 --- a/xinitrc +++ b/xinitrc @@ -5,4 +5,5 @@ redshift & #pulseaudio --start & start-pulseaudio-x11 google-musicmanager & +unclutter -noevents & exec dbus-launch --exit-with-session --sh-syntax dwm From a438fd787f56c350eff5c2260346cd1f16207f80 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 31 May 2015 16:56:33 -0600 Subject: [PATCH 037/115] added bell visual for urgency hints --- termite.config | 1 + 1 file changed, 1 insertion(+) diff --git a/termite.config b/termite.config index b7b4f0a..f2f5ef7 100644 --- a/termite.config +++ b/termite.config @@ -1,6 +1,7 @@ #Customizations [options] font = Inconsolata 12 +urgent_on_bell = true # Solarized dark color scheme From 90479c411907b2687dd00e4ef203301dd5702de1 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 31 May 2015 16:57:22 -0600 Subject: [PATCH 038/115] added bell to all windows --- tmux.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tmux.conf b/tmux.conf index 7ded1c6..8ebb489 100644 --- a/tmux.conf +++ b/tmux.conf @@ -10,4 +10,4 @@ bind-key a send-prefix set -g base-index 1 #Faster command sequence set -s escape-time 0 - +set -g bell-action any # listen for activity on all windows From ccb453319e8c9ad80246bd286c8285a95acee528 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 31 May 2015 16:58:44 -0600 Subject: [PATCH 039/115] added plug icon and colors for power --- dwmstatus.sh | 50 ++++++++++++++++++++++---------------------------- 1 file changed, 22 insertions(+), 28 deletions(-) diff --git a/dwmstatus.sh b/dwmstatus.sh index fb1e44a..dd2ebd2 100755 --- a/dwmstatus.sh +++ b/dwmstatus.sh @@ -23,7 +23,6 @@ color_grey="\x09" #grey glyph_cpu="\u01B0" glyph_mem="\u01B1" glyph_dl="\u01A5" -glyph_ul="\u01A4" glyph_pow="\u01B2" glyph_clk="\u01Af" glyph_bln="\u01AA" @@ -32,6 +31,7 @@ glyph_vol="\u01AC" glyph_mute="\u01B4" glyph_mail="\u01AD" glyph_wifi="\u01AE" +glyph_plug="\u01A4" # Song info msc(){ @@ -53,12 +53,23 @@ dte(){ #Power and Battery bat(){ - charge=`acpi -b | awk '{print +$4}'` - if [ $charge -lt "25" ] + on1="$( /dev/null && + echo -ne "${glyph_wifi}" || echo -ne "${color_important}${glyph_wifi}${color_normal}" +} - # Pipe to statusbar - xsetroot -name "$(msc) $(load) $(mem) $(rx_rate)$(tx_rate) $(bat) $(vol) $(dte) " - - #reset rates - rx_old=$rx_now - tx_old=$tx_now - sleep 2 -done +# Pipe to statusbar +xsetroot -name "$(msc) $(load) $(mem) $(int) $(bat) $(vol) $(dte) " From d134c73d6383963e88367da3e62a8ce9075df0a2 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 31 May 2015 17:23:34 -0600 Subject: [PATCH 040/115] added another bell feature --- tmux.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/tmux.conf b/tmux.conf index 8ebb489..387e140 100644 --- a/tmux.conf +++ b/tmux.conf @@ -11,3 +11,4 @@ set -g base-index 1 #Faster command sequence set -s escape-time 0 set -g bell-action any # listen for activity on all windows +set -g bell-on-alert on From c407d609b15ae56e20ffb76268a9cf1c6fbd2ab6 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 31 May 2015 17:24:09 -0600 Subject: [PATCH 041/115] fixed xinitrc not being integrated into dotfiles --- xinitrc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/xinitrc b/xinitrc index d2df52e..9569ef7 100644 --- a/xinitrc +++ b/xinitrc @@ -1,9 +1,6 @@ [[ -f ~/.Xresources ]] && xrdb -merge ~/.Xresources -#exec openbox-session -conky | while read -r; do xsetroot -name "$REPLY"; done & redshift & -#pulseaudio --start & start-pulseaudio-x11 google-musicmanager & unclutter -noevents & -exec dbus-launch --exit-with-session --sh-syntax dwm +exec dbus-launch --exit-with-session --sh-syntax $HOME/bin/dwm-start From 4e0e36bc8aa2785aeb2bff42635e2909ddf520d0 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 7 Jun 2015 18:04:17 -0600 Subject: [PATCH 042/115] added tag to dwm, switched alt behavior to toggle --- dwm.config.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dwm.config.h b/dwm.config.h index 59cd99d..d98dd80 100644 --- a/dwm.config.h +++ b/dwm.config.h @@ -24,12 +24,12 @@ static const Bool showbar = True; /* False means no bar */ static const Bool topbar = True; /* False means bottom bar */ /* tagging */ -static const char *tags[] = { "\u01A0", "\u01A1 ", "\u01A2", "\u01A3 " }; +static const char *tags[] = { "\u01A0", "\u01a5", "\u01A1 ", "\u01A2", "\u01A3 " }; static const Rule rules[] = { /* class instance title tags mask isfloating monitor */ { "Gimp", NULL, NULL, 0, True, -1 }, - { "Firefox", NULL, NULL, 0, False, -1 }, + { "Firefox", NULL, NULL, 1 << 3, False, -1 }, }; /* layout(s) */ @@ -47,8 +47,8 @@ static const Layout layouts[] = { /* key definitions */ #define MODKEY Mod1Mask #define TAGKEYS(KEY,TAG) \ - { MODKEY, KEY, view, {.ui = 1 << TAG} }, \ - { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \ + { MODKEY, KEY, toggleview, {.ui = 1 << TAG} }, \ + { MODKEY|ControlMask, KEY, view, {.ui = 1 << TAG} }, \ { MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \ { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} }, @@ -100,6 +100,7 @@ static Key keys[] = { TAGKEYS( XK_2, 1) TAGKEYS( XK_3, 2) TAGKEYS( XK_4, 3) + TAGKEYS( XK_5, 4) { MODKEY|ShiftMask, XK_q, quit, {0} }, }; From 19c0190106c25190cc937d55948a216c6e6f5f8d Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 7 Jun 2015 18:04:47 -0600 Subject: [PATCH 043/115] added npm completion --- bashrc | 1 + 1 file changed, 1 insertion(+) diff --git a/bashrc b/bashrc index a99f347..516d680 100644 --- a/bashrc +++ b/bashrc @@ -17,6 +17,7 @@ fi # Put your fun stuff here. #source /etc/profile.d/bash-completion.sh source ~/todo.txt-cli/todo_completion +source ~/bin/npm_completion #pacman aliases alias pacupg='sudo pacman -Syu' alias pacins='sudo pacman -U' From d095ae369dc655fd6e778b414317d7eade1452b0 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 7 Jun 2015 18:10:17 -0600 Subject: [PATCH 044/115] added bindings suggested in Painless Tmux --- tmux.conf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tmux.conf b/tmux.conf index 387e140..a894910 100644 --- a/tmux.conf +++ b/tmux.conf @@ -12,3 +12,8 @@ set -g base-index 1 set -s escape-time 0 set -g bell-action any # listen for activity on all windows set -g bell-on-alert on +bind | split-window -h +bind - split window -v +unbind x +bind x kill-pane +bind X kill-session From 10741b191880fc9c7c55c2a7e50c895d36866d49 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 7 Jun 2015 19:26:41 -0600 Subject: [PATCH 045/115] more painless tmux config adds --- tmux.conf | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/tmux.conf b/tmux.conf index a894910..e811fd1 100644 --- a/tmux.conf +++ b/tmux.conf @@ -1,4 +1,5 @@ -set -g terminal-overrides "xterm*:smcup@:rmcup@" +#set 256 colormode +set -g default-terminal "screen-256color" #remap prefix to ctrl + a unbind C-b set -g prefix C-a @@ -8,12 +9,22 @@ bind-key C-a last-window bind-key a send-prefix #start window numbering at 1 set -g base-index 1 +#start pane numbering at 1 +setw -g pane-base-index 1 +#reload config +bind r source-file ~/.tmux.conf \; display "config file loaded." #Faster command sequence set -s escape-time 0 set -g bell-action any # listen for activity on all windows set -g bell-on-alert on bind | split-window -h -bind - split window -v +bind - split-window -v unbind x bind x kill-pane bind X kill-session + +#pane resizing vim style +bind-key -r K resize-pane -U +bind-key -r J resize-pane -D +bind-key -r H resize-pane -L +bind-key -r L resize-pane -R From bc4150c2abf54b40af97b01ace8a46d0996bf44a Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sat, 13 Jun 2015 20:16:26 -0600 Subject: [PATCH 046/115] switched keychain to ed25519 --- bashrc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bashrc b/bashrc index 516d680..807b0ef 100644 --- a/bashrc +++ b/bashrc @@ -37,7 +37,8 @@ export LIBVA_DRIVER_NAME=vdpau export BROWSER=firefox-developer #create cache-dir for chrome mkdir -p /tmp/ewpt3ch-cache -eval $(keychain --eval --agents ssh -Q --quiet ~/.ssh/id_ecdsa ~/.ssh/id_rsa) +eval $(keychain --eval --agents ssh -Q --quiet ~/.ssh/id_ed25519 ~/.ssh/id_rsa) +#eval $(keychain --eval --agents ssh -Q --quiet ~/.ssh/id_ecdsa ~/.ssh/id_rsa) #Check if dropbox is running if dropbox.py running ; then #start dropbox From 3c8d1afbbb80b3a965662868dd3c8f081ba95d68 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sat, 13 Jun 2015 20:17:51 -0600 Subject: [PATCH 047/115] removed id_rsa from keychain --- bashrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bashrc b/bashrc index 807b0ef..ac3d846 100644 --- a/bashrc +++ b/bashrc @@ -37,7 +37,7 @@ export LIBVA_DRIVER_NAME=vdpau export BROWSER=firefox-developer #create cache-dir for chrome mkdir -p /tmp/ewpt3ch-cache -eval $(keychain --eval --agents ssh -Q --quiet ~/.ssh/id_ed25519 ~/.ssh/id_rsa) +eval $(keychain --eval --agents ssh -Q --quiet ~/.ssh/id_ed25519) #eval $(keychain --eval --agents ssh -Q --quiet ~/.ssh/id_ecdsa ~/.ssh/id_rsa) #Check if dropbox is running if dropbox.py running ; then From 4bde930bcfdd1a99777d2e377b88d112e46f39e2 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sat, 13 Jun 2015 20:30:36 -0600 Subject: [PATCH 048/115] changed colors --- termite.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/termite.config b/termite.config index f2f5ef7..b0d8b9a 100644 --- a/termite.config +++ b/termite.config @@ -11,7 +11,7 @@ urgent_on_bell = true foreground = #93a1a1 foreground_bold = #93a1a1 cursor = #93a1a1 -background = #002b36 +background = #003b36 # black color0 = #002b36 From 1d451739a592a91c5fed73ac499b76f74b3618f0 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sat, 13 Jun 2015 20:34:00 -0600 Subject: [PATCH 049/115] fixed termite background --- termite.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/termite.config b/termite.config index b0d8b9a..f2f5ef7 100644 --- a/termite.config +++ b/termite.config @@ -11,7 +11,7 @@ urgent_on_bell = true foreground = #93a1a1 foreground_bold = #93a1a1 cursor = #93a1a1 -background = #003b36 +background = #002b36 # black color0 = #002b36 From 485e5777606ce0ab22646aaf9e076178610a97c8 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sat, 13 Jun 2015 23:21:53 -0600 Subject: [PATCH 050/115] larger xcursor --- Xresources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Xresources b/Xresources index 1834f0c..3026585 100644 --- a/Xresources +++ b/Xresources @@ -7,7 +7,7 @@ Xft*rgba: rgb !Xcursor Xcursor.theme: Bluecurve -Xcursor.size: 22 +Xcursor.size: 42 !xterm xterm*termName: xterm-256color From e1be65bbb9d38a4ae11fe15fa21f00b9a1869b41 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sat, 13 Jun 2015 23:22:49 -0600 Subject: [PATCH 051/115] added things and colors from painless tmux --- tmux.conf | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/tmux.conf b/tmux.conf index e811fd1..5eb5811 100644 --- a/tmux.conf +++ b/tmux.conf @@ -1,3 +1,5 @@ +#tmux.conf inspired by painless tmux +#solarized color scheme #set 256 colormode set -g default-terminal "screen-256color" #remap prefix to ctrl + a @@ -28,3 +30,50 @@ bind-key -r K resize-pane -U bind-key -r J resize-pane -D bind-key -r H resize-pane -L bind-key -r L resize-pane -R + +#vim mod-keys +setw -g mode-keys vi + +#capture panes and save to buffer +bind C-s run "tmux capture pane && save-buffer /tmp/buffer.txt" +bind C-c choose-buffer + +# colors +# statusline +set -g status-bg black +set -g status-fg white +set -g status-attr dim + +# default window title colors +setw -g window-status-fg white +setw -g window-status-bg default +setw -g window-status-attr dim + +# active window title colors +setw -g window-status-current-fg white +setw -g window-status-current-bg default +setw -g window-status-current-attr bright + +# bell alerted window color +setw -g window-status-bell-bg red +setw -g window-status-bell-fg white +setw -g window-status-bell-attr bright + +# content alerted color +setw -g window-status-content-bg blue +setw -g window-status-content-fg white +setw -g window-status-content-attr bright +setw -g window-status-activity-bg blue +setw -g window-status-activity-fg white +setw -g window-status-activity-attr bright + +# pane borders +set -g pane-border-fg white +set -g pane-border-bg default +set -g pane-active-border-fg black +set -g pane-active-border-bg default + +# command line +set -g message-fg default +set -g message-bg default +set -g message-attr bright From 749c4713bc843d347f410d0ebc56f71d3df7c1b6 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 14 Jun 2015 00:03:43 -0600 Subject: [PATCH 052/115] set status background to match terminal --- tmux.conf | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tmux.conf b/tmux.conf index 5eb5811..cd476c1 100644 --- a/tmux.conf +++ b/tmux.conf @@ -40,18 +40,18 @@ bind C-c choose-buffer # colors # statusline -set -g status-bg black -set -g status-fg white -set -g status-attr dim +set -g status-bg black +set -g status-fg colour39 +set -g status-attr bright # default window title colors -setw -g window-status-fg white +setw -g window-status-fg colour39 setw -g window-status-bg default -setw -g window-status-attr dim +setw -g window-status-attr bright # active window title colors -setw -g window-status-current-fg white -setw -g window-status-current-bg default +setw -g window-status-current-fg colour120 +setw -g window-status-current-bg black setw -g window-status-current-attr bright # bell alerted window color @@ -70,7 +70,7 @@ setw -g window-status-activity-attr bright # pane borders set -g pane-border-fg white set -g pane-border-bg default -set -g pane-active-border-fg black +set -g pane-active-border-fg white set -g pane-active-border-bg default # command line From 434415fb3e3088b6ded60d872e5eda6ead40feb5 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 14 Jun 2015 00:10:59 -0600 Subject: [PATCH 053/115] more colors --- tmux.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tmux.conf b/tmux.conf index cd476c1..5ed4a43 100644 --- a/tmux.conf +++ b/tmux.conf @@ -68,10 +68,10 @@ setw -g window-status-activity-fg white setw -g window-status-activity-attr bright # pane borders -set -g pane-border-fg white -set -g pane-border-bg default -set -g pane-active-border-fg white -set -g pane-active-border-bg default +set -g pane-border-fg colour120 +set -g pane-border-bg black +set -g pane-active-border-fg colour39 +set -g pane-active-border-bg black # command line set -g message-fg default From 2f84aa880aa87a97375722e5d9a6f59a122ff472 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 14 Jun 2015 13:24:45 -0600 Subject: [PATCH 054/115] status line updates --- tmux.conf | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tmux.conf b/tmux.conf index 5ed4a43..135e611 100644 --- a/tmux.conf +++ b/tmux.conf @@ -38,6 +38,12 @@ setw -g mode-keys vi bind C-s run "tmux capture pane && save-buffer /tmp/buffer.txt" bind C-c choose-buffer +# statusline +set -g status-left-length 20 +set -g status-left "[#S]:[#P]" +set -g status-right "%R %D" +set -g status-justify centre + # colors # statusline set -g status-bg black @@ -60,9 +66,9 @@ setw -g window-status-bell-fg white setw -g window-status-bell-attr bright # content alerted color -setw -g window-status-content-bg blue -setw -g window-status-content-fg white -setw -g window-status-content-attr bright +#setw -g window-status-content-bg blue +#setw -g window-status-content-fg white +#setw -g window-status-content-attr bright setw -g window-status-activity-bg blue setw -g window-status-activity-fg white setw -g window-status-activity-attr bright From a47e418e0632a63b2aa978f1aa5c9ddb67fc4da1 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 14 Jun 2015 23:29:43 -0600 Subject: [PATCH 055/115] added caps lock remap to ctrl --- xinitrc | 1 + 1 file changed, 1 insertion(+) diff --git a/xinitrc b/xinitrc index 9569ef7..71d0e84 100644 --- a/xinitrc +++ b/xinitrc @@ -3,4 +3,5 @@ redshift & start-pulseaudio-x11 google-musicmanager & unclutter -noevents & +setxkbmap -layout us -option ctrl:nocaps & exec dbus-launch --exit-with-session --sh-syntax $HOME/bin/dwm-start From e0721fa4696fdef6b12490d74c19080c1ed8805b Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Mon, 15 Jun 2015 17:37:35 -0600 Subject: [PATCH 056/115] xinitrc added necessary & --- xinitrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xinitrc b/xinitrc index 71d0e84..8f20bb2 100644 --- a/xinitrc +++ b/xinitrc @@ -1,6 +1,6 @@ [[ -f ~/.Xresources ]] && xrdb -merge ~/.Xresources redshift & -start-pulseaudio-x11 +start-pulseaudio-x11 & google-musicmanager & unclutter -noevents & setxkbmap -layout us -option ctrl:nocaps & From 22c075fdced08dba133e76ce1ef47da350f7687c Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Mon, 15 Jun 2015 18:12:10 -0600 Subject: [PATCH 057/115] merged master bashrc --- bashrc | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/bashrc b/bashrc index ac3d846..f7e84bf 100644 --- a/bashrc +++ b/bashrc @@ -1,14 +1,12 @@ -# /etc/skel/.bashrc -# -# This file is sourced by all *interactive* bash shells on startup, -# including some apparently interactive shells such as scp and rcp -# that can't tolerate any output. So make sure this doesn't display -# anything or bad things will happen ! +#!/bin/bash +### ~/.bashrc ####################### +##################################### +## eric at ewpt3ch.com ############## +## dotfiles on github.com ewpt3ch ### +##################################### -# Test for an interactive shell. There is no need to set anything -# past this point for scp and rcp, and it's important to refrain from -# outputting anything in those cases. +### test for interactive shell if [[ $- != *i* ]] ; then # Shell is non-interactive. Be done now! return @@ -19,9 +17,10 @@ fi source ~/todo.txt-cli/todo_completion source ~/bin/npm_completion #pacman aliases -alias pacupg='sudo pacman -Syu' -alias pacins='sudo pacman -U' -alias emacs='emacs -nw' +alias pacman='sudo pacman' +alias pacupg='pacman -Syu' +alias pacins='pacman -U' +# alias t='clear && $HOME/Dropbox/todo/todo.sh -d $HOME/Dropbox/todo/todo.cfg' alias nano='nano -w' alias ls='ls --color=auto' @@ -29,7 +28,7 @@ alias grep='grep --color=auto' alias fgrep='fgrep --color=auto' alias egrep='egrep --color=auto' complete -F _todo t -PATH="/home/ewpt3ch/bin:${PATH}:./:" +PATH="/home/ewpt3ch/bin:/home/ewpt3ch/tmux:${PATH}:./:" export VMWARE_USE_SHIPPED_GTK="yes" export EDITOR=vim export PAGER=less @@ -38,7 +37,6 @@ export BROWSER=firefox-developer #create cache-dir for chrome mkdir -p /tmp/ewpt3ch-cache eval $(keychain --eval --agents ssh -Q --quiet ~/.ssh/id_ed25519) -#eval $(keychain --eval --agents ssh -Q --quiet ~/.ssh/id_ecdsa ~/.ssh/id_rsa) #Check if dropbox is running if dropbox.py running ; then #start dropbox From db887259ee068d5dbc528c7723d1ff459018d4af Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sat, 20 Jun 2015 17:32:14 -0600 Subject: [PATCH 058/115] added alt [ prev cmus track and alt ] next cmus track --- dwm.config.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dwm.config.h b/dwm.config.h index d98dd80..559dd60 100644 --- a/dwm.config.h +++ b/dwm.config.h @@ -29,7 +29,7 @@ static const char *tags[] = { "\u01A0", "\u01a5", "\u01A1 ", "\u01A2", "\u01A3 " static const Rule rules[] = { /* class instance title tags mask isfloating monitor */ { "Gimp", NULL, NULL, 0, True, -1 }, - { "Firefox", NULL, NULL, 1 << 3, False, -1 }, + { "Firefox", NULL, NULL, 0, False, -1 }, }; /* layout(s) */ @@ -73,7 +73,9 @@ static Key keys[] = { { 0, XF86XK_AudioLowerVolume, spawn, {.v = downvol} }, { 0, XF86XK_AudioMute, spawn, {.v = mute } }, { MODKEY, XK_u, spawn, {.v = cmusplaypause} }, - { MODKEY, XK_p, spawn, {.v = dmenucmd } }, + { MODKEY, XK_bracketright, spawn, {.v = cmusnext} }, + { MODKEY, XK_bracketleft, spawn, {.v = cmusprev} }, + { MODKEY, XK_p, spawn, {.v = dmenucmd } }, { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, { MODKEY, XK_b, togglebar, {0} }, { MODKEY, XK_j, focusstack, {.i = +1 } }, From 65793efe248b2bd5fc4cd50fcfe8fad6128b4611 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 21 Jun 2015 21:18:22 -0600 Subject: [PATCH 059/115] added pathogen and pencil airline theme --- vimrc | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/vimrc b/vimrc index d5bb6fa..d9ff440 100644 --- a/vimrc +++ b/vimrc @@ -1,8 +1,27 @@ -syntax enable +" load pathogen +execute pathogen#infect() + +" disable vi compatibility +set nocompatible + +" colorscheme set background=dark -colorscheme solarized -set smartindent +colorscheme pencil +let g:airline_theme = 'pencil' +" display line numbers +set nu + +" toggle highlight line +nnoremap :set cursorline! + +" enable syntax highlighting +syntax enable + +" set up indenting set tabstop=2 set shiftwidth=2 set expandtab +filetype plugin indent on + +" iabbrev From 29016fd2d008e6ea503031390104621dea5c4be9 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 21 Jun 2015 21:36:34 -0600 Subject: [PATCH 060/115] vimrc moved to .vim --- vimrc | 27 --------------------------- 1 file changed, 27 deletions(-) delete mode 100644 vimrc diff --git a/vimrc b/vimrc deleted file mode 100644 index d9ff440..0000000 --- a/vimrc +++ /dev/null @@ -1,27 +0,0 @@ -" load pathogen -execute pathogen#infect() - -" disable vi compatibility -set nocompatible - -" colorscheme -set background=dark -colorscheme pencil -let g:airline_theme = 'pencil' -" display line numbers -set nu - -" toggle highlight line -nnoremap :set cursorline! - -" enable syntax highlighting -syntax enable - -" set up indenting -set tabstop=2 -set shiftwidth=2 -set expandtab -filetype plugin indent on - -" -iabbrev From fe322890587ef5ce89c7b3727edb05d9dff881e6 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 5 Jul 2015 19:50:25 -0600 Subject: [PATCH 061/115] removed btsync added tresorit --- bashrc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bashrc b/bashrc index f7e84bf..655faa2 100644 --- a/bashrc +++ b/bashrc @@ -42,8 +42,8 @@ if dropbox.py running ; then #start dropbox ~/bin/dropbox.py start fi -#check if btsync running and start -#if ! ps -A | grep -q btsync ; then - #start btsync -# btsync --config ~/.config/btsync/btsync.conf -#fi +#check if tresorit running +if $( ps -C tresorit > /dev/null ); then + #start tresorit as hidden + tresorit --hidden +fi From a36b2e013f4038685c41c3258275b740be150e20 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 5 Jul 2015 20:29:22 -0600 Subject: [PATCH 062/115] removed tresorit --- bashrc | 5 ----- 1 file changed, 5 deletions(-) diff --git a/bashrc b/bashrc index 655faa2..777b343 100644 --- a/bashrc +++ b/bashrc @@ -42,8 +42,3 @@ if dropbox.py running ; then #start dropbox ~/bin/dropbox.py start fi -#check if tresorit running -if $( ps -C tresorit > /dev/null ); then - #start tresorit as hidden - tresorit --hidden -fi From d4842b443492df1a8f73e3c65e89f9194dbc66ac Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 12 Jul 2015 22:36:47 -0600 Subject: [PATCH 063/115] added tresorit to xinit --- xinitrc | 1 + 1 file changed, 1 insertion(+) diff --git a/xinitrc b/xinitrc index 8f20bb2..54cb151 100644 --- a/xinitrc +++ b/xinitrc @@ -1,4 +1,5 @@ [[ -f ~/.Xresources ]] && xrdb -merge ~/.Xresources +tresorit --hidden & redshift & start-pulseaudio-x11 & google-musicmanager & From 85a974248277a78e323fcc61d23c85bef3bf6391 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 2 Aug 2015 10:48:42 -0600 Subject: [PATCH 064/115] moved arch specific aliases to external file --- bashrc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/bashrc b/bashrc index 777b343..feb6595 100644 --- a/bashrc +++ b/bashrc @@ -16,11 +16,9 @@ fi #source /etc/profile.d/bash-completion.sh source ~/todo.txt-cli/todo_completion source ~/bin/npm_completion -#pacman aliases -alias pacman='sudo pacman' -alias pacupg='pacman -Syu' -alias pacins='pacman -U' -# +#bring in aliases for arch +source ~/.dotfiles/archalias.bash +#alias alias t='clear && $HOME/Dropbox/todo/todo.sh -d $HOME/Dropbox/todo/todo.cfg' alias nano='nano -w' alias ls='ls --color=auto' @@ -36,7 +34,7 @@ export LIBVA_DRIVER_NAME=vdpau export BROWSER=firefox-developer #create cache-dir for chrome mkdir -p /tmp/ewpt3ch-cache -eval $(keychain --eval --agents ssh -Q --quiet ~/.ssh/id_ed25519) +eval $(keychain --eval --agents ssh -Q --quiet ~/.ssh/id_ed25519) #Check if dropbox is running if dropbox.py running ; then #start dropbox From 3a4e83d6329b7afc00f43169dbf37769aef2230e Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 2 Aug 2015 10:49:05 -0600 Subject: [PATCH 065/115] external file for arch aliases --- archalias.bash | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 archalias.bash diff --git a/archalias.bash b/archalias.bash new file mode 100644 index 0000000..99529a0 --- /dev/null +++ b/archalias.bash @@ -0,0 +1,5 @@ +alias pacman='sudo pacman' +alias pacupg='pacman -Syu' +alias pacins='pacman -U' +alias pacdiff='sudo pacdiff' + From c5bcfb0f68aa82a6d70a603a02a6549286963074 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 2 Aug 2015 10:50:53 -0600 Subject: [PATCH 066/115] added hash bang, necessary? --- archalias.bash | 1 + 1 file changed, 1 insertion(+) diff --git a/archalias.bash b/archalias.bash index 99529a0..a8040f2 100644 --- a/archalias.bash +++ b/archalias.bash @@ -1,3 +1,4 @@ +#!/bin/bash alias pacman='sudo pacman' alias pacupg='pacman -Syu' alias pacins='pacman -U' From b7041824bac6d322361f5330cc2362e27dcc4591 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Tue, 22 Sep 2015 21:51:47 -0600 Subject: [PATCH 067/115] changed order --- dwmstatus.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dwmstatus.sh b/dwmstatus.sh index dd2ebd2..18c4379 100755 --- a/dwmstatus.sh +++ b/dwmstatus.sh @@ -104,4 +104,4 @@ int(){ } # Pipe to statusbar -xsetroot -name "$(msc) $(load) $(mem) $(int) $(bat) $(vol) $(dte) " +xsetroot -name "$(msc) $(vol) $(load) $(mem) $(int) $(bat) $(dte) " From 0a1c69b6d6ed1f1eda2824698ad7253271d4d20b Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Thu, 24 Sep 2015 19:01:43 -0600 Subject: [PATCH 068/115] xinitrc from etc with old xinitrc added --- xinitrc.old | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 xinitrc.old diff --git a/xinitrc.old b/xinitrc.old new file mode 100644 index 0000000..54cb151 --- /dev/null +++ b/xinitrc.old @@ -0,0 +1,8 @@ +[[ -f ~/.Xresources ]] && xrdb -merge ~/.Xresources +tresorit --hidden & +redshift & +start-pulseaudio-x11 & +google-musicmanager & +unclutter -noevents & +setxkbmap -layout us -option ctrl:nocaps & +exec dbus-launch --exit-with-session --sh-syntax $HOME/bin/dwm-start From a855cedc4df0d4d71df44c8a8578c0ec655af3c4 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Thu, 24 Sep 2015 19:02:06 -0600 Subject: [PATCH 069/115] xinitrc from etc with old xinitrc added --- xinitrc | 46 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 41 insertions(+), 5 deletions(-) diff --git a/xinitrc b/xinitrc index 54cb151..77dd7f8 100644 --- a/xinitrc +++ b/xinitrc @@ -1,8 +1,44 @@ -[[ -f ~/.Xresources ]] && xrdb -merge ~/.Xresources -tresorit --hidden & +#!/bin/sh + +userresources=$HOME/.Xresources +usermodmap=$HOME/.Xmodmap +sysresources=/etc/X11/xinit/.Xresources +sysmodmap=/etc/X11/xinit/.Xmodmap + +# merge in defaults and keymaps + +if [ -f $sysresources ]; then + + xrdb -merge $sysresources + +fi + +if [ -f $sysmodmap ]; then + xmodmap $sysmodmap +fi + +if [ -f "$userresources" ]; then + + xrdb -merge "$userresources" + +fi + +if [ -f "$usermodmap" ]; then + xmodmap "$usermodmap" +fi + +# start some nice programs + +if [ -d /etc/X11/xinit/xinitrc.d ] ; then + for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do + [ -x "$f" ] && . "$f" + done + unset f +fi + redshift & -start-pulseaudio-x11 & -google-musicmanager & unclutter -noevents & setxkbmap -layout us -option ctrl:nocaps & -exec dbus-launch --exit-with-session --sh-syntax $HOME/bin/dwm-start +tresorit --hidden & +google-musicmanager & +exec $HOME/bin/dwm-start From d0d7e8da3eeb60af6624c4559b760a8718af78ac Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 18 Oct 2015 21:54:03 -0600 Subject: [PATCH 070/115] added XF86..Play/Pause for bluetooth --- dwm.config.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dwm.config.h b/dwm.config.h index 559dd60..45e1be5 100644 --- a/dwm.config.h +++ b/dwm.config.h @@ -72,6 +72,8 @@ static Key keys[] = { { 0, XF86XK_AudioRaiseVolume, spawn, {.v = upvol} }, { 0, XF86XK_AudioLowerVolume, spawn, {.v = downvol} }, { 0, XF86XK_AudioMute, spawn, {.v = mute } }, + { 0, XF86XK_AudioPlay, spawn, {.v = cmusplaypause} }, + { 0, XF86XK_AudioPause, spawn, {.v = cmusplaypause} }, { MODKEY, XK_u, spawn, {.v = cmusplaypause} }, { MODKEY, XK_bracketright, spawn, {.v = cmusnext} }, { MODKEY, XK_bracketleft, spawn, {.v = cmusprev} }, From 5ad4b180d4479dca4f391da81b94f3b785f304d5 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Wed, 28 Oct 2015 20:48:12 -0600 Subject: [PATCH 071/115] interrobangrc added to dotfiles, already customized colors to match dwm and made border zero --- interrobangrc | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 interrobangrc diff --git a/interrobangrc b/interrobangrc new file mode 100644 index 0000000..b9b9976 --- /dev/null +++ b/interrobangrc @@ -0,0 +1,71 @@ +## | InterobangRC +## | +## | Lines starting with a # are ignored as comments, but this file is +## | not processed by a shell interpreter. + + +## BASIC CONFIGURATION + +#set font = fixed +set font = -*-terminus-medium-*-*-*-32-*-*-*-*-*-*-* +set geometry = top +set geometry = 3200x100-1+0 +set colors = #00FFFF #2F4F4F #48E084 #242424 #64FFAA #484848 +set border = 0px #BBE0EE +set bangchar = ! +set run_hook = %s +#set run_hook = %s || (notify-send "Error: command not found";interrobang) +#set autocomp = 1 +set list = true +set last = true +set margin = -80 +#set shell = /bin/sh +set flags = -ic + + +## COMMON BANGS AND COMPLETITON OPTIONS + +bang term = termite -e %s +bang web = ewpt3chfirefox %s +bang pdf = mupdf %s +bang man = termite -e man %s +bang ddg = ewpt3chfirefox https://duckduckgo.com/?q=%s +bang calc = echo "interrobang ignored \"%s\"" +bang ? = echo "interrobang ignored \"%s\"" + +tab default = percontation "%s" %s | sort -u +tab calc = str="%s%s"; echo "!calc $(echo ${str#\!calc} | bc -l)" +tab ? = ignore="%s%s"; awk '/^bang/ {print "!"$2" ";}' ~/.interrobangrc + + +## EXAMPLES OF COMPLEX COMPLETION OR SCRIPTING + +##### +## percontation can find .desktop files: +## path: (default) show binaries in $PATH +## desktop: list desktop files that match +## desktop+: same as above, plus substring matching with comments +## NOTE: see the desktop bang definition below +## compgen uses bash's default completion +#tab default = percontation desktop path "%s" %s | sort -u +#tab default = percontation desktop+ path "%s" %s | sort -u +#tab default = compgen -P "%s" -cf %s + +##### +## Example logout tool: +## uncomment the following bang and tab lines +#bang logout = case "%s" in shutdown) sudo systemctl poweroff ;; sleep) sudo systemctl suspend ;; reboot) sudo systemctl reboot ;; logout) killall xinit ;; cancel) exit ;; esac + +#tab logout = echo -e "cancel\nshutdown\nsleep\nreboot\nlogout" | grep "^%s%s" + +##### +## desktop bangs +## The first version ignores any parameters to the desktop file and +## just executes the associated binary +## The second version passes parameters and parses the desktop file +## properly, but requires an external tool to do so. This tool +## is not included in the interrobang package. +#bang desktop = ARG="%s"; FILE=$(find /usr/share/applications/ -name ${ARG%% *}.desktop | head -1); $(awk '/^Exec=/ {sub(/Exec=/,"",$1); print $1;}' $FILE) + +#bang desktop = ARG="%s"; FILE=$(find /usr/share/applications/ -name ${ARG%% *}.desktop | head -1); PARAM=${ARG#* }; desktop-exec $FILE $PARAM + From b2fa4a1bb29636e8b524cd99729626138580d961 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Wed, 28 Oct 2015 21:07:26 -0600 Subject: [PATCH 072/115] set geometry to match dwm bar on yoga2 --- interrobangrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interrobangrc b/interrobangrc index b9b9976..c4159b0 100644 --- a/interrobangrc +++ b/interrobangrc @@ -9,7 +9,7 @@ #set font = fixed set font = -*-terminus-medium-*-*-*-32-*-*-*-*-*-*-* set geometry = top -set geometry = 3200x100-1+0 +set geometry = 3200x35-1+0 set colors = #00FFFF #2F4F4F #48E084 #242424 #64FFAA #484848 set border = 0px #BBE0EE set bangchar = ! @@ -20,7 +20,7 @@ set list = true set last = true set margin = -80 #set shell = /bin/sh -set flags = -ic +set flags = -c ## COMMON BANGS AND COMPLETITON OPTIONS From c90a9f41875bbf6c15ab8abb0f7bf77ce891163b Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Wed, 28 Oct 2015 21:47:54 -0600 Subject: [PATCH 073/115] changed shell to bash --- interrobangrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interrobangrc b/interrobangrc index c4159b0..4b43df1 100644 --- a/interrobangrc +++ b/interrobangrc @@ -19,7 +19,7 @@ set run_hook = %s set list = true set last = true set margin = -80 -#set shell = /bin/sh +set shell = /bin/bash set flags = -c From 0d0eff8e4b14e3c285b7d49e404a7ad44bcdae70 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Fri, 30 Oct 2015 21:45:21 -0600 Subject: [PATCH 074/115] added usage layout and naming infor to README --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index e69de29..70c0fbc 100644 --- a/README.md +++ b/README.md @@ -0,0 +1,8 @@ +# ewpt3ch's dotfiles + +#### usage: +currently the repo is .dotfiles in ~ with symlinks from the default file to it's corresponding file in the repo. (ie ~/.tmux.conf is a symlink to ~/.dotfiles/tmux.conf) the master branch is files that I want to match on all machines I use (tmux.conf, vimrc, bashrc) and each machine has a branch for customizations specific to that machine. (yoga2 Xresources are different from y410 due to screen resolution). + +#### naming conventions +Kernels: kernel.*machine-name* ie kernel.yoga2 + From dcd17ec55a22c68dce400b70f14e2930f93b324a Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sat, 7 Nov 2015 16:41:14 -0700 Subject: [PATCH 075/115] changed mid battery upper limit to 35% --- dwmstatus.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dwmstatus.sh b/dwmstatus.sh index 18c4379..ed850fc 100755 --- a/dwmstatus.sh +++ b/dwmstatus.sh @@ -59,9 +59,9 @@ bat(){ then #below 25% echo -ne "${color_urgent}${glyph_pow} ${charge}%${color_normal}" - elif [[ $on1 -eq "0" && $charge -lt "50" ]] + elif [[ $on1 -eq "0" && $charge -lt "35" ]] then - #between 25% and 50% + #between 25% and 35% echo -ne "${color_important}${glyph_pow} ${charge}%${color_normal}" elif [ $on1 -eq "0" ] then From 7e43d4c70d7e82f43a93dd126c986876c27198a0 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sat, 7 Nov 2015 23:16:13 -0700 Subject: [PATCH 076/115] added pushbullet notifications on low battery --- dwmstatus.sh | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dwmstatus.sh b/dwmstatus.sh index ed850fc..6bde887 100755 --- a/dwmstatus.sh +++ b/dwmstatus.sh @@ -55,10 +55,16 @@ dte(){ bat(){ on1="$( Date: Sun, 12 Jun 2016 18:46:22 -0600 Subject: [PATCH 077/115] added twmn.conf --- twmn.conf | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 twmn.conf diff --git a/twmn.conf b/twmn.conf new file mode 100644 index 0000000..58569e8 --- /dev/null +++ b/twmn.conf @@ -0,0 +1,31 @@ +[gui] +absolute_position= +always_on_top=true +background_color=#4B0082 +bounce=true +bounce_duration=500 +font=Inconsolataicon +font_size=50 +font_variant=medium +foreground_color=#7FF000 +height=55 +in_animation=38 +in_animation_duration=1000 +opacity=100 +out_animation=13 +out_animation_duration=1000 +position=top_right +screen= + +[icons] +critical_icon= +info_icon= +warning_icon= + +[main] +activate_command= +duration=3000 +enable_shortcuts=true +host=127.0.0.1 +port=9797 +sound_command= From a83a7d8361cf2ffa8520517281ddb621289ad537 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 12 Jun 2016 18:49:13 -0600 Subject: [PATCH 078/115] dont need vmware gtk --- bashrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bashrc b/bashrc index feb6595..b99c7df 100644 --- a/bashrc +++ b/bashrc @@ -27,7 +27,7 @@ alias fgrep='fgrep --color=auto' alias egrep='egrep --color=auto' complete -F _todo t PATH="/home/ewpt3ch/bin:/home/ewpt3ch/tmux:${PATH}:./:" -export VMWARE_USE_SHIPPED_GTK="yes" +#export VMWARE_USE_SHIPPED_GTK="yes" export EDITOR=vim export PAGER=less export LIBVA_DRIVER_NAME=vdpau From da9000de7a20054ffc578eda04b3fd8334b14887 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 12 Jun 2016 18:51:22 -0600 Subject: [PATCH 079/115] low battery notification 25% --- dwmstatus.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dwmstatus.sh b/dwmstatus.sh index 6bde887..778a5ee 100755 --- a/dwmstatus.sh +++ b/dwmstatus.sh @@ -55,9 +55,9 @@ dte(){ bat(){ on1="$( Date: Sun, 12 Jun 2016 18:52:34 -0600 Subject: [PATCH 080/115] alt-ctrl screenshot added --- dwm.config.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dwm.config.h b/dwm.config.h index 45e1be5..3a25647 100644 --- a/dwm.config.h +++ b/dwm.config.h @@ -5,7 +5,7 @@ /* appearance */ static const char font[] = "Inconsolataicon-12"; -#define NUMCOLORS 9 +#define NUMCOLORS 9 static const char colors[NUMCOLORS][ColLast][9] = { // border foreground background { "#212121", "#00FFFF", "#2F4F4F" }, // 0 = normal @@ -66,6 +66,8 @@ static const char *mute[] = { "amixer", "sset", "Master", "toggle", NULL}; static const char *cmusplaypause[] = { "cmus-remote", "-u", NULL}; static const char *cmusnext[] = { "cmus-remote", "--next", NULL}; static const char *cmusprev[] = { "cmus-remote", "--prev", NULL}; +/*screenshot*/ +static const char *screenshot[] = { "scrot", NULL}; static Key keys[] = { /* modifier key function argument */ @@ -77,6 +79,7 @@ static Key keys[] = { { MODKEY, XK_u, spawn, {.v = cmusplaypause} }, { MODKEY, XK_bracketright, spawn, {.v = cmusnext} }, { MODKEY, XK_bracketleft, spawn, {.v = cmusprev} }, + { MODKEY|ControlMask, XK_s, spawn, {.v = screenshot} }, { MODKEY, XK_p, spawn, {.v = dmenucmd } }, { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, { MODKEY, XK_b, togglebar, {0} }, From 64413b0f9959c67933fb41ef3fc7120ac492e31e Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 12 Jun 2016 18:53:11 -0600 Subject: [PATCH 081/115] removed tresorit --- xinitrc | 1 - 1 file changed, 1 deletion(-) diff --git a/xinitrc b/xinitrc index 77dd7f8..87c0937 100644 --- a/xinitrc +++ b/xinitrc @@ -39,6 +39,5 @@ fi redshift & unclutter -noevents & setxkbmap -layout us -option ctrl:nocaps & -tresorit --hidden & google-musicmanager & exec $HOME/bin/dwm-start From ddbe0729171a449f239251e318c1dd9d4c4c3a87 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 12 Jun 2016 19:37:31 -0600 Subject: [PATCH 082/115] start twmnd --- xinitrc | 1 + 1 file changed, 1 insertion(+) diff --git a/xinitrc b/xinitrc index 87c0937..3738c85 100644 --- a/xinitrc +++ b/xinitrc @@ -40,4 +40,5 @@ redshift & unclutter -noevents & setxkbmap -layout us -option ctrl:nocaps & google-musicmanager & +twmnd & exec $HOME/bin/dwm-start From 029097c52d653b5f800a2bb567d24bd208985d92 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 12 Jun 2016 20:48:19 -0600 Subject: [PATCH 083/115] removed trailing spaces --- dwm.config.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dwm.config.h b/dwm.config.h index 3a25647..966c82f 100644 --- a/dwm.config.h +++ b/dwm.config.h @@ -10,12 +10,12 @@ static const char colors[NUMCOLORS][ColLast][9] = { // border foreground background { "#212121", "#00FFFF", "#2F4F4F" }, // 0 = normal { "#696969", "#ADFF2F", "#2F4F4F" }, // 1 = selected - { "#212121", "#F8F8FF", "#C71585" }, // 2 = urgent - { "#212121", "#90EE90", "#778899" }, // 3 = important + { "#212121", "#F8F8FF", "#C71585" }, // 2 = urgent + { "#212121", "#90EE90", "#778899" }, // 3 = important { "#212121", "#FFFF00", "#2F4F4F" }, // 4 = yellow { "#212121", "#00BFFF", "#2F4F4F" }, // 5 = blue { "#212121", "#00FFFF", "#2F4F4F" }, // 6 = cyan - { "#212121", "#FF00FF", "#2F4F4F" }, // 7 = magenta + { "#212121", "#FF00FF", "#2F4F4F" }, // 7 = magenta { "#212121", "#F5F5F5", "#2F4F4F" }, // 8 = grey }; static const unsigned int borderpx = 1; /* border pixel of windows */ From 5964574344f7f9e7959c1a7888327d4b9bb1e46e Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 12 Jun 2016 22:24:43 -0600 Subject: [PATCH 084/115] changed volume control to volumeset --- dwm.config.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dwm.config.h b/dwm.config.h index 966c82f..41fa6cd 100644 --- a/dwm.config.h +++ b/dwm.config.h @@ -59,9 +59,9 @@ static const Layout layouts[] = { static const char *dmenucmd[] = { "dmenu_run", "-fn", font, "-nb", colors[0][ColBG], "-nf", colors[0][ColFG], "-sb", colors[1][ColBG], "-sf", colors[1][ColFG], NULL }; static const char *termcmd[] = { "termite", NULL }; /*functions for volume control*/ -static const char *upvol[] = { "amixer", "sset", "Master", "1%+", NULL}; -static const char *downvol[] = { "amixer", "sset", "Master", "1%-", NULL}; -static const char *mute[] = { "amixer", "sset", "Master", "toggle", NULL}; +static const char *upvol[] = { "volumeset", "up", NULL }; +static const char *downvol[] = { "volumeset", "down", NULL }; +static const char *mute[] = { "volumeset", "mute", NULL }; /*cmus functions*/ static const char *cmusplaypause[] = { "cmus-remote", "-u", NULL}; static const char *cmusnext[] = { "cmus-remote", "--next", NULL}; From 3da805616d8c8ffc6ae70fdae96ecf366ecdd51c Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 12 Jun 2016 22:29:42 -0600 Subject: [PATCH 085/115] script to set volume and send notification to twmn --- volumeset.sh | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100755 volumeset.sh diff --git a/volumeset.sh b/volumeset.sh new file mode 100755 index 0000000..9048b53 --- /dev/null +++ b/volumeset.sh @@ -0,0 +1,29 @@ +#!/bin/bash +# script for changing the volume and sending +# notification to twmn using twmnc + +step=1 + +if [[ $# -eq 1 ]]; then + case $1 in + "up") + amixer set Master $step%+ + direction='increased to ';; + "down") + amixer set Master $step%- + direction='decreased to ';; + "mute") + amixer set Master toggle;; + *) + echo "Invalid option";; + esac +fi + +muted=`amixer get Master | grep "Front Left:" | awk '{print $6}'` +vol=`amixer get Master | grep "Front Left:" | awk '{print $5}' | tr -d '[]'` + +if [[ $muted == "[off]" ]]; then + twmnc -t 'volume' -c 'muted' -d 1000 +else + twmnc -t 'volume' -c "${direction}${vol}" -d 1000 +fi From 51838a8ab4c8e92e7625a0af6537b4c12f13326e Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 12 Jun 2016 22:33:15 -0600 Subject: [PATCH 086/115] removed redundant script --- volume.sh | 9 --------- 1 file changed, 9 deletions(-) delete mode 100755 volume.sh diff --git a/volume.sh b/volume.sh deleted file mode 100755 index 9a83405..0000000 --- a/volume.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -mute=`amixer get Master | grep "Front Left:" | awk '{print $6}'` -if [ $mute == "[on]" ] -then - vol=`amixer get Master | grep "Front Left:" | awk '{print $5}' | tr -d '[]'` - echo "vol" $vol -else - echo "mute" -fi From cf945753b1b0d82c3575cf4d2fb8da5afb89e2b2 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 12 Jun 2016 22:34:34 -0600 Subject: [PATCH 087/115] removed vol % from statusbar --- dwmstatus.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dwmstatus.sh b/dwmstatus.sh index 778a5ee..710642d 100755 --- a/dwmstatus.sh +++ b/dwmstatus.sh @@ -89,8 +89,7 @@ vol(){ mute=`amixer get Master | grep "Front Left:" | awk '{print $6}'` if [ ${mute} == "[on]" ] then - volume=`amixer get Master | grep "Front Left:" | awk '{print $5}' | tr -d '[]'` - echo -ne "${glyph_vol} ${volume}" + echo -ne "${glyph_vol}" else echo -ne "${glyph_mute}" fi From f03e16031a1611df1d4c612705413f9c18cb0f6d Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Mon, 20 Jun 2016 12:46:24 -0600 Subject: [PATCH 088/115] added local-config to readme --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 70c0fbc..88b8d1f 100644 --- a/README.md +++ b/README.md @@ -6,3 +6,7 @@ currently the repo is .dotfiles in ~ with symlinks from the default file to it's #### naming conventions Kernels: kernel.*machine-name* ie kernel.yoga2 +#### Local config +Notes on local configuration stuff are in Local-config.*machine-name* ir Local-config.yoga2 +Things included kernel cmdline, Xorg config, other customizations for working around bugs +or hardware issues. From 967db03761191086754e52bbb397a6963ce7cee5 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Mon, 20 Jun 2016 12:46:44 -0600 Subject: [PATCH 089/115] new local-config notes --- Local-config.yoga2 | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 Local-config.yoga2 diff --git a/Local-config.yoga2 b/Local-config.yoga2 new file mode 100644 index 0000000..b5700a8 --- /dev/null +++ b/Local-config.yoga2 @@ -0,0 +1,5 @@ +kernel cmdline altered in /boot/refind.conf +added: i915.enable_psr=0 to workaround intel drm bug(appeared with kernel 4.6) + +removed xf86-video-intel in attempt to fix above bug, system appears 'smoother' without +it, so leaving it out for now. From c8a59f068a9ada5ee481f0ac305e081f6ca96865 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Wed, 27 Jul 2016 22:12:21 -0600 Subject: [PATCH 090/115] added local node to path --- bashrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bashrc b/bashrc index b99c7df..7acd216 100644 --- a/bashrc +++ b/bashrc @@ -26,7 +26,7 @@ alias grep='grep --color=auto' alias fgrep='fgrep --color=auto' alias egrep='egrep --color=auto' complete -F _todo t -PATH="/home/ewpt3ch/bin:/home/ewpt3ch/tmux:${PATH}:./:" +PATH="/home/ewpt3ch/bin:/home/ewpt3ch/tmux:/home/ewpt3ch/local/nodejs/bin:${PATH}:./:" #export VMWARE_USE_SHIPPED_GTK="yes" export EDITOR=vim export PAGER=less From 00063659905bcd3df8712d3340d1193a9f08cfd2 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sat, 3 Sep 2016 21:21:31 -0600 Subject: [PATCH 091/115] reduced volume notification duration --- volumeset.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/volumeset.sh b/volumeset.sh index 9048b53..cad8d4f 100755 --- a/volumeset.sh +++ b/volumeset.sh @@ -23,7 +23,7 @@ muted=`amixer get Master | grep "Front Left:" | awk '{print $6}'` vol=`amixer get Master | grep "Front Left:" | awk '{print $5}' | tr -d '[]'` if [[ $muted == "[off]" ]]; then - twmnc -t 'volume' -c 'muted' -d 1000 + twmnc -t 'volume' -c 'muted' -d 100 else - twmnc -t 'volume' -c "${direction}${vol}" -d 1000 + twmnc -t 'volume' -c "${direction}${vol}" -d 100 fi From 31a4033d1d6ae5dac50fa16b09a534f8898d15a0 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 5 Feb 2017 23:57:52 -0700 Subject: [PATCH 092/115] switched nodejs management to nvm --- bashrc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bashrc b/bashrc index 7acd216..a2bf408 100644 --- a/bashrc +++ b/bashrc @@ -26,7 +26,7 @@ alias grep='grep --color=auto' alias fgrep='fgrep --color=auto' alias egrep='egrep --color=auto' complete -F _todo t -PATH="/home/ewpt3ch/bin:/home/ewpt3ch/tmux:/home/ewpt3ch/local/nodejs/bin:${PATH}:./:" +PATH="/home/ewpt3ch/bin:/home/ewpt3ch/tmux:${PATH}:./:" #export VMWARE_USE_SHIPPED_GTK="yes" export EDITOR=vim export PAGER=less @@ -40,3 +40,7 @@ if dropbox.py running ; then #start dropbox ~/bin/dropbox.py start fi + +export NVM_DIR="/home/ewpt3ch/.nvm" +[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm +[[ -r $NVM_DIR/bash_completion ]] && . $NVM_DIR/bash_completion From 942797d0e6ada52a226e2e320e7735b6d502c0c2 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Thu, 30 Mar 2017 22:32:15 -0600 Subject: [PATCH 093/115] dpass to use pass from dmenu --- dpass.bash | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100755 dpass.bash diff --git a/dpass.bash b/dpass.bash new file mode 100755 index 0000000..e46a02f --- /dev/null +++ b/dpass.bash @@ -0,0 +1,28 @@ +#!/bin/bash +#based on https://github.com/cdown/passmenu +#and jasnowryan.com/blog + +shopt -s nullglob globstar + +nb='#2F4F4F' +nf='#00FFFF' +sb='#2F4F4F' +sf='#ADFF2F' +font="Inconsolataicon-12" +dmenucmd=( dmenu -i -fn "$font" -nb "$nb" -nf "$nf" -sb "$sb" -sf "$sf" ) + +prefix=${PASSWORD_STORE_DIR:-~/.password-store} +files=( "$prefix"/**/*.gpg ) +files=( "${files[@]#"$prefix"/}" ) +files=( "${files[@]%.gpg}" ) +fbase=( "${files[@]##*/}" ) + +word=$(printf '%s\n' "${fbase[@]}" | "${dmenucmd[@]}" "$@") + +if [[ -n $word ]]; then + for match in "${files[@]}"; do + if [[ $word == ${match#*/} ]]; then + /usr/bin/pass show -c "$match" 2>/dev/null + fi + done +fi From 7de37fcabee2199e33952ce79bbcc8762c8824a3 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Wed, 5 Apr 2017 22:19:29 -0600 Subject: [PATCH 094/115] made cacher dir and subdirs for chrome and chromium --- bashrc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bashrc b/bashrc index a2bf408..143ff1e 100644 --- a/bashrc +++ b/bashrc @@ -33,7 +33,8 @@ export PAGER=less export LIBVA_DRIVER_NAME=vdpau export BROWSER=firefox-developer #create cache-dir for chrome -mkdir -p /tmp/ewpt3ch-cache +mkdir -p /tmp/ewpt3ch-cache/chrome +mkdir -p /tmp/ewpt3ch-cache/chromium eval $(keychain --eval --agents ssh -Q --quiet ~/.ssh/id_ed25519) #Check if dropbox is running if dropbox.py running ; then From f00607f3d35c027f494dd58681d5493290e386d2 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Wed, 5 Apr 2017 22:20:07 -0600 Subject: [PATCH 095/115] moved cache location --- chrome | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome b/chrome index 0af4562..67b42cd 100755 --- a/chrome +++ b/chrome @@ -1,2 +1,2 @@ #!/bin/bash -exec google-chrome-beta --disk-cache-dir="/tmp/ewpt3ch-cache" +exec google-chrome-beta --disk-cache-dir="/tmp/ewpt3ch-cache/chrome" From a4f7fad2b32b934276fc9bdc5392269d1f10b3c8 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Wed, 5 Apr 2017 22:20:32 -0600 Subject: [PATCH 096/115] do not start music manage --- xinitrc | 1 - 1 file changed, 1 deletion(-) diff --git a/xinitrc b/xinitrc index 3738c85..fff5ad1 100644 --- a/xinitrc +++ b/xinitrc @@ -39,6 +39,5 @@ fi redshift & unclutter -noevents & setxkbmap -layout us -option ctrl:nocaps & -google-musicmanager & twmnd & exec $HOME/bin/dwm-start From e9c46064512b9173fd043c764b5980126d4f1450 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Thu, 6 Apr 2017 22:31:16 -0600 Subject: [PATCH 097/115] instructions for managing yubikey openpgp --- gpg-yubikey.MD | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 gpg-yubikey.MD diff --git a/gpg-yubikey.MD b/gpg-yubikey.MD new file mode 100644 index 0000000..c3d4f67 --- /dev/null +++ b/gpg-yubikey.MD @@ -0,0 +1,19 @@ +####How to install and maintain GPG keys on my Yubikey +From: [PGP and SSH on Yubikey](https://www.esev.com/blog/post/2015-01-pgp-ssh-key-on-yubikey-neo/) + +We want to keep out Master Key on a USB drive that a) doesn't leave the house or office and b) is rarely connected to a computer. You can also use a livecd and airgapped machine for even more security. I deem for my attack profile that having the Master Key offline most of the time is good enough. This may change in the future. My USB drive is also used to back up sensitive info so gpg stuff is under gnupg/ + +```bash +#Store Master key on USB drive +mv .gnupg .gnupg.orig +ln -s /PATHTOUSBDRIVE/gnupg .gnupg + +#Check gpg.conf for strong hash and encryption preferences +cert-digest-algo SHA512 +default-preference-list SHA512 SHA384 SHA256 SHA224 AES256 AES192 AES + +#generate a Master key if there isn't one + +#if we have a secret key + + From 6cca93eaf543609fb65cc5785d36d9abfdfd57a0 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Tue, 18 Apr 2017 21:01:20 -0600 Subject: [PATCH 098/115] added GOPATH and moved some stuff around --- bashrc | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/bashrc b/bashrc index 143ff1e..152acea 100644 --- a/bashrc +++ b/bashrc @@ -12,7 +12,15 @@ if [[ $- != *i* ]] ; then return fi -# Put your fun stuff here. +#Shell Variables +PATH="/home/ewpt3ch/bin:/home/ewpt3ch/tmux:${PATH}:./:" +export EDITOR=vim +export PAGER=less +export LIBVA_DRIVER_NAME=vdpau +export BROWSER=firefox-developer +export GOPATH="/home/ewpt3ch/go" + + #source /etc/profile.d/bash-completion.sh source ~/todo.txt-cli/todo_completion source ~/bin/npm_completion @@ -26,12 +34,6 @@ alias grep='grep --color=auto' alias fgrep='fgrep --color=auto' alias egrep='egrep --color=auto' complete -F _todo t -PATH="/home/ewpt3ch/bin:/home/ewpt3ch/tmux:${PATH}:./:" -#export VMWARE_USE_SHIPPED_GTK="yes" -export EDITOR=vim -export PAGER=less -export LIBVA_DRIVER_NAME=vdpau -export BROWSER=firefox-developer #create cache-dir for chrome mkdir -p /tmp/ewpt3ch-cache/chrome mkdir -p /tmp/ewpt3ch-cache/chromium From 74340f27b9fe80e195c08481c5365452ab1f136e Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sat, 22 Apr 2017 21:54:49 -0600 Subject: [PATCH 099/115] changed volume to use pactl --- volumeset.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/volumeset.sh b/volumeset.sh index cad8d4f..06c278f 100755 --- a/volumeset.sh +++ b/volumeset.sh @@ -3,26 +3,28 @@ # notification to twmn using twmnc step=1 +sink="@DEFAULT_SINK@" if [[ $# -eq 1 ]]; then case $1 in "up") - amixer set Master $step%+ + pactl set-sink-mute $sink false + pactl set-sink-volume $sink +$step% direction='increased to ';; "down") - amixer set Master $step%- + pactl set-sink-volume $sink -$step% direction='decreased to ';; "mute") - amixer set Master toggle;; + pactl set-sink-mute $sink toggle;; *) echo "Invalid option";; esac fi -muted=`amixer get Master | grep "Front Left:" | awk '{print $6}'` -vol=`amixer get Master | grep "Front Left:" | awk '{print $5}' | tr -d '[]'` +muted=`pactl list sinks | grep "Mute" | awk '{print $2}'` +vol=`pactl list sinks | grep "front-left" | awk '{print $5}'` -if [[ $muted == "[off]" ]]; then +if [[ $muted == "no" ]]; then twmnc -t 'volume' -c 'muted' -d 100 else twmnc -t 'volume' -c "${direction}${vol}" -d 100 From 4144f8b25100acb772d586de76f53e854546196c Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 7 May 2017 14:35:48 -0600 Subject: [PATCH 100/115] add dirs to be created --- bashrc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bashrc b/bashrc index 152acea..18e5155 100644 --- a/bashrc +++ b/bashrc @@ -20,6 +20,10 @@ export LIBVA_DRIVER_NAME=vdpau export BROWSER=firefox-developer export GOPATH="/home/ewpt3ch/go" +#Create dirs for things that won't themselves +mkdir -p /tmp/ewpt3ch-cache/chrome +mkdir -p /tmp/ewpt3ch-cache/chromium +mkdir -p /tmp/makepkg #source /etc/profile.d/bash-completion.sh source ~/todo.txt-cli/todo_completion @@ -34,9 +38,6 @@ alias grep='grep --color=auto' alias fgrep='fgrep --color=auto' alias egrep='egrep --color=auto' complete -F _todo t -#create cache-dir for chrome -mkdir -p /tmp/ewpt3ch-cache/chrome -mkdir -p /tmp/ewpt3ch-cache/chromium eval $(keychain --eval --agents ssh -Q --quiet ~/.ssh/id_ed25519) #Check if dropbox is running if dropbox.py running ; then From 725368d21012af4304eb43566fa6d14a30abd0d8 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Wed, 10 May 2017 20:32:42 -0600 Subject: [PATCH 101/115] fixed backwards if statement and spaces --- volumeset.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/volumeset.sh b/volumeset.sh index 06c278f..247e62f 100755 --- a/volumeset.sh +++ b/volumeset.sh @@ -10,10 +10,10 @@ if [[ $# -eq 1 ]]; then "up") pactl set-sink-mute $sink false pactl set-sink-volume $sink +$step% - direction='increased to ';; + direction='increased to';; "down") pactl set-sink-volume $sink -$step% - direction='decreased to ';; + direction='decreased to';; "mute") pactl set-sink-mute $sink toggle;; *) @@ -24,7 +24,7 @@ fi muted=`pactl list sinks | grep "Mute" | awk '{print $2}'` vol=`pactl list sinks | grep "front-left" | awk '{print $5}'` -if [[ $muted == "no" ]]; then +if [[ $muted == "yes" ]]; then twmnc -t 'volume' -c 'muted' -d 100 else twmnc -t 'volume' -c "${direction}${vol}" -d 100 From 0bdc065d3ea62e38273e92b914ccfb85fc94117b Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Wed, 10 May 2017 21:33:05 -0600 Subject: [PATCH 102/115] echos the correct commands --- aur-update.bash | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100755 aur-update.bash diff --git a/aur-update.bash b/aur-update.bash new file mode 100755 index 0000000..53c6b03 --- /dev/null +++ b/aur-update.bash @@ -0,0 +1,23 @@ +#!/bin/bash +#script to update packages installed from aur +#uses cower -ud and makepkg -i +#written because meat stopped working + +#path variables +AURBUILD=/tmp/makepkg + +#create necessary dirs if not exist +mkdir -p ${AURBUILD} + +#cower --update --download --target=${AURBUILD} +cower -d -t ${AURBUILD} cower + +cd ${AURBUILD} +for dir in ${AURBUILD}/* +do + cd ${dir} + echo "building ${dir}" + echo "makepkg --install" + cd ${AURBUILD} + rm -r ${dir} +done From b6d72b48466dec255dcbf09f47bb3582348e612a Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Fri, 12 May 2017 20:36:41 -0600 Subject: [PATCH 103/115] downloads updates and installs notifies via twmnd --- aur-update.bash | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/aur-update.bash b/aur-update.bash index 53c6b03..85bd37d 100755 --- a/aur-update.bash +++ b/aur-update.bash @@ -9,15 +9,14 @@ AURBUILD=/tmp/makepkg #create necessary dirs if not exist mkdir -p ${AURBUILD} -#cower --update --download --target=${AURBUILD} -cower -d -t ${AURBUILD} cower +cower --update --download --target=${AURBUILD} cd ${AURBUILD} -for dir in ${AURBUILD}/* +for dir in ${AURBUILD}/* do cd ${dir} - echo "building ${dir}" - echo "makepkg --install" + twmnc -t "aur-build" -c "building ${dir}" -d 5000 + makepkg --install cd ${AURBUILD} rm -r ${dir} done From 545a2fd5b9e763fa9787b2d7dbdad6c9d135a3d5 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Thu, 1 Feb 2018 20:23:09 -0700 Subject: [PATCH 104/115] commented out bell options --- tmux.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tmux.conf b/tmux.conf index 135e611..076edf5 100644 --- a/tmux.conf +++ b/tmux.conf @@ -17,8 +17,8 @@ setw -g pane-base-index 1 bind r source-file ~/.tmux.conf \; display "config file loaded." #Faster command sequence set -s escape-time 0 -set -g bell-action any # listen for activity on all windows -set -g bell-on-alert on +#set -g bell-action any # listen for activity on all windows +#set -g bell-on-alert on bind | split-window -h bind - split-window -v unbind x From 4fabdc1ee82d1c90722252cbbffc90e597a9834c Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Thu, 1 Feb 2018 20:25:50 -0700 Subject: [PATCH 105/115] track blogging script --- blog.bash | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100755 blog.bash diff --git a/blog.bash b/blog.bash new file mode 100755 index 0000000..fc08d58 --- /dev/null +++ b/blog.bash @@ -0,0 +1,18 @@ +#!/bin/bash +#script to make blogging easier + +#activate nikola +source ~/nikola/bin/activate + +#create a new post +cd ~/myblog +nikola new_post -e + +#build the new site +nikola build + +#deploy +rsync -av --delete output/ ewpt3ch.com:/srv/http/ewpt3ch.com/blog/ + +#deactivate nikola +deactivate From 705cc52098ca91cef29f062fddbd5c98450cc47c Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Wed, 7 Feb 2018 19:42:21 -0700 Subject: [PATCH 106/115] muttrc for ewpt3ch.com through zoho --- muttrc | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 muttrc diff --git a/muttrc b/muttrc new file mode 100644 index 0000000..0653afb --- /dev/null +++ b/muttrc @@ -0,0 +1,16 @@ +#fetch passwords +source "gpg -dq $HOME/.mutt/zoho-mutt-pass.gpg |" + +#ewpt3ch.com imap +set folder = imaps://imappro.zoho.com +set imap_user = eric@ewpt3ch.com +set imap_pass = $my_pass +set spoolfile = +INBOX +mailboxes = +INBOX + +#ewpt3ch.com smtp +set realname = 'Eric W Phillips' +set from = eric@ewpt3ch.com +set use_from = yes +set smtp_url=smtps://$imap_user:$imap_pass@smtp.zoho.com + From 90c41c12b68d0858237d3f050d1db6569f601eba Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Thu, 8 Feb 2018 23:53:22 -0700 Subject: [PATCH 107/115] switched to better encryption commands for mutt --- muttrc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/muttrc b/muttrc index 0653afb..e5bb318 100644 --- a/muttrc +++ b/muttrc @@ -14,3 +14,12 @@ set from = eric@ewpt3ch.com set use_from = yes set smtp_url=smtps://$imap_user:$imap_pass@smtp.zoho.com +#options for gpgme +set crypt_use_gpgme = yes +set crypt_replysign = yes +set crypt_replyencrypt = yes +set crypt_replysignencrypted = yes +set crypt_verify_sig = yes + +#bring in options for encrypting and signing +#source ~/.mutt/gpg.rc From ef3b958097b04b3f9a14e4e3e4cf33a8af89e856 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 11 Feb 2018 20:47:34 -0700 Subject: [PATCH 108/115] cleaned up formating --- dwm.config.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dwm.config.h b/dwm.config.h index 41fa6cd..de8bd18 100644 --- a/dwm.config.h +++ b/dwm.config.h @@ -56,10 +56,10 @@ static const Layout layouts[] = { #define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } } /* commands */ -static const char *dmenucmd[] = { "dmenu_run", "-fn", font, "-nb", colors[0][ColBG], "-nf", colors[0][ColFG], "-sb", colors[1][ColBG], "-sf", colors[1][ColFG], NULL }; +static const char *dmenucmd[] = { "dmenu_run", "-fn", font, "-nb", colors[0][ColBG], "-nf", colors[0][ColFG], "-sb", colors[1][ColBG], "-sf", colors[1][ColFG], NULL }; static const char *termcmd[] = { "termite", NULL }; /*functions for volume control*/ -static const char *upvol[] = { "volumeset", "up", NULL }; +static const char *upvol[] = { "volumeset", "up", NULL }; static const char *downvol[] = { "volumeset", "down", NULL }; static const char *mute[] = { "volumeset", "mute", NULL }; /*cmus functions*/ @@ -76,9 +76,9 @@ static Key keys[] = { { 0, XF86XK_AudioMute, spawn, {.v = mute } }, { 0, XF86XK_AudioPlay, spawn, {.v = cmusplaypause} }, { 0, XF86XK_AudioPause, spawn, {.v = cmusplaypause} }, - { MODKEY, XK_u, spawn, {.v = cmusplaypause} }, - { MODKEY, XK_bracketright, spawn, {.v = cmusnext} }, - { MODKEY, XK_bracketleft, spawn, {.v = cmusprev} }, + { MODKEY, XK_u, spawn, {.v = cmusplaypause} }, + { MODKEY, XK_bracketright, spawn, {.v = cmusnext} }, + { MODKEY, XK_bracketleft, spawn, {.v = cmusprev} }, { MODKEY|ControlMask, XK_s, spawn, {.v = screenshot} }, { MODKEY, XK_p, spawn, {.v = dmenucmd } }, { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, From 4c80b124185faf95a8e03a3f0b1100198b51e6fa Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 11 Feb 2018 21:18:03 -0700 Subject: [PATCH 109/115] added a toggle ctrl alt m for multihead --- dwm.config.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dwm.config.h b/dwm.config.h index de8bd18..d5a05c5 100644 --- a/dwm.config.h +++ b/dwm.config.h @@ -68,6 +68,8 @@ static const char *cmusnext[] = { "cmus-remote", "--next", NULL}; static const char *cmusprev[] = { "cmus-remote", "--prev", NULL}; /*screenshot*/ static const char *screenshot[] = { "scrot", NULL}; +/*multi-head*/ +static const char *multihead[] = { "hdmi-plug.sh", NULL}; static Key keys[] = { /* modifier key function argument */ @@ -80,6 +82,7 @@ static Key keys[] = { { MODKEY, XK_bracketright, spawn, {.v = cmusnext} }, { MODKEY, XK_bracketleft, spawn, {.v = cmusprev} }, { MODKEY|ControlMask, XK_s, spawn, {.v = screenshot} }, + { MODKEY|ControlMask, XK_m, spawn, {.v = multihead} }, { MODKEY, XK_p, spawn, {.v = dmenucmd } }, { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, { MODKEY, XK_b, togglebar, {0} }, From 978aac3e3241cada9e248ae4eca4b5c8a764f7c0 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Fri, 26 Oct 2018 09:53:41 -0600 Subject: [PATCH 110/115] removed dropbox from login --- bashrc | 6 ------ 1 file changed, 6 deletions(-) diff --git a/bashrc b/bashrc index 18e5155..ef31b22 100644 --- a/bashrc +++ b/bashrc @@ -39,12 +39,6 @@ alias fgrep='fgrep --color=auto' alias egrep='egrep --color=auto' complete -F _todo t eval $(keychain --eval --agents ssh -Q --quiet ~/.ssh/id_ed25519) -#Check if dropbox is running -if dropbox.py running ; then - #start dropbox - ~/bin/dropbox.py start -fi - export NVM_DIR="/home/ewpt3ch/.nvm" [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm [[ -r $NVM_DIR/bash_completion ]] && . $NVM_DIR/bash_completion From a5d97835b6b752abedcd76343fdf5dc94e23a47b Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Fri, 26 Oct 2018 09:54:49 -0600 Subject: [PATCH 111/115] encryption stuff --- muttrc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/muttrc b/muttrc index e5bb318..c51b7bd 100644 --- a/muttrc +++ b/muttrc @@ -7,6 +7,8 @@ set imap_user = eric@ewpt3ch.com set imap_pass = $my_pass set spoolfile = +INBOX mailboxes = +INBOX +set imap_keepalive = 300 +set mail_check = 120 #ewpt3ch.com smtp set realname = 'Eric W Phillips' @@ -21,5 +23,7 @@ set crypt_replyencrypt = yes set crypt_replysignencrypted = yes set crypt_verify_sig = yes -#bring in options for encrypting and signing -#source ~/.mutt/gpg.rc +#view html in a browser +set mailcap_path = ~/.mutt/mailcap +alternative_order text/plain text/html +auto_view text/html From 9e1089e6a398a437d132baef11b619e75476c23d Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Fri, 26 Oct 2018 09:55:10 -0600 Subject: [PATCH 112/115] multi display script --- hdmi-plug.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100755 hdmi-plug.sh diff --git a/hdmi-plug.sh b/hdmi-plug.sh new file mode 100755 index 0000000..5dd7d3a --- /dev/null +++ b/hdmi-plug.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +status=$(cat /sys/class/drm/card0-HDMI-A-1/status) + +if [ $status = 'connected' ]; then + xrandr --output eDP-1 --auto --output HDMI-1 --auto --scale 2x2 --right-of eDP-1 + twmnc -t 'display' -c 'HDMI plugged' +else + xrandr --output HDMI-1 --off + twmnc -t 'display' -c 'HDMI unplugged' +fi From 949e6da43915f3619f7c157a11e0e29bed5f31af Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 28 Apr 2019 12:07:55 -0600 Subject: [PATCH 113/115] added Tmux Plugin Manager tpm --- tmux.conf | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tmux.conf b/tmux.conf index 076edf5..fafb5ac 100644 --- a/tmux.conf +++ b/tmux.conf @@ -83,3 +83,10 @@ set -g pane-active-border-bg black set -g message-fg default set -g message-bg default set -g message-attr bright + +# List of plugins +set -g @plugin 'tmux-plugins/tpm' +set -g @plugin 'tmux-plugins/tmux-resurrect' + +#Initialize TPM(has to be last line) +run -b '~/.tmux/plugins/tpm/tpm' From ea0fa94294233ea6ecf8db5db4398417a1a76409 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 28 Apr 2019 12:10:11 -0600 Subject: [PATCH 114/115] updated config for tmux > 2.9 --- tmux.conf | 45 +++++++++++---------------------------------- 1 file changed, 11 insertions(+), 34 deletions(-) diff --git a/tmux.conf b/tmux.conf index fafb5ac..ba53488 100644 --- a/tmux.conf +++ b/tmux.conf @@ -1,7 +1,8 @@ #tmux.conf inspired by painless tmux #solarized color scheme #set 256 colormode -set -g default-terminal "screen-256color" +set -g default-terminal "tmux-256color" +set -ga terminal-overrides ",xterm-termite:Tc" #remap prefix to ctrl + a unbind C-b set -g prefix C-a @@ -41,52 +42,28 @@ bind C-c choose-buffer # statusline set -g status-left-length 20 set -g status-left "[#S]:[#P]" -set -g status-right "%R %D" +set -g status-right "(#h) %R %D" set -g status-justify centre # colors # statusline -set -g status-bg black -set -g status-fg colour39 -set -g status-attr bright +set -g status-style fg=colour39,bg=black,bright # default window title colors -setw -g window-status-fg colour39 -setw -g window-status-bg default -setw -g window-status-attr bright +setw -g window-status-style fg=colour39,bg=default,bright # active window title colors -setw -g window-status-current-fg colour120 -setw -g window-status-current-bg black -setw -g window-status-current-attr bright +setw -g window-status-current-style fg=colour120,bg=black,bright # bell alerted window color -setw -g window-status-bell-bg red -setw -g window-status-bell-fg white -setw -g window-status-bell-attr bright +setw -g window-status-bell-style fg=white,bg=red,bright # content alerted color -#setw -g window-status-content-bg blue -#setw -g window-status-content-fg white -#setw -g window-status-content-attr bright -setw -g window-status-activity-bg blue -setw -g window-status-activity-fg white -setw -g window-status-activity-attr bright +setw -g window-status-activity-style fg=white,bg=blue,bright # pane borders -set -g pane-border-fg colour120 -set -g pane-border-bg black -set -g pane-active-border-fg colour39 -set -g pane-active-border-bg black +setw -g pane-border-style fg=colour120,bg=black +setw -g pane-active-border-style fg=colour39,bg=black # command line -set -g message-fg default -set -g message-bg default -set -g message-attr bright - -# List of plugins -set -g @plugin 'tmux-plugins/tpm' -set -g @plugin 'tmux-plugins/tmux-resurrect' - -#Initialize TPM(has to be last line) -run -b '~/.tmux/plugins/tpm/tpm' +set -g message-style fg=default,bg=default,bright From 2f6f026bc689f7612d2a67cfd9ae8478510dd898 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Sun, 28 Apr 2019 12:15:53 -0600 Subject: [PATCH 115/115] readded tpm need to research merging --- tmux.conf | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tmux.conf b/tmux.conf index ba53488..071b593 100644 --- a/tmux.conf +++ b/tmux.conf @@ -67,3 +67,11 @@ setw -g pane-active-border-style fg=colour39,bg=black # command line set -g message-style fg=default,bg=default,bright + +# Plugin list +set -g @plugin 'tmux-plugins/tpm' +set -g @plugin 'tmux-plugins/tmux-resurrect' +#set -g @plugin 'tmux-plugins/tmux-continuum' + +# start tmux plugin manager(keep last line) +run -b '~/.tmux/plugins/tpm/tpm'