moved gopath infront of path so definition sticks

Local-config.yoga2

@@ -1,5 +0,0 @@
-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.

README.md

@@ -6,7 +6,10 @@ currently the repo is .dotfiles in ~ with symlinks from the default file to it's
 #### naming conventions
 Kernels: kernel.*machine-name* ie kernel.yoga2
 
+<<<<<<< HEAD
+=======
 #### 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.
+>>>>>>> 2f6f026bc689f7612d2a67cfd9ae8478510dd898

Xresources

@@ -1,18 +0,0 @@
-!Xft settings
-Xft*dpi:192	
-Xft*antialias:	true
-Xft*hinting:	true
-Xft*hintstyle:	full
-Xft*rgba:	rgb
- 
-!Xcursor
-Xcursor.theme: Bluecurve	
-Xcursor.size:	42
-
-!xterm
-xterm*termName: 		xterm-256color
-xterm*locale:			true
-xterm*savelines:		4096
-xterm*VT100.geometry:		80x32
-xterm*faceName:			incosolata-10
-xterm*utf8: 1

bashrc

@@ -13,32 +13,33 @@ if [[ $- != *i* ]] ; then
 fi
 
 #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"
+PATH="/home/ewpt3ch/bin:/home/ewpt3ch/tmux:${GOPATH}/bin:${PATH}:./:"
+export EDITOR=nvim
+export PAGER=less
 
 #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
-source ~/bin/npm_completion
+
+#source ~/bin/npm_completion
+
 #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 vim='nvim'
 alias nano='nano -w'
 alias ls='ls --color=auto'
 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
 eval $(keychain --eval --agents ssh -Q --quiet ~/.ssh/id_ed25519)
-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
+#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
+# Only load Liquid Prompt in interactive shells, not from a script or from scp
+[[ $- = *i* ]] && source ~/liquidprompt/liquidprompt
+exec fish

blog.bash

@@ -1,18 +0,0 @@
-#!/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

chrome

@@ -1,2 +0,0 @@
-#!/bin/bash
-exec google-chrome-beta --disk-cache-dir="/tmp/ewpt3ch-cache/chrome"

cmus-stats.sh

@@ -1,19 +0,0 @@
-#!/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

conkyrc

