patches

awesome bar, centretitle, move stack, restartsig, smoothresize, better colours

1 files changed, 110 insertions, 123 deletions

diff --git a/config.h b/config.h
index eeec412..b55a0c7 100644
--- a/config.h
+++ b/config.h
@@ -1,9 +1,7 @@
-#include <X11/XF86keysym.h>
 /* See LICENSE file for copyright and license details. */
 
-/* Definitions */
-#define TERMINAL "urxvtc"
-#define FLOATTERM "st"
+/* Constants */
+#define TERMINAL "xterm"
 #define BROWSER "librewolf"
 
 /* appearance */
@@ -13,21 +11,27 @@ static const unsigned int gappx     = 5;        /* gaps between windows */
 static const int swallowfloating    = 1;        /* 1 means swallow floating windows by default */
 static const int showbar            = 1;        /* 0 means no bar */
 static const int topbar             = 1;        /* 0 means bottom bar */
-static const char *fonts[]          = { "cozette:size=12:autohint=true" };
-static const char dmenufont[]       = "cozette:size=12:autohint=true";
-static const char col_gray1[]       = "#000000"; // Colour of the background of the bar
-static const char col_gray2[]       = "#000000"; // Colour of the border of the inactive window
-static const char col_gray3[]       = "#bbbbbb"; // Colour of the foreground of the bar
-static const char col_gray4[]       = "#000000"; // Colour of the wallpaper by default
-static const char col_cyan[]        = "#bbbbbb"; // Colour of the border of the active window
+static const char *fonts[]          = { "CyberpunkWaifus:size=12:autohint=true, fontawesome:size=12" };
+static const char dmenufont[]       = "CyberpunkWaifus:size=12:autohint=true, fontawesome:size=12";
+static const char col_gray1[]       = "#000000"; 
+static const char col_gray2[]       = "#bbbbbb"; 
+static const char col_gray3[]       = "#4CAF50"; // Not selected
+static const char col_gray4[]       = "#000000"; 
+static const char col_cyan[]        = "#FF8C00"; // Selected
 static const char *colors[][3]      = {
 	/*               fg         bg         border   */
-	[SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
+	[SchemeNorm] = { col_gray3, col_gray1, col_gray1 },
 	[SchemeSel]  = { col_gray4, col_cyan,  col_cyan  },
+	[SchemeHid]  = { col_gray2, col_gray1,  col_gray1  },
+	[SchemeStatus]  = { col_gray3, col_gray1,  "#000000"  }, // Statusbar right {text,background,not used but cannot be empty}
+	[SchemeTagsSel]  = { col_cyan, col_gray1,  "#000000"  }, // Tagbar left selected {text,background,not used but cannot be empty}
+	[SchemeTagsNorm]  = { col_gray3, col_gray1,  "#000000"  }, // Tagbar left unselected {text,background,not used but cannot be empty}
+	[SchemeInfoSel]  = { col_cyan, col_gray1,  "#000000"  }, // infobar middle  selected {text,background,not used but cannot be empty}
+	[SchemeInfoNorm]  = { col_gray3, col_gray1,  "#000000"  }, // infobar middle  unselected {text,background,not used but cannot be empty}
 };
 
 /* tagging */
-static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; // These are what is visually displayed in the bar, you can change them to whatever.
+static const char *tags[] = { "1", "2", "3", "4", "5" }; // These are what is visually displayed in the bar, you can change them to whatever.
 
 static const Rule rules[] = {
 	/* xprop(1):
@@ -35,21 +39,18 @@ static const Rule rules[] = {
 	 *	WM_NAME(STRING) = title
 	 */
 	/* class         instance          title           tags mask  isfloating  isterminal  noswallow  monitor */
-	{ NULL,          NULL,             NULL,           0,         0,          0,           0,        -1 },
-	{ "discord",     "discord",        NULL,           0,         1,          0,           0,        -1 },
-	{ NULL,          "steamwebhelper", NULL,           0,         1,          0,           0,        -1 },
-	{ NULL,          "steamwebhelper", "Steam",        0,         0,          0,           0,        -1 },
-	{ "qemu-system-x86_64","qemu-system-x86_64",NULL,  0,         1,          0,           0,        -1 },
-	{ "Virt-manager",NULL,             NULL,           0,         0,          0,           0,        -1 },
-	{ "qBittorrent", NULL,             NULL,           0,         1,          0,           0,        -1 },
-	{ "St",          NULL,             NULL,           0,         1,          1,           0,        -1 },
-	{ "URxvt",       NULL,             NULL,           0,         0,          1,           0,        -1 },
-	{ "Nvidia-settings", "nvidia-settings",NULL,       0,         1,          0,           0,        -1 },
-	{ "scrcpy",      NULL,             NULL,           0,         1,          0,           0,        -1 },
-	{ "LibreWolf",   "Alert",          NULL,           0,         1,          0,           0,        -1 },
-	{ "Nsxiv",       NULL,             NULL,           0,         1,          0,           0,        -1 },
-	{ "mpv",         NULL,             NULL,           0,         1,          0,           0,        -1 },
-	{ NULL,          NULL,             "Event Tester", 0,         0,          0,           1,        -1 },
+    { "steam",       "steamwebhelper", NULL,           0,         1,          0,           0,        -1 },
+    { "steam",       "steamwebhelper", "Steam",        0,         0,          0,           0,        -1 },
+    { "steam",       NULL,         "Steam Settings",   0,         1,          0,           0,        -1 },
+    { "qemu-system-x86_64","qemu-system-x86_64",NULL,  0,         1,          0,           0,        -1 },
+    { "Virt-manager",NULL,             NULL,           0,         0,          0,           0,        -1 },
+    { "qBittorrent", NULL,             NULL,           0,         1,          0,           0,        -1 },
+    { "qBittorrent", "qbittorrent",    NULL,           0,         0,          0,           0,        -1 },
+    { "St",          "st",             NULL,           0,         0,          1,           0,        -1 },
+    { "scrcpy",      NULL,             NULL,           0,         1,          0,           0,        -1 },
+    { "LibreWolf",   "Alert",          NULL,           0,         1,          0,           0,        -1 },
+    { "Nsxiv",       NULL,             NULL,           0,         1,          0,           0,        -1 },
+    { NULL,          NULL,             "Event Tester", 0,         0,          0,           1,        -1 },
 };
 
 /* layout(s) */
@@ -60,127 +61,113 @@ static const int lockfullscreen = 0; /* 1 will force focus on the fullscreen win
 
 static const Layout layouts[] = {
 	/* symbol     arrange function */
-	{ "[T]",      tile },    /* first entry is default */
-	{ "[F]",      NULL },    /* no layout function means floating behavior */
-	{ "[M]",      monocle },
+	{ "",      tile },    /* first entry is default */
+	{ "",      NULL },    /* no layout function means floating behavior */
+	{ "",      monocle },
 };
 
 /* key definitions */
 #define MODKEY Mod4Mask
 #define TAGKEYS(KEY,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} },
