Merge branch 'master' of ssh://gitea.ewpt3ch.dev:25213/ewpt3ch/dotfiles-old

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
+

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
@@ -17,30 +15,33 @@ fi
 # Put your fun stuff here.
 #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'
+#pacman aliases
+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'
 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
+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

chrome

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

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

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/cmus-stats.sh} ${exec ~/bin/volume.sh} ${exec ~/bin/power.sh} ${wireless_essid wlp0s29f7u1} ${addr wlp0s29f7u1} $time

dwm.config.h

@@ -3,25 +3,33 @@
 #include <X11/XF86keysym.h> /*Needed for mulitmedia keys*/
 
 /* appearance */
-static const char font[]            = "Inconsolata:size=9";
-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";
+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[] = { "term", "coms", "www", "dev", "work", "6", "7", "8", "9" };
+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 << 8,       False,       -1 },
+	{ "Firefox",  NULL,       NULL,       0,       False,       -1 },
 };
 
 /* layout(s) */
@@ -39,8 +47,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,      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} },
 
@@ -48,7 +56,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", 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};
@@ -65,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 } },
@@ -92,11 +102,7 @@ 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)
+  TAGKEYS(                        XK_5,                      4)
 	{ MODKEY|ShiftMask,             XK_q,      quit,           {0} },
 };
 

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

tmux.conf

@@ -1,4 +1,8 @@
-set -g terminal-overrides "xterm*:smcup@:rmcup@"
+#tmux.conf inspired by painless tmux
+#solarized color scheme
+#set 256 colormode
+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
@@ -8,6 +12,66 @@ 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
+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
+
+#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
+
+# statusline
+set -g status-left-length 20
+set -g status-left "[#S]:[#P]"
+set -g status-right "(#h) %R %D"
+set -g status-justify centre
+
+# colors
+# statusline
+set -g status-style fg=colour39,bg=black,bright
+
+# default window title colors
+setw -g window-status-style fg=colour39,bg=default,bright
+
+# active window title colors
+setw -g window-status-current-style fg=colour120,bg=black,bright
+
+# bell alerted window color
+setw -g window-status-bell-style fg=white,bg=red,bright
+
+# content alerted color
+setw -g window-status-activity-style fg=white,bg=blue,bright
+
+# pane borders
+setw -g pane-border-style fg=colour120,bg=black
+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'

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
 else
-  echo "Mute"
+  echo "ë"
 fi