@@ -1,15 +0,0 @@
-# Check http://conky.sf.net for an up-to-date-list.
-
-background no 
-format_human_readable yes
-out_to_console yes
-out_to_x no
-#use_xft yes
-#xftfont DroidSansMono:size=10
-#xftalpha 0.8
-update_interval 2
-total_run_times 0
-use_spacer none
-
-TEXT
-${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

dwm-start.sh

@@ -1,13 +0,0 @@
-#!/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> /tmp/dwm.log
-done 

dwm.config.h

@@ -1,133 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-/*includes*/
-#include <X11/XF86keysym.h> /*Needed for mulitmedia keys*/
-
-/* appearance */
-static const char font[]  =                     "Inconsolataicon-12";
-
-#define NUMCOLORS 9
-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", "#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 */
-static const Bool showbar           = True;     /* False means no bar */
-static const Bool topbar            = True;     /* False means bottom bar */
-
-/* tagging */
-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 },
-};
-
-/* layout(s) */
-static const float mfact      = 0.55; /* factor of master area size [0.05..0.95] */
-static const int nmaster      = 1;    /* number of clients in master area */
-static const Bool resizehints = True; /* True means respect size hints in tiled resizals */
-
-static const Layout layouts[] = {
-	/* symbol     arrange function */
-	{ "[]=",      tile },    /* first entry is default */
-	{ "><>",      NULL },    /* no layout function means floating behavior */
-	{ "[M]",      monocle },
-};
-
-/* key definitions */
-#define MODKEY Mod1Mask
-#define TAGKEYS(KEY,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} },
-
-/* helper for spawning shell commands in the pre dwm-5.0 fashion */
-#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 *termcmd[]  = { "termite", NULL };
-/*functions for volume control*/
-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};
-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 */
-  { 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} },
-  { 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} },
-	{ MODKEY,                       XK_j,      focusstack,     {.i = +1 } },
-	{ MODKEY,                       XK_k,      focusstack,     {.i = -1 } },
-	{ MODKEY,                       XK_i,      incnmaster,     {.i = +1 } },
-	{ MODKEY,                       XK_d,      incnmaster,     {.i = -1 } },
-	{ MODKEY,                       XK_h,      setmfact,       {.f = -0.05} },
-	{ MODKEY,                       XK_l,      setmfact,       {.f = +0.05} },
-	{ MODKEY,                       XK_Return, zoom,           {0} },
-	{ MODKEY,                       XK_Tab,    view,           {0} },
-	{ MODKEY|ShiftMask,             XK_c,      killclient,     {0} },
-	{ MODKEY,                       XK_t,      setlayout,      {.v = &layouts[0]} },
-	{ MODKEY,                       XK_f,      setlayout,      {.v = &layouts[1]} },
-	{ MODKEY,                       XK_m,      setlayout,      {.v = &layouts[2]} },
-	{ MODKEY,                       XK_space,  setlayout,      {0} },
-	{ MODKEY|ShiftMask,             XK_space,  togglefloating, {0} },
-	{ MODKEY,                       XK_0,      view,           {.ui = ~0 } },
-	{ MODKEY|ShiftMask,             XK_0,      tag,            {.ui = ~0 } },
-	{ MODKEY,                       XK_comma,  focusmon,       {.i = -1 } },
-	{ MODKEY,                       XK_period, focusmon,       {.i = +1 } },
-	{ MODKEY|ShiftMask,             XK_comma,  tagmon,         {.i = -1 } },
-	{ MODKEY|ShiftMask,             XK_period, tagmon,         {.i = +1 } },
-	TAGKEYS(                        XK_1,                      0)
-	TAGKEYS(                        XK_2,                      1)
-	TAGKEYS(                        XK_3,                      2)
-	TAGKEYS(                        XK_4,                      3)
-  TAGKEYS(                        XK_5,                      4)
-	{ MODKEY|ShiftMask,             XK_q,      quit,           {0} },
-};
-
-/* button definitions */
-/* click can be ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
-static Button buttons[] = {
-	/* click                event mask      button          function        argument */
-	{ ClkLtSymbol,          0,              Button1,        setlayout,      {0} },
-	{ ClkLtSymbol,          0,              Button3,        setlayout,      {.v = &layouts[2]} },
-	{ ClkWinTitle,          0,              Button2,        zoom,           {0} },
-	{ ClkStatusText,        0,              Button2,        spawn,          {.v = termcmd } },
-	{ ClkClientWin,         MODKEY,         Button1,        movemouse,      {0} },
-	{ ClkClientWin,         MODKEY,         Button2,        togglefloating, {0} },
-	{ ClkClientWin,         MODKEY,         Button3,        resizemouse,    {0} },
-	{ ClkTagBar,            0,              Button1,        toggleview,           {0} },
-	{ ClkTagBar,            0,              Button3,        view,     {0} },
-	{ ClkTagBar,            MODKEY,         Button1,        tag,            {0} },
-	{ ClkTagBar,            MODKEY,         Button3,        toggletag,      {0} },
-};
-

dwmstatus.sh

