more battery changes

luthes · Nov 2, 2016 · 16c8eac · 16c8eac
1 parent a0b1154
commit 16c8eac
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 22 deletions.
diff --git a/dwm/config.h b/dwm/config.h
@@ -2,27 +2,26 @@
 /* Inlcude Statements for patches */
 #include "gaplessgrid.c"
 
-
-
 /* appearance */
-static const unsigned int borderpx  = 1;         /* border pixel of windows */
+static const unsigned int borderpx  = 3;         /* border pixel of windows */
 static const unsigned int snap      = 2;         /* snap pixel */
 static const int showbar            = 1;         /* 0 means no bar */
 static const int topbar             = 1;         /* 0 means bottom bar */
 static const char *fonts[]          = { "monospace:size=10" };
 static const char dmenufont[]       = "monospace:size=10";
-static const char col_gray1[]       = "#222222";
 static const char black[]           = "#000000";
-static const char col_gray2[]       = "#444444";
-static const char col_gray3[]       = "#bbbbbb";
-static const char col_gray4[]       = "#eeeeee";
+static const char white[]	    = "#ffffff";
+static const char lightGray[]       = "#999999";
+static const char darkGray[]        = "#111111";
+static const char midGray[]	    = "#484848";
 static const char borderColor[]     = "#4c4c4c";
 static const char *colors[SchemeLast][3]      = {
 	/*               fg         bg         border   */
-	[SchemeNorm] = { col_gray4, black, col_gray2 },
-	[SchemeSel] =  { col_gray4, borderColor,  borderColor },
+	[SchemeNorm] = { midGray, darkGray, lightGray},
+	[SchemeSel] =  { white, darkGray, lightGray},
 };
 static const unsigned int gappx     = 6;        /* gap pixel between windows */
+
 /* tagging */
 static const char *tags[] = { "T1", "T2", "Web", "4", "5", "6", "7", "8", "Spotify" };
 
@@ -64,20 +63,11 @@ static const Layout layouts[] = {
 
 /* commands */
 static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
-static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", black, "-sf", col_gray4, NULL };
+static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", darkGray, "-nf", lightGray, "-sb", lightGray, "-sf", darkGray, NULL };
 static const char *termcmd[]  = { "gnome-terminal", NULL };
 
-/* Volume Controls */
-static const char *upvol[]   = { "amixer", "-D", "pulse", "sset", "Master", "+3%"}
-static const char *downvol[]   = { "amixer", "-D", "pulse", "sset", "Master", "-3%"}
-static const char *mutevol[]   = { "amixer", "-D", "pulse", "sset", "Master", "0%"}
-
 static Key keys[] = {
 	/* modifier                     key        function        argument */
-	{ MODKEY,                       XK_F1,     spawn,          {.v = mutevol } },
-	{ MODKEY,                       XK_F3,     spawn,          {.v = upvol } },
-	{ MODKEY,                       XK_F2,     spawn,          {.v = downvol } },
-	{ MODKEY,                       XK_p,      spawn,          {.v = dmenucmd } },
 	{ MODKEY,                       XK_p,      spawn,          {.v = dmenucmd } },
 	{ MODKEY|ShiftMask,             XK_Return, spawn,          {.v = termcmd } },
 	{ MODKEY,                       XK_b,      togglebar,      {0} },

diff --git a/dwm/dwm b/dwm/dwm
diff --git a/dwm/dwm.o b/dwm/dwm.o
diff --git a/dwm_startup b/dwm_startup
@@ -1,12 +1,11 @@
 #!/bin/bash
 # Mostly taken from:
 #	https://raw.github.com/kaihendry/Kai-s--HOME/master/.xinitrc
-# TODO:  For Battery Status: Check which battery is discharging, only display that one.
 
 xset +fp /usr/share/fonts/local
 xset fp rehash
 xset -b # disable bell
-feh --bg-fill /home/Pictures/wallpaper.jpg
+feh --bg-fill /home/f1nch/Pictures/wallpaper.jpg
 
 while true
 do
@@ -18,7 +17,7 @@ do
 	TEMP=$(($(cat /sys/class/thermal/thermal_zone0/temp) / 1000))
 	if acpi -a | grep off-line > /dev/null
 	then
-#TODO - Add check for discharging battery, only display that battery.
+		#TODO - Add check for discharging battery, only display that battery.
 		BAT1=$(acpi -b | grep "Battery 0" | awk '{ print $4 }' | sed 's/,//')
 		DUR1=$(acpi -b | grep "Battery 0" | awk '{ print $5 }')
 		BAT2=$(acpi -b | grep "Battery 1" | awk '{ print $4 }' | sed 's/,//')