diff --git a/README.md b/README.md index 8e31b96..df60a9e 100644 --- a/README.md +++ b/README.md @@ -74,3 +74,4 @@ The `MODKEY` is set to the Super key (Windows key). | `MODKEY + SHIFT + q` | quit dwm | | `MODKEY + SHIFT + ` | move the active window to workspace | | `MODKEY + ` | move to workspace | +| `MODKEY + p` | run dmenu | diff --git a/config.h b/config.h index ef5e5c1..af27c1e 100644 --- a/config.h +++ b/config.h @@ -5,16 +5,16 @@ /* appearance */ static const char *fonts[] = { - "Noto Sans:size=10", - "monospace:size=10" + "Ubuntu Nerd Font:size=10", + "Noto Sans:size=10" }; static const char dmenufont[] = "monospace:size=10"; static const unsigned int borderpx = 2; /* border pixel of windows */ -//static const unsigned int gappx = 2; /* useless gap patch: 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 user_bh = 30; /* 0 means that dwm will calculate bar height, >= 1 means dwm will user_bh as bar height */ static const char col_gray1[] = "#15161e"; /* Currently used as the background colour */ static const char col_gray2[] = "#444444"; /* Inactive window border colour */ static const char col_gray3[] = "#bbbbbb"; /* Font colour */ @@ -28,7 +28,7 @@ static const char *colors[][3] = { }; /* tagging */ -static const char *tags[] = { "", "", "", "" }; +static const char *tags[] = { "", "", "", "" }; static const Rule rules[] = { /* xprop(1): @@ -36,12 +36,11 @@ static const Rule rules[] = { * WM_NAME(STRING) = title */ /* class instance title tags mask isfloating monitor */ - { "Gimp", NULL, NULL, 0, 1, -1 }, - { "Firefox", NULL, NULL, 1 << 3, 0, -1 }, + { "firefox", NULL, NULL, 1 << 1, 0, -1 } /* Open Firefox in tag 2 */ }; /* layout(s) */ -static const float mfact = 0.55; /* factor of master area size [0.05..0.95] */ +static const float mfact = 0.50; /* 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 lockfullscreen = 1; /* 1 will force focus on the fullscreen window */ diff --git a/config.mk b/config.mk index ee4a0cb..5ceecf4 100644 --- a/config.mk +++ b/config.mk @@ -4,7 +4,7 @@ VERSION = 6.3 # Customize below to fit your system # paths -PREFIX = $(HOME)/.local +PREFIX = ${HOME}/.local MANPREFIX = ${PREFIX}/share/man X11INC = /usr/X11R6/include diff --git a/dwm.c b/dwm.c index a96f33c..788e9d9 100644 --- a/dwm.c +++ b/dwm.c @@ -1549,7 +1549,7 @@ setup(void) if (!drw_fontset_create(drw, fonts, LENGTH(fonts))) die("no fonts could be loaded."); lrpad = drw->fonts->h; - bh = drw->fonts->h + 2; + bh = user_bh ? user_bh : drw->fonts->h + 2; updategeom(); /* init atoms */ utf8string = XInternAtom(dpy, "UTF8_STRING", False); diff --git a/patches/dwm-bar-height-6.2.diff b/patches/dwm-bar-height-6.2.diff new file mode 100644 index 0000000..a576111 --- /dev/null +++ b/patches/dwm-bar-height-6.2.diff @@ -0,0 +1,25 @@ +diff --git a/config.def.h b/config.def.h +index 1c0b587..9814500 100644 +--- a/config.def.h ++++ b/config.def.h +@@ -5,6 +5,7 @@ static const unsigned int borderpx = 1; /* 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 int user_bh = 0; /* 0 means that dwm will calculate bar height, >= 1 means dwm will user_bh as bar height */ + static const char *fonts[] = { "monospace:size=10" }; + static const char dmenufont[] = "monospace:size=10"; + static const char col_gray1[] = "#222222"; +diff --git a/dwm.c b/dwm.c +index 4465af1..2c27cb3 100644 +--- a/dwm.c ++++ b/dwm.c +@@ -1545,7 +1545,7 @@ setup(void) + if (!drw_fontset_create(drw, fonts, LENGTH(fonts))) + die("no fonts could be loaded."); + lrpad = drw->fonts->h; +- bh = drw->fonts->h + 2; ++ bh = user_bh ? user_bh : drw->fonts->h + 2; + updategeom(); + /* init atoms */ + utf8string = XInternAtom(dpy, "UTF8_STRING", False);