From 426bedbf865a53360dbf4e11bee340ee1a559d9f Mon Sep 17 00:00:00 2001 From: Luca Bilke Date: Sat, 3 Feb 2024 16:48:48 +0100 Subject: [PATCH] more work, added pango back --- build.sh | 4 ++-- config.h | 23 ++++++----------------- patches.h | 8 ++++---- todo | 1 + 4 files changed, 13 insertions(+), 23 deletions(-) diff --git a/build.sh b/build.sh index e32bd78..4f1eab0 100755 --- a/build.sh +++ b/build.sh @@ -1,11 +1,11 @@ #!/bin/sh -cp -i config.mk patches.h dwm-flexipatch/ +cp config.mk patches.h dwm-flexipatch/ flexipatch-finalizer/flexipatch-finalizer.sh -r -d dwm-flexipatch -o dwm-final for patch in patches/*.diff; do patch -d dwm-final <"$patch" done -cp -i config.h dwm-final/ +cp config.h dwm-final/ cd dwm-final || exit 1 make clean install DESTDIR="../pkg" PREFIX="/usr" cd - || exit 1 diff --git a/config.h b/config.h index 7c10b51..076c54d 100644 --- a/config.h +++ b/config.h @@ -21,24 +21,14 @@ static int floatposgrid_x = 5; static int floatposgrid_y = 3; static const unsigned int systrayspacing = 0; static const int showsystray = 1; -static const unsigned int ulinepad = 5; /* horizontal padding between the underline and tag */ -static const unsigned int ulinestroke = 2; /* thickness / height of the underline */ -static const unsigned int ulinevoffset = 0; /* how far above the bottom of the bar the line should appear */ -static const int ulineall = 0; /* Indicators: see patch/bar_indicators.h for options */ static int tagindicatortype = INDICATOR_NONE; static int tiledindicatortype = INDICATOR_NONE; static int floatindicatortype = INDICATOR_NONE; -static const char *fonts[] = { - "FiraCode Nerd Font Mono:pixelsize=14", - "FiraCode Nerd Font Mono:pixelsize=20", - "FiraCode Nerd Font Mono:pixelsize=30", - "Noto Color Emoji:pixelsize=14", - "FontAwesome:pixelsize=14" -}; -static const char dmenufont[] = "FiraCode Nerd Font Mono:pixelsize=14"; +static const char font[] = "FiraCode Nerd Font 28"; +static const char dmenufont[] = "FiraCode Nerd Font:pixelsize=14"; #define NOCOLOR "#FF0000" #define COLOR0 "#15161E" @@ -111,7 +101,6 @@ static char scratchnormbgcolor[] = COLOR0; static char scratchnormbordercolor[] = BORDERNORM; static char scratchnormfloatcolor[] = BORDERNORM; - static const unsigned int baralpha = 0xcc; static const unsigned int borderalpha = OPAQUE; static const unsigned int alphas[][3] = { @@ -192,8 +181,8 @@ static const Rule rules[] = { RULE(.instance = "spfile", .scratchkey = 'f', .isfloating = 1, .floatpos = "50% 50% 80% 80%") RULE(.instance = "spproc", .scratchkey = 'p', .isfloating = 1, .floatpos = "50% 50% 80% 80%") RULE(.instance = "spwiki", .scratchkey = 'w', .isfloating = 1, .floatpos = "50% 50% 80% 80%") - RULE(.instance = "spvolm", .scratchkey = 'v', .isfloating = 1, .floatpos = "-4x -4y 900W 600H") - RULE(.instance = "spinet", .scratchkey = 'i', .isfloating = 1, .floatpos = "-4x -4y 800W 800H") + RULE(.instance = "spvolm", .scratchkey = 'v', .isfloating = 1, .floatpos = "100% 100% 900W 600H") + RULE(.instance = "spinet", .scratchkey = 'i', .isfloating = 1, .floatpos = "100% 100% 800W 800H") }; /* Bar rules allow you to configure what is shown where on the bar, as well as @@ -250,9 +239,9 @@ static const Layout layouts[] = { /* key definitions */ #define MODKEY Mod4Mask #define TAGKEYS(KEY,TAG) \ - { MODKEY, KEY, comboview, {.ui = 1 << TAG} }, \ + { MODKEY, KEY, view, {.ui = 1 << TAG} }, \ { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \ - { MODKEY|ShiftMask, KEY, combotag, {.ui = 1 << TAG} }, \ + { MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \ { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} } #define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } } diff --git a/patches.h b/patches.h index 8d1984a..4ca9d35 100644 --- a/patches.h +++ b/patches.h @@ -180,7 +180,7 @@ /* This patch underlines the selected tag, or optionally all tags. * https://dwm.suckless.org/patches/underlinetags/ */ -#define BAR_UNDERLINETAGS_PATCH 1 +#define BAR_UNDERLINETAGS_PATCH 0 /* This patch adds the window icon next to the window title in the bar. * @@ -388,7 +388,7 @@ * https://lists.suckless.org/hackers/2004/17285.html * https://dwm.suckless.org/patches/pango/ */ -#define BAR_PANGO_PATCH 0 +#define BAR_PANGO_PATCH 1 /* This patch allows the status text to be fixed to the bar on a specific * monitor rather than being drawn on the focused monitor. @@ -544,7 +544,7 @@ * hold MOD and then press and hold 1 and 3 together. * https://dwm.suckless.org/patches/combo/ */ -#define COMBO_PATCH 1 +#define COMBO_PATCH 0 /* Allow dwm to execute commands from autostart array in your config.h file. When dwm exits * then all processes from autostart array will be killed. @@ -844,7 +844,7 @@ /* Removes the border when there is only one window visible. * https://dwm.suckless.org/patches/noborder/ */ -#define NOBORDER_PATCH 1 +#define NOBORDER_PATCH 0 /* Enable modifying or removing dmenu in config.def.h which resulted previously in a * compilation error because two lines of code hardcode dmenu into dwm. diff --git a/todo b/todo index 7febae5..87eb164 100644 --- a/todo +++ b/todo @@ -1,2 +1,3 @@ # TODO: Put this in picom conf: `shadow-exclude = [ "! _IS_FLOATING@:32c = 1" ];` # TODO: customize layoutmenu patch +# TODO: Add sgr escapes patch https://dwm.suckless.org/patches/sgrstatus/