diff --git a/dotfiles/.config/picom/picom.conf b/dotfiles/.config/picom/picom.conf index 2f34c21c..f0038ea6 100644 --- a/dotfiles/.config/picom/picom.conf +++ b/dotfiles/.config/picom/picom.conf @@ -6,41 +6,41 @@ glx-copy-from-front = false; active-opacity = 1; inactive-opacity = 1; frame-opacity = 1; -inactive-opacity-override = false; -blur-background = false; +#inactive-opacity-override = false; +#blur-background = false; #blur-background-exclude = [ # "window_type = 'dock' #] -blur-method = "dual_kawase"; -blur-strength = 8; +#blur-method = "dual_kawase"; +#blur-strength = 8; # Fading fading = false; -fade-delta = 2; -no-fading-openclose = false; +#fade-delta = 2; +#no-fading-openclose = false; -fade-exclude = [ ]; +#fade-exclude = [ ]; # Other -mark-wmwin-focused = true; -mark-ovredir-focused = true; -detect-rounded-corners = true; -detect-clien-opacity = true; +#mark-wmwin-focused = true; +#mark-ovredir-focused = true; +#detect-rounded-corners = true; +#detect-clien-opacity = true; vsync = true; dbe = false; -unredir-if-possible = false; -focus-exclude = [ ]; -detect-transient = true; -detect-client-leader = true; +#unredir-if-possible = false; +#focus-exclude = [ ]; +#detect-transient = true; +#detect-client-leader = true; # Window type settings -wintypes: -{ - dock = { - shadow = false; - }; -}; +#wintypes: +#{ +# dock = { +# shadow = false; +# }; +#}; # Window transparency opacity-rule = [ @@ -48,14 +48,14 @@ opacity-rule = [ ]; shadow = false; -shadow-radius = 12; -shadow-offset-x = -5; -shadow-offset-y = -5; -shadow-opacity = 0.5; -shadow-green = 1.0; +#shadow-radius = 12; +#shadow-offset-x = -5; +#shadow-offset-y = -5; +#shadow-opacity = 0.5; +#shadow-green = 1.0; -shadow-exclude = [ ]; +#shadow-exclude = [ ]; -corner-radius = 0; +#corner-radius = 0; xrender-sync-fence = true; diff --git a/suckless/dwm/config.def.h b/suckless/dwm/config.def.h index abb5b226..1c6d4ba1 100644 --- a/suckless/dwm/config.def.h +++ b/suckless/dwm/config.def.h @@ -14,9 +14,10 @@ static const int showbar = 1; /* 0 means no bar */ static const int topbar = 1; /* 0 means bottom bar */ static const char *fonts[] = { "JetBrainsMono NF:size=20" }; static const char *colors[][3] = { - /* fg bg border */ - [SchemeNorm] = { "#ebdbb2", "#282828", "#1d2021" }, - [SchemeSel] = { "#282828", "#ebdbb2", "#ebdbb2" }, + /* fg bg border */ + [SchemeNorm] = { "#ebdbb2", "#282828", "#1d2021" }, + [SchemeSel] = { "#282828", "#ebdbb2", "#ebdbb2" }, + [SchemeTitle] = { "#ebdbb2", "#282828", "#1d2021" }, }; /* tagging */ @@ -47,7 +48,7 @@ static const Layout layouts[] = { }; /* key definitions */ -#define MODKEY Mod1Mask +#define MODKEY Mod4Mask #define TAGKEYS(KEY,TAG) \ { MODKEY, KEY, view, {.ui = 1 << TAG} }, \ { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \ diff --git a/suckless/dwm/config.h b/suckless/dwm/config.h index abb5b226..1c6d4ba1 100644 --- a/suckless/dwm/config.h +++ b/suckless/dwm/config.h @@ -14,9 +14,10 @@ static const int showbar = 1; /* 0 means no bar */ static const int topbar = 1; /* 0 means bottom bar */ static const char *fonts[] = { "JetBrainsMono NF:size=20" }; static const char *colors[][3] = { - /* fg bg border */ - [SchemeNorm] = { "#ebdbb2", "#282828", "#1d2021" }, - [SchemeSel] = { "#282828", "#ebdbb2", "#ebdbb2" }, + /* fg bg border */ + [SchemeNorm] = { "#ebdbb2", "#282828", "#1d2021" }, + [SchemeSel] = { "#282828", "#ebdbb2", "#ebdbb2" }, + [SchemeTitle] = { "#ebdbb2", "#282828", "#1d2021" }, }; /* tagging */ @@ -47,7 +48,7 @@ static const Layout layouts[] = { }; /* key definitions */ -#define MODKEY Mod1Mask +#define MODKEY Mod4Mask #define TAGKEYS(KEY,TAG) \ { MODKEY, KEY, view, {.ui = 1 << TAG} }, \ { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \ diff --git a/suckless/dwm/drw.c b/suckless/dwm/drw.c index a58a2b48..258ff9ee 100644 --- a/suckless/dwm/drw.c +++ b/suckless/dwm/drw.c @@ -190,6 +190,8 @@ drw_clr_create(Drw *drw, Clr *dest, const char *clrname) DefaultColormap(drw->dpy, drw->screen), clrname, dest)) die("error, cannot allocate color '%s'", clrname); + + dest->pixel |= 0xff << 24; } /* Wrapper to create color schemes. The caller has to call free(3) on the diff --git a/suckless/dwm/dwm.c b/suckless/dwm/dwm.c index b68db9d5..a0af3ff7 100644 --- a/suckless/dwm/dwm.c +++ b/suckless/dwm/dwm.c @@ -72,7 +72,7 @@ /* enums */ enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */ -enum { SchemeNorm, SchemeSel }; /* color schemes */ +enum { SchemeNorm, SchemeSel, SchemeTitle }; /* color schemes */ enum { NetSupported, NetWMName, NetWMState, NetWMCheck, NetSystemTray, NetSystemTrayOP, NetSystemTrayOrientation, NetSystemTrayOrientationHorz, NetWMFullscreen, NetActiveWindow, NetWMWindowType, @@ -841,7 +841,7 @@ drawbar(Monitor *m) if ((w = m->ww - tw - stw - x) > bh) { if (m->sel) { - drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]); + drw_setscheme(drw, scheme[m == selmon ? SchemeTitle : SchemeNorm]); drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0); if (m->sel->isfloating) drw_rect(drw, x + boxs, boxs, boxw, boxw, m->sel->isfixed, 0); diff --git a/suckless/dwm/patches/dwm-titlecolor-20210815-ed3ab6b4.diff b/suckless/dwm/patches/dwm-titlecolor-20210815-ed3ab6b4.diff new file mode 100644 index 00000000..f0e5b368 --- /dev/null +++ b/suckless/dwm/patches/dwm-titlecolor-20210815-ed3ab6b4.diff @@ -0,0 +1,47 @@ +From 45a45a0e67f3841d8c4aed2c52b57c2a7ddf2a9a Mon Sep 17 00:00:00 2001 +From: Jack Bird +Date: Sun, 15 Aug 2021 23:15:52 +0100 +Subject: [PATCH] Updated title color patch for 7162335 + +--- + config.def.h | 1 + + dwm.c | 4 ++-- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/config.def.h b/config.def.h +index a2ac963..5b9ae00 100644 +--- a/config.def.h ++++ b/config.def.h +@@ -16,6 +16,7 @@ static const char *colors[][3] = { + /* fg bg border */ + [SchemeNorm] = { col_gray3, col_gray1, col_gray2 }, + [SchemeSel] = { col_gray4, col_cyan, col_cyan }, ++ [SchemeTitle] = { col_gray4, col_cyan, col_cyan }, + }; + + /* tagging */ +diff --git a/dwm.c b/dwm.c +index 5e4d494..73d335e 100644 +--- a/dwm.c ++++ b/dwm.c +@@ -59,7 +59,7 @@ + + /* enums */ + enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */ +-enum { SchemeNorm, SchemeSel }; /* color schemes */ ++enum { SchemeNorm, SchemeSel, SchemeTitle }; /* color schemes */ + enum { NetSupported, NetWMName, NetWMState, NetWMCheck, + NetWMFullscreen, NetActiveWindow, NetWMWindowType, + NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */ +@@ -731,7 +731,7 @@ drawbar(Monitor *m) + + if ((w = m->ww - tw - x) > bh) { + if (m->sel) { +- drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]); ++ drw_setscheme(drw, scheme[m == selmon ? SchemeTitle : SchemeNorm]); + drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0); + if (m->sel->isfloating) + drw_rect(drw, x + boxs, boxs, boxw, boxw, m->sel->isfixed, 0); +-- +2.32.0 +