dwm/slstatus etc updates - dotfiles - đ personal arsenal of "rice"
HTML git clone https://git.drkhsh.at/dotfiles.git
DIR Log
DIR Files
DIR Refs
DIR Submodules
DIR README
DIR LICENSE
---
DIR commit 33ed548be1fe7ce85aefffdffde67fa59c4026dc
DIR parent efa3b4fab9ae79d8e86d7348dfc9b663615a75df
HTML Author: drkhsh <me@drkhsh.at>
Date: Mon, 17 Jun 2024 00:09:22 +0200
dwm/slstatus etc updates
Diffstat:
M _openbsd/dwm/config.h | 128 +++++++++++++++++++------------
M _openbsd/slstatus/config.h | 8 ++++----
2 files changed, 83 insertions(+), 53 deletions(-)
---
DIR diff --git a/_openbsd/dwm/config.h b/_openbsd/dwm/config.h
@@ -14,65 +14,94 @@
*/
/* color scheme */
-#include "colors/gruvbox-dark.h"
+#include "colors/tokyo-night.h"
/* appearance */
-static const unsigned int borderpx = 1; /* border pixel of windows */
-static const unsigned int barborderpx = 1; /* border pixel of status bar */
-static const unsigned int snap = 4; /* snap pixel */
-static const unsigned int gappih = 5; /* horiz inner gap between windows */
-static const unsigned int gappiv = 5; /* vert inner gap between windows */
-static const unsigned int gappoh = 5; /* horiz outer gap between windows and screen edge */
-static const unsigned int gappov = 5; /* vert outer gap between windows and screen edge */
-static const int smartgaps = 0; /* 1 means no outer gap when there is only one window */
-static const int showbar = 1; /* 0 means no bar */
-static const int topbar = 0; /* 0 means bottom bar */
-static const int vertmarginbar = 0; /* vertical margin of bar */
-static const int horizmarginbar = 0; /* horizontal margin of bar */
-static const int horizpadbar = 2; /* horizontal padding for statusbar */
-static const int vertpadbar = 0; /* vertical padding for statusbar */
-static const unsigned int systraypinning = 0; /* 0: sloppy systray follows selected monitor, >0: pin systray to monitor X */
-static const unsigned int systrayspacing = 2; /* systray spacing */
-static const int systraypinningfailfirst = 1; /* 1: if pinning fails, display systray on the first monitor, False: display systray on the last monitor*/
-static const int showsystray = 1; /* 0 means no systray */
-static const char *fonts[] = { "ShureTechMono Nerd Font Mono:pixelsize=14:antialias=true:autohint=true" };
-static const char dmenufont[] = "ShureTechMono Nerd Font Mono:pixelsize=14:antialias=true:autohint=true";
-static const char *colors[][3] = {
- /* fg bg border */
- [SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
- [SchemeSel] = { col_gray4, col_cyan, col_gray5 },
+static const unsigned int borderpx = 1; /* border pixel of windows */
+static const unsigned int barborderpx = 1; /* border pixel of status bar */
+static const unsigned int snap = 4; /* snap pixel */
+static const unsigned int gappih = 5; /* horiz inner gap between windows */
+static const unsigned int gappiv = 5; /* vert inner gap between windows */
+static const unsigned int gappoh = 5; /* horiz outer gap between windows and screen edge */
+static const unsigned int gappov = 5; /* vert outer gap between windows and screen edge */
+static const int smartgaps = 0; /* 1 means no outer gap when there is only one window */
+static const int showbar = 1; /* 0 means no bar */
+static const int topbar = 0; /* 0 means bottom bar */
+static const int vertmarginbar = 0; /* vertical margin of bar */
+static const int horizmarginbar = 0; /* horizontal margin of bar */
+static const int horizpadbar = 2; /* horizontal padding for statusbar */
+static const int vertpadbar = 0; /* vertical padding for statusbar */
+static const unsigned int colorfultag = 1; /* 0 means use SchemeSel for selected tag */
+static const unsigned int systraypinning = 0; /* 0: sloppy systray follows selected monitor, >0: pin systray to monitor X */
+static const unsigned int systrayspacing = 1; /* systray spacing */
+static const int systraypinningfailfirst = 1; /* 1: if pinning fails, display systray on the first monitor, False: display systray on the last monitor*/
+static const int showsystray = 1; /* 0 means no systray */
+static const char *fonts[] = { "ShureTechMono Nerd Font Mono:pixelsize=14:antialias=true:autohint=true" };
+static const char dmenufont[] = "ShureTechMono Nerd Font Mono:pixelsize=14:antialias=true:autohint=true";
+static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
+static const char *colors[][3] = {
+ /* fg bg border */
+ [SchemeNorm] = { col_normfg, col_normbg, col_normborder },
+ [SchemeSel] = { col_selfg, col_selbg, col_selborder },
+ [SchemeTag] = { col_gray, col_normbg, col_normbg },
+ [SchemeTag1] = { col_red, col_normbg, col_normbg },
+ [SchemeTag2] = { col_orange, col_normbg, col_normbg },
+ [SchemeTag3] = { col_yellow, col_normbg, col_normbg },
+ [SchemeTag4] = { col_green, col_normbg, col_normbg },
+ [SchemeTag5] = { col_cyan, col_normbg, col_normbg },
+ [SchemeTag6] = { col_blue, col_normbg, col_normbg },
+ [SchemeTag7] = { col_purple, col_normbg, col_normbg },
+ [SchemeTag8] = { col_pink, col_normbg, col_normbg },
+ [SchemeTag9] = { col_white, col_normbg, col_normbg },
+ [SchemeLayout] = { col_cyan, col_normbg, col_normbg }
};
static const unsigned int baralpha = 0xd0;
static const unsigned int borderalpha = OPAQUE;
static const unsigned int alphas[][3] = {
/* fg bg border */
- [SchemeNorm] = { OPAQUE, baralpha, borderalpha },
- [SchemeSel] = { OPAQUE, baralpha, borderalpha },
+ [SchemeNorm] = { OPAQUE, baralpha, borderalpha },
+ [SchemeSel] = { OPAQUE, baralpha, borderalpha },
+ [SchemeTag] = { OPAQUE, baralpha, borderalpha },
+ [SchemeTag1] = { OPAQUE, baralpha, borderalpha },
+ [SchemeTag2] = { OPAQUE, baralpha, borderalpha },
+ [SchemeTag3] = { OPAQUE, baralpha, borderalpha },
+ [SchemeTag4] = { OPAQUE, baralpha, borderalpha },
+ [SchemeTag5] = { OPAQUE, baralpha, borderalpha },
+ [SchemeTag6] = { OPAQUE, baralpha, borderalpha },
+ [SchemeTag7] = { OPAQUE, baralpha, borderalpha },
+ [SchemeTag8] = { OPAQUE, baralpha, borderalpha },
+ [SchemeTag9] = { OPAQUE, baralpha, borderalpha },
+ [SchemeLayout] = { OPAQUE, baralpha, borderalpha }
};
-/* staticstatus */
-static const int statmonval = 0;
-
/* tagging */
static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
+static const int tagschemes[] = { SchemeTag1, SchemeTag2, SchemeTag3,
+ SchemeTag4, SchemeTag5, SchemeTag6,
+ SchemeTag7, SchemeTag8, SchemeTag9
+};
+static const unsigned int ulinepad = 4; /* horizontal padding between the underline and tag */
+static const unsigned int ulinestroke = 2; /* thickness / height of the underline */
+static const unsigned int ulinevoffset = 1; /* how far above the bottom of the bar the line should appear */
+static const int ulineall = 0; /* 1 to show underline on all tags, 0 for just the active ones */
static const Rule rules[] = {
/* xprop(1):
* WM_CLASS(STRING) = instance, class
* WM_NAME(STRING) = title
*/
- /* class instance title tags mask iscentered isfloating monitor */
- { "Gimp", NULL, NULL, 0, 0, 1, -1 },
- { "st-256color", NULL, NULL, 0, 1, 0, -1 },
- { "xterm-256color", NULL, NULL, 0, 1, 0, -1 },
- { "Pinentry-gtk-2", NULL, NULL, 0, 1, 1, -1 },
- { "Pinentry-gnome-3", NULL, NULL, 0, 1, 1, -1 },
- { "Pinentry-gnome", NULL, NULL, 0, 1, 1, -1 },
- { "Pinentry", NULL, NULL, 0, 1, 1, -1 },
- { "Gcr-prompter", NULL, NULL, 0, 1, 1, -1 },
- { "Zenity", NULL, NULL, 0, 1, 1, -1 },
- { "Tor Browser", NULL, NULL, 0, 1, 1, -1 },
- { "Drawterm", NULL, NULL, 0, 1, 1, -1 },
+ /* class instance title tags mask iscentered isfloating monitor */
+ { "Gimp", NULL, NULL, 0, 0, 1, -1 },
+ { "st-256color", NULL, NULL, 0, 1, 0, -1 },
+ { "xterm-256color", NULL, NULL, 0, 1, 0, -1 },
+ { "Pinentry-gtk-2", NULL, NULL, 0, 1, 1, -1 },
+ { "Pinentry-gnome-3", NULL, NULL, 0, 1, 1, -1 },
+ { "Pinentry-gnome", NULL, NULL, 0, 1, 1, -1 },
+ { "Pinentry", NULL, NULL, 0, 1, 1, -1 },
+ { "Gcr-prompter", NULL, NULL, 0, 1, 1, -1 },
+ { "Zenity", NULL, NULL, 0, 1, 1, -1 },
+ { "Tor Browser", NULL, NULL, 0, 1, 1, -1 },
+ { "Drawterm", NULL, NULL, 0, 1, 1, -1 },
};
/* layout(s) */
@@ -112,13 +141,13 @@ static const MonitorRule monrules[] = {
#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_normbg, "-nf", col_normfg, "-sb", col_selbg, "-sf", col_selfg, NULL };
static const char *passdmenucmd[] = { "pass.dmenu", NULL };
-static const char *ykdmenucmd[] = { "yubikey-oath-dmenu", "--clipboard", "--clipboard-cmd", "xclip -selection clipboard", NULL };
-static const char *wallcmd[] = { "/home/drkhsh/.fehbg", NULL };
-static const char *termcmd[] = { "st", NULL };
-static const char *slockcmd[] = { "slock", NULL };
+static const char *ykdmenucmd[] = { "yubikey-oath-dmenu", "--clipboard", "--clipboard-cmd", "xclip -selection clipboard", NULL };
+static const char *wallcmd[] = { "/home/drkhsh/.fehbg", NULL };
+static const char *termcmd[] = { "st", NULL };
+static const char *slockcmd[] = { "slock", NULL };
+static const char *dswitchcmd[] = { "dswitcher", NULL };
#include "tagallmon.c"
#include "movestack.c"
@@ -129,7 +158,8 @@ static const Key keys[] = {
{ MODKEY|ShiftMask, XK_p, spawn, {.v = passdmenucmd } },
{ MODKEY|ShiftMask, XK_d, spawn, {.v = ykdmenucmd } },
{ MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } },
- { MODKEY, XK_w, spawn, {.v = wallcmd } },
+ { MODKEY|ShiftMask, XK_w, spawn, {.v = wallcmd } },
+ { MODKEY, XK_w, spawn, {.v = dswitchcmd } },
{ MODKEY, XK_b, togglebar, {0} },
{ MODKEY, XK_j, focusstack, {.i = +1 } },
{ MODKEY, XK_k, focusstack, {.i = -1 } },
DIR diff --git a/_openbsd/slstatus/config.h b/_openbsd/slstatus/config.h
@@ -72,11 +72,11 @@ static const char unknown_str[] = "n/a";
*/
static const struct arg args[] = {
/* function format argument */
- { wifi_essid, "ķ°Š %s (", "iwn0" },
- { wifi_perc, "%3s%%) â ", "iwn0" },
- { vol_perc, "īŠŊ %3s%% â ", NULL },
+ { wifi_essid, " ķ°Š %s (", "iwn0" },
+ { wifi_perc, "%3s%%) ^c#36454F^â^d^ ", "iwn0" },
+ { vol_perc, "īŠŊ %3s%% ^c#36454F^â^d^ ", NULL },
{ battery_state, "ī %s", NULL },
- { battery_perc, "%2s%% â ", NULL },
+ { battery_perc, "%2s%% ^c#36454F^â^d^ ", NULL },
{ datetime, "%s", "%Y-%m-%d %H:%M:%S" },
};