@@ -1,117 +0,0 @@
-#!/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 from dwm.config.h
-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"
-glyph_mem="\u01B1"
-glyph_dl="\u01A5"
-glyph_pow="\u01B2"
-glyph_clk="\u01Af"
-glyph_bln="\u01AA"
-glyph_msc="\u01AB"
-glyph_vol="\u01AC"
-glyph_mute="\u01B4"
-glyph_mail="\u01AD"
-glyph_wifi="\u01AE"
-glyph_plug="\u01A4"
-
-# 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 "${color_selected}${glyph_msc} ${song_info}${color_normal}"
-}
-
-#Date
-dte(){
-  datetime="$(date "+%F %T")"
-  echo -ne "${color_selected}${glyph_clk} ${datetime}${color_normal}"
-}
-
-#Power and Battery
-bat(){
-  on1="$(</sys/class/power_supply/ADP1/online)"
-  charge="$(</sys/class/power_supply/BAT1/capacity)"
-  if [[ $on1 -eq "0" && $charge -lt "25" ]]
-  then
-    #below 25%
-    echo -ne "${color_urgent}${glyph_pow} ${charge}%${color_normal}"
-    #send pushbullet to phone
-    if [[ ! -f /run/user/1050/batpush ]]
-    then
-      touch /run/user/1050/batpush
-      battery-push
-    fi
-  elif [[ $on1 -eq "0" && $charge -lt "35" ]]
-  then
-    #between 25% and 35%
-    echo -ne "${color_important}${glyph_pow} ${charge}%${color_normal}"
-  elif [ $on1 -eq "0" ]
-  then
-    #above 50%
-    echo -ne "${color_selected}${glyph_pow} ${charge}%${color_normal}"
-  else
-    #charging
-    echo -ne "${color_selected}${glyph_plug} ${charge}%${color_normal}"
-    #reset battery push
-    if [[ -f /run/user/1050/batpush ]]
-    then
-      rm /run/user/1050/batpush
-    fi
-  fi
-}
-
-#Volume
-vol(){
-  mute=`amixer get Master | grep "Front Left:" | awk '{print $6}'`
-  if [ ${mute} == "[on]" ]
-  then
-    echo -ne "${glyph_vol}"
-  else
-    echo -ne "${glyph_mute}"
-  fi
-}
-
-#Memory
-mem(){
-  memused="$(free -m | awk 'NR==2 {print $3}')"
-  echo -ne "${glyph_mem}${memused}M"
-}
-
-#CPU
-load(){
-  cpu="$(cat /proc/loadavg | awk '{print $1, $2, $3}')"
-  echo -ne "${glyph_cpu} ${cpu}"
-}
-
-#Internet Connection
-int(){
-  host google.com > /dev/null &&
-  echo -ne "${glyph_wifi}" || echo -ne "${color_important}${glyph_wifi}${color_normal}"
-}
-
-# Pipe to statusbar
-xsetroot -name "$(msc) $(vol) $(load) $(mem) $(int) $(bat) $(dte) "

hdmi-plug.sh

@@ -1,11 +0,0 @@
-#!/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

liquidpromptrc

@@ -5,7 +5,7 @@
 
 # If you want to use different themes and features,
 # you can load the corresponding files here:
-#source ~/code/liquidprompt/nojhan.theme
+source ~/liquidprompt/liquid.theme
 #LP_PS1_FILE="~/code/liquidprompt/nojhan.ps1"
 
 #############

power.sh

@@ -1,22 +0,0 @@
-#!/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

redshift

@@ -1,13 +0,0 @@
-;Global Settings
-[redshift]
-temp-day=6300
-temp-night=4000
-transition=1
-location-provider=manual
-
-
-[manual]
-;denver
-lat=39.898700
-lon=-105.040452
-

termite.config

@@ -1,47 +0,0 @@
-#Customizations
-[options]
-font = Inconsolata 12
-urgent_on_bell = true
-
-# Solarized dark color scheme
-
-[colors]
-
-# special
-foreground      = #93a1a1
-foreground_bold = #93a1a1
-cursor          = #93a1a1
-background      = #002b36
-
-# 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
-
-# cyan
-color6  = #2aa198
-color14 = #2aa198
-
-# white
-color7  = #93a1a1
-color15 = #fdf6e3
-

twmn.conf

@@ -1,31 +0,0 @@
-[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=

xinitrc

@@ -1,43 +0,0 @@
-#!/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 &
-unclutter -noevents &
-setxkbmap -layout us -option ctrl:nocaps &
-twmnd &
-exec $HOME/bin/dwm-start

xinitrc.old

@@ -1,8 +0,0 @@
-[[ -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