+    { 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} },
 
 /* 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 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", col_cyan, "-sf", col_gray4, NULL };
+static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_gray4, "-sf", col_cyan, NULL };
 static const char *termcmd[]  = { TERMINAL, NULL };
 static const char *sutermcmd[]  = { TERMINAL,"-e", "su", NULL };
-static const char *floattermcmd[]  = { "st", NULL };
-static const char *volumeup[] = { "amixer", "sset", "Master", "5%+", NULL };
-static const char *volumedown[] = { "amixer", "sset", "Master", "5%-", NULL };
-static const char *volumetoggle[] = { "amixer", "sset", "Master", "toggle", NULL };
-static const char *mictoggle[] = { "amixer", "sset", "Capture", "toggle", NULL};
-static const char *brightnessup[] = { "xbacklight", "-inc", "3", NULL };
-static const char *brightnessdown[] = { "xbacklight", "-dec", "3", NULL };
-static const char *fasterbrightnessup[] = { "xbacklight", "-inc", "10", NULL };
-static const char *fasterbrightnessdown[] = { "xbacklight", "-dec", "10", NULL };
-static const char *slock[] = { "slock", NULL };
-static const char *browser[] = { BROWSER, NULL };
-static const char *steam[] = { "steam", NULL };
 
 
+#include <X11/XF86keysym.h>
 static const Key keys[] = {
-	/* modifier                     key           function        argument */
-	{ MODKEY,                       XK_d,         spawn,          {.v = dmenucmd } },
-	{ MODKEY,                       XK_space,     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_u,         incnmaster,     {.i = -1 } },
-	{ MODKEY,                       XK_h,         setmfact,       {.f = -0.05} },
-	{ MODKEY,                       XK_l,         setmfact,       {.f = +0.05} },
-	{ Mod1Mask,                     XK_Tab,       zoom,           {0} },
-	{ MODKEY,                       XK_Tab,       view,           {0} },
-	{ MODKEY,                       XK_q,         killclient,     {0} },
-	{ MODKEY,                       XK_t,         setlayout,      {.v = &layouts[0]} }, 
-	{ MODKEY,                       XK_f,         setlayout,      {.v = &layouts[1]} },
-	{ MODKEY,                       XK_m,         setlayout,      {.v = &layouts[2]} },
-	{ MODKEY|ShiftMask,             XK_Return,    setlayout,      {0} },
-	{ MODKEY,                       XK_Return,    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)
-	TAGKEYS(                        XK_6,                         5)
-	TAGKEYS(                        XK_7,                         6)
-	TAGKEYS(                        XK_8,                         7)
-	TAGKEYS(                        XK_9,                         8)
-	{ MODKEY|ShiftMask,             XK_r,          quit,          {0} },
+	/* modifier           key                 function        argument */
+    { MODKEY,             XK_d,               spawn,          {.v = dmenucmd } },
+    { MODKEY,             XK_space,           spawn,          {.v = termcmd } },
+    { MODKEY,             XK_b,               togglebar,      {0} },
+    { MODKEY,             XK_j,               focusstackvis,  {.i = +1 } },
+    { MODKEY,             XK_k,               focusstackvis,  {.i = -1 } },
+    { MODKEY,             XK_i,               incnmaster,     {.i = +1 } },
+    { MODKEY,             XK_u,               incnmaster,     {.i = -1 } },
+    { MODKEY,             XK_o,               setmfact,       {.f = -0.05} },
+    { MODKEY,             XK_p,               setmfact,       {.f = +0.05} },
+    { Mod1Mask,           XK_Tab,             zoom,           {0} },
+    { MODKEY,             XK_Tab,             view,           {0} },
+    { MODKEY,             XK_q,               killclient,     {0} },
+    { MODKEY,             XK_t,               setlayout,      {.v = &layouts[0]} }, 
+    { MODKEY,             XK_m,               setlayout,      {.v = &layouts[2]} },
+    { MODKEY|ShiftMask,   XK_Return,          setlayout,      {0} },
+    { MODKEY,             XK_Return,          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_End,             quit,           {0} },
 
   /* Non-default commands i.e. commands added in by me and patches */
