Move dwm-bar to bottom, match emacs theme

2 files changed, 12 insertions, 19 deletions

diff --git a/.config/emacs/modules/bd--modeline.el b/.config/emacs/modules/bd--modeline.el
index 249e55b..1c0a4df 100644
--- a/.config/emacs/modules/bd--modeline.el
+++ b/.config/emacs/modules/bd--modeline.el
@@ -34,11 +34,6 @@
 (global-set-key (kbd "C-c ,") 'minor-mode-blackout-mode)
 
 
-;;;; time and date
-(setq display-time-format "%m/%d/%y %H:%M (%a)"
-      display-time-default-load-average nil)
-(display-time)
-
 (defvar-local bd/time-mode-line
     '(:eval
       (when (mode-line-window-selected-p)
@@ -97,7 +92,7 @@
                mode-line-modified
                bd/vc-mode-line
                "      "
-               (mode-line-fill 35)
+               (mode-line-fill 13)
                bd/line-position
                "  "
                bd/time-mode-line))
diff --git a/.config/guix/modules/dwm/config.def.h b/.config/guix/modules/dwm/config.def.h
index 0ac62fc..42b3281 100644
--- a/.config/guix/modules/dwm/config.def.h
+++ b/.config/guix/modules/dwm/config.def.h
@@ -5,20 +5,18 @@ static const unsigned int borderpx  = 1;        /* border pixel of windows */
 static const unsigned int gappx     = 8;        /* gaps between 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 int topbar             = 0;        /* 0 means bottom bar */
 static const char *fonts[]          = { "Terminus:size=10" };
 static const char dmenufont[]       = "Terminus:size=10";
-static const char col_gray1[]       = "#333333";
-static const char col_gray2[]       = "#666666";
-static const char col_gray3[]       = "#bbbbbb";
-static const char col_gray4[]       = "#ffffff";
+static const char col_white[]       = "#eeeeee";
+static const char col_gray[]       = "#aaaaaa";
 static const char col_black[]       = "#000000";
 static const unsigned int baralpha = 0xd0;
-static const unsigned int borderalpha = OPAQUE;
+static const unsigned int borderalpha = 0xd0;
 static const char *colors[][3]      = {
   /*               fg         bg         border   */
-  [SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
-  [SchemeSel]  = { col_gray4, col_black,  col_gray4 },
+  [SchemeNorm] = { col_gray, col_black, col_white },
+  [SchemeSel]  = { col_white, col_black, col_black },
 };
 
 static const unsigned int alphas[][3]      = {
@@ -53,9 +51,9 @@ static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen win
 
 static const Layout layouts[] = {
   /* symbol     arrange function */
+  { "[M]",      monocle },
   { "[]=",      tile },    /* first entry is default */
   { "><>",      NULL },    /* no layout function means floating behavior */
-  { "[M]",      monocle },
 };
 
 /* key definitions */
@@ -72,7 +70,7 @@ static const Layout layouts[] = {
 /* commands */
 static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
 /* tools */
-static const char *dmenucmd[]    = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_black, "-sf", col_gray4, NULL };
+static const char *dmenucmd[]    = { "dmenu_run", "-b", "-m", dmenumon, "-fn", dmenufont, "-nb", col_black, "-nf", col_gray, "-sb", col_black, "-sf", col_white, NULL };
 /* brightness control */
 static const char *lowerbgt[]    = { "brightnessctl", "set", "5%-", NULL };
 static const char *upperbgt[]    = { "brightnessctl", "set", "5%+", NULL };
@@ -119,9 +117,9 @@ static const Key keys[] = {
   { MODKEY,                       XK_Return, zoom,           {0} },
   { MODKEY,                       XK_Tab,    view,           {0} },
   { MODKEY,                       XK_q,      killclient,     {0} },
-  { MODKEY,                       XK_t,      setlayout,      {.v = &layouts[0]} },
-  { MODKEY,                       XK_h,      setlayout,      {.v = &layouts[1]} },
-  { MODKEY,                       XK_m,      setlayout,      {.v = &layouts[2]} },
+  { MODKEY,                       XK_m,      setlayout,      {.v = &layouts[0]} },
+  { MODKEY,                       XK_t,      setlayout,      {.v = &layouts[1]} },
+  { MODKEY,                       XK_h,      setlayout,      {.v = &layouts[2]} },
   { MODKEY,                       XK_space,  setlayout,      {0} },
   { MODKEY|ShiftMask,             XK_space,  togglefloating, {0} },
   { MODKEY,                       XK_0,      view,           {.ui = ~0 } },