update

5 files changed, 37 insertions, 20 deletions

diff --git a/dmenu_config.h b/dmenu_config.h
index 32ba787..2c77d4b 100644
--- a/dmenu_config.h
+++ b/dmenu_config.h
@@ -4,7 +4,7 @@
 static int topbar = 1;                      /* -b  option; if 0, dmenu appears at bottom     */
 /* -fn option overrides fonts[0]; default X11 font or font set */
 static const char *fonts[] = {
-	"JetBrainsMono Nerd Font:size=10"
+	"JetbrainsMono Nerd Font:pixelsize=12:antialias=true:autohint=true"
 };
 static const char *prompt      = NULL;      /* -p  option; prompt to the left of input field */
 static const char *colors[SchemeLast][2] = {
diff --git a/dwm_config.h b/dwm_config.h
index ef26cc3..fba90b1 100644
--- a/dwm_config.h
+++ b/dwm_config.h
@@ -7,8 +7,8 @@ static const unsigned int borderpx  = 2;        /* border pixel of windows */
 static const unsigned int snap      = 32;       /* snap pixel */
 static const int showbar            = 1;        /* 0 means no bar */
 static const int topbar             = 1;        /* 0 means bottom bar */
-static const char *fonts[]          = { "JetBrainsMono Nerd Font:style=Medium:size=13" };
-static const char dmenufont[]       = "JetBrainsMono Nerd Font:style=Medium:size=13";
+static const char *fonts[]          = { "JetBrainsMono Nerd Font:pixelsize=12:antialias=true:autohint=true" };
+static const char dmenufont[]       = "JetBrainsMono Nerd Font:pixelsize=12:antialias=true:autohint=true";
 
 static const char col_bg_active[]   = "#E0E0E0";
 static const char col_fg_active[]   = "#000000";
@@ -24,20 +24,24 @@ static const char *colors[][3]      = {
 /* tagging */
 static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "Web", "Chat" };
 
+#define T(x) (1 << x)
+
 static const Rule rules[] = {
 	/* xprop(1):
 	 *	WM_CLASS(STRING) = instance, class
 	 *	WM_NAME(STRING) = title
 	 */
 	/* class      instance    title       tags mask     isfloating   monitor */
-	// { "Gimp",     NULL,       NULL,       0,            1,           -1 },
-	{ "Librewolf",  NULL,       NULL,       1 << 8,       0,           -1 },
+	// { "Gimp",     NULL,       NULL,       0,          1,           -1 },
+	{ "librewolf",   NULL,       NULL,       T(7),       0,           -1 },
+	{ "thunderbird", NULL,       NULL,       T(7),       0,           -1 },
+	{ "discord",     NULL,       NULL,       T(8)|T(0),  0,           -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 int resizehints = 1;    /* 1 means respect size hints in tiled resizals */
+static const int resizehints = 0;    /* 1 means respect size hints in tiled resizals */
 static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */
 
 static const Layout layouts[] = {
@@ -66,9 +70,9 @@ static const char *flameshotcmd[]  = { "flameshot", "gui", NULL };
 static const char *pausecmd[]  = { "playerctl", "play-pause", NULL };
 static const char *nextcmd[]  = { "playerctl", "next", NULL };
 static const char *prevcmd[]  = { "playerctl", "previous", NULL };
-static const char *volupcmd[]  = { "pactl", "set-sink-volume @DEFAULT_SINK@ +5%", NULL };
-static const char *vollowcmd[]  = { "pactl", "set-sink-volume @DEFAULT_SINK@ -5%", NULL };
-static const char *volmutecmd[]  = { "pactl", "set-sink-mute @DEFAULT_SINK@ toggle", NULL };
+static const char *volupcmd[]  = { "pactl", "set-sink-volume", "@DEFAULT_SINK@", "+5%", NULL };
+static const char *vollowcmd[]  = { "pactl", "set-sink-volume", "@DEFAULT_SINK@", "-5%", NULL };
+static const char *volmutecmd[]  = { "pactl", "set-sink-mute", "@DEFAULT_SINK@", "toggle", NULL };
 
 static const Key keys[] = {
 	/* modifier                     key        function        argument */
@@ -88,7 +92,7 @@ static const Key keys[] = {
   { 0,              XF86XK_AudioLowerVolume, spawn,          {.v = vollowcmd}},
   { 0,              XF86XK_AudioRaiseVolume, spawn,          {.v = volupcmd}},
   { 0,                     XF86XK_AudioMute, spawn,          {.v = volmutecmd}},
-	{ MODKEY,                       XK_s, zoom,           {0} },
+	{ MODKEY,                       XK_s,      zoom,           {0} },
 	{ MODKEY,                       XK_Tab,    view,           {0} },
 	{ MODKEY|ShiftMask,             XK_q,      killclient,     {0} },
 	{ MODKEY,                       XK_t,      setlayout,      {.v = &layouts[0]} },
@@ -109,10 +113,10 @@ static const Key keys[] = {
 	TAGKEYS(                        XK_5,                      4)
 	TAGKEYS(                        XK_6,                      5)
 	TAGKEYS(                        XK_7,                      6)
-	TAGKEYS(                        XK_8,                      7)
-	TAGKEYS(                        XK_9,                      8)
 	TAGKEYS(                        XK_c,                      6)
+	TAGKEYS(                        XK_8,                      7)
 	TAGKEYS(                        XK_z,                      7)
+	TAGKEYS(                        XK_9,                      8)
 	TAGKEYS(                        XK_x,                      8)
 	{ MODKEY|ShiftMask,             XK_e,      quit,           {0} },
 };
@@ -122,15 +126,15 @@ static const Key keys[] = {
 static const 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 } },
+	// { 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,        view,           {0} },
-	{ ClkTagBar,            0,              Button3,        toggleview,     {0} },
-	{ ClkTagBar,            MODKEY,         Button1,        tag,            {0} },
-	{ ClkTagBar,            MODKEY,         Button3,        toggletag,      {0} },
+	// { ClkTagBar,            0,              Button1,        view,           {0} },
+	// { ClkTagBar,            0,              Button3,        toggleview,     {0} },
+	// { ClkTagBar,            MODKEY,         Button1,        tag,            {0} },
+	// { ClkTagBar,            MODKEY,         Button3,        toggletag,      {0} },
 };
 
diff --git a/dwm_status.sh b/dwm_status.sh
new file mode 100755
index 0000000..a8eea62
--- /dev/null
+++ b/dwm_status.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+while true; do
+  ram=`free -m | awk 'NR==2{printf "RAM %.2f%%", $3*100/$2}'`
+  cpu=`top -bn1 | grep load | awk '{printf "CPU %.2f", $(NF-2)}'`
+  clock=`date +"%b %d, %H.%M.%S"`
+  vol=`pactl get-sink-volume @DEFAULT_SINK@ | awk 'NR==1{printf "VOL %s", $5}'`
+  xprop -root -set WM_NAME " $vol | $ram | $cpu | $clock "
+  sleep 1
+done
diff --git a/st_config.h b/st_config.h
index 234b94d..e8d23a9 100644
--- a/st_config.h
+++ b/st_config.h
@@ -5,7 +5,7 @@
  *
  * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
  */
-static char *font = "JetBrainsMono Nerd Font:style=Medium:pixelsize=18:antialias=true:autohint=true";
+static char *font = "JetBrainsMono Nerd Font:pixelsize=12:antialias=true:autohint=true";
 static int borderpx = 2;
 
 /*
@@ -196,6 +196,8 @@ static Shortcut shortcuts[] = {
 	{ TERMMOD,              XK_Prior,       zoom,           {.f = +1} },
 	{ TERMMOD,              XK_Next,        zoom,           {.f = -1} },
 	{ TERMMOD,              XK_Home,        zoomreset,      {.f =  0} },
+	{ ShiftMask,            XK_Page_Up,     kscrollup,      {.i =  5} },
+	{ ShiftMask,            XK_Page_Down,   kscrolldown,    {.i =  5} },
 	{ TERMMOD,              XK_C,           clipcopy,       {.i =  0} },
 	{ TERMMOD,              XK_V,           clippaste,      {.i =  0} },
 	{ TERMMOD,              XK_Y,           selpaste,       {.i =  0} },
diff --git a/update.sh b/update.sh
index 4a71812..ebf134d 100644
--- a/update.sh
+++ b/update.sh
@@ -9,6 +9,7 @@ mkdir .config/
 cp ~/git/st/config.h ./st_config.h
 cp ~/git/dwm/config.h ./dwm_config.h
 cp ~/git/dmenu/config.h ./dmenu_config.h
+cp ~/path/dwm_status.sh ./dwm_status.sh
 
 # Neovim
 cp -r ~/.config/nvim .config