-	{ MODKEY|ShiftMask,             XK_space,                     spawn,          {.v = sutermcmd } },
-	{ MODKEY|ControlMask,           XK_space,                     spawn,          {.v = floattermcmd } },
+    { MODKEY|ShiftMask,             XK_space,                     spawn,          {.v = sutermcmd } },
     { MODKEY,                       XK_minus,                     setgaps,        {.i = -1 } },
     { MODKEY,                       XK_equal,                     setgaps,        {.i = +1 } },
     { MODKEY|ShiftMask,             XK_equal,                     setgaps,        {.i = 0  } },
-	{ MODKEY|ShiftMask,             XK_j,                         rotatestack,    {.i = +1 } },
-	{ MODKEY|ShiftMask,             XK_k,                         rotatestack,    {.i = -1 } },
-	{ MODKEY,                       XK_g,                         spawn,          SHCMD("~/.local/bin/./dmenu_games") },
-    { MODKEY|ShiftMask,             XK_m,                         spawn,          {.v = (const char*[]){ FLOATTERM, "-e", "neomutt", NULL } }},
-    { MODKEY|ShiftMask,             XK_n,                         spawn,          {.v = (const char*[]){ FLOATTERM, "-e", "nvim", NULL } }},
-    { MODKEY|ShiftMask,             XK_h,                         spawn,          {.v = (const char*[]){ FLOATTERM, "-e", "htop", NULL } }},
-    { MODKEY,                       XK_e,                         spawn,          {.v = (const char*[]){ "pcmanfm", NULL } }},
-	{ MODKEY,                       XK_Print,                     spawn,          SHCMD("scrot -q 100 ~/Pictures/%Y-%m.jpg") },
-	{ MODKEY,                       XK_Up,                        spawn,          {.v = volumeup } },
-	{ MODKEY,                       XK_Down,                      spawn,          {.v = volumedown } },
-	{ MODKEY,                       XK_Right,                     spawn,          {.v = fasterbrightnessup } },
-	{ MODKEY,                       XK_Left,                      spawn,          {.v = fasterbrightnessdown } },
-	{ MODKEY|ControlMask,           XK_Right,                     spawn,          {.v = brightnessup } },
-	{ MODKEY|ControlMask,           XK_Left,                      spawn,          {.v = brightnessdown } },
-    { 0,                            XF86XK_AudioRaiseVolume,      spawn,          {.v = volumeup } },
-    { 0,                            XF86XK_AudioLowerVolume,      spawn,          {.v = volumedown } },
-	{ 0,                            XF86XK_AudioMute,             spawn,          {.v = volumetoggle } },
-	{ 0,                            XF86XK_MonBrightnessUp,       spawn,          {.v = fasterbrightnessup } },
-	{ 0,                            XF86XK_MonBrightnessDown,     spawn,          {.v = fasterbrightnessdown } },
-	{ 0,                            XF86XK_AudioMicMute,          spawn,          {.v = mictoggle } },
-	{ MODKEY,                       XK_w,                         spawn,          {.v = browser } },
-	{ MODKEY,                       XK_s,                         spawn,          {.v = steam } },
-	{ Mod1Mask|ControlMask,         XK_Delete,                    spawn,          {.v = slock } },
-	{ MODKEY,                       XK_Insert,                    spawn,          SHCMD("setxkmap gb; xdotool type $(grep -v '^#' ~/.local/bin/bookmarksfile | dmenu -i -l 50)") },
-	{ MODKEY,                       XK_v,                         spawn,          SHCMD("~/.local/bin/qemu-dmenu") },
-	{ MODKEY,                       XK_c,                         spawn,          SHCMD("~/.local/bin/calculator") },
-	{ MODKEY,                       XK_x,                         spawn,          SHCMD("xkill") },
-    { MODKEY|ShiftMask,             XK_End,                       spawn,          SHCMD("pkill X") },
+    { MODKEY|ShiftMask,             XK_j,                         movestack,      {.i = +1 } },
+    { MODKEY|ShiftMask,             XK_k,                         movestack,      {.i = -1 } },
+    { MODKEY,                       XK_f,                         togglefullscr,  {0} },
+    { MODKEY,                       XK_BackSpace,                 hide,           {0} },
+    { MODKEY,                       XK_a,                         showall,        {0} },
+    { MODKEY,                       XK_g,                         spawn,          SHCMD("dmenu_games") },
+    { MODKEY|ShiftMask,             XK_m,                         spawn,          SHCMD(TERMINAL" -e neomutt")},
+    { MODKEY|ShiftMask,             XK_n,                         spawn,          SHCMD(TERMINAL" -e nvim")},
+    { MODKEY,                       XK_Escape,                    spawn,          SHCMD(TERMINAL" -e htop")},
+    { MODKEY,                       XK_n,                         spawn,          SHCMD(TERMINAL" -e newsboat")},
+    { MODKEY,                       XK_e,                         spawn,          SHCMD(TERMINAL" -e lfub")},
+    { MODKEY,                       XK_Print,                     spawn,          SHCMD("maimpick") },
+    { MODKEY,                       XK_Up,                        spawn,          SHCMD("dwmvol up") },
+    { MODKEY,                       XK_Down,                      spawn,          SHCMD("dwmvol down") },
+    { MODKEY,                       XK_Right,                     spawn,          SHCMD("dwmlight up") },
+    { MODKEY,                       XK_Left,                      spawn,          SHCMD("dwmlight down") },
+    { 0,                            XF86XK_AudioRaiseVolume,      spawn,          SHCMD("dwmvol up") },
+    { 0,                            XF86XK_AudioLowerVolume,      spawn,          SHCMD("dwmvol down") },
+    { 0,                            XF86XK_AudioMute,             spawn,          SHCMD("dwmvol toggle") },
+    { 0,                            XF86XK_MonBrightnessUp,       spawn,          SHCMD("dwmlight up") },
+    { 0,                            XF86XK_MonBrightnessDown,     spawn,          SHCMD("dwmlight down") },
+    { MODKEY,                       XK_F11,                       spawn,          SHCMD("dwmstats") },
+    { MODKEY,                       XK_F12,                       spawn,          SHCMD("dwmext") },
+    { MODKEY,                       XK_F8,                        spawn,          SHCMD("dwmnet") },
+    { MODKEY,                       XK_slash,                     spawn,          SHCMD("demu") },
+    { MODKEY,                       XK_s,                         spawn,          SHCMD("steam") },
+    { Mod1Mask|ControlMask,         XK_Delete,                    spawn,          SHCMD("slock") },
+    { MODKEY,                       XK_w,                         spawn,          SHCMD(BROWSER) },
+    { MODKEY,                       XK_c,                         spawn,          SHCMD("cliphist add") },
+    { MODKEY,                       XK_v,                         spawn,          SHCMD("cliphist sel") },
+    { MODKEY,                       XK_x,                         spawn,          SHCMD("xkill") },
+    { MODKEY,                       XK_h,                         shiftview,      { .i = -1 } },
+	{ MODKEY,                       XK_l,                         shiftview,  	  { .i = +1 } },
+    { MODKEY|ShiftMask,             XK_r,                         quit,           {1} },
+
+    /* Unused keys */
+    // { MODKEY,                       XK_f,         setlayout,      {.v = &layouts[1]} },
 };
 
 /* button definitions */
 /* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
 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 } },
-	{ 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} },
+    { 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} },
 };