From 2ada336f03fbdc15e7edc9e55bbf4d8fca20ee19 Mon Sep 17 00:00:00 2001 From: TrudeEH Date: Mon, 3 Jun 2024 18:05:52 +0100 Subject: [PATCH] Major config changes --- suckless/dmenu/config.def.h | 6 +++--- suckless/dmenu/config.h | 6 +++--- suckless/dwm/config.def.h | 8 ++++---- suckless/dwm/config.h | 8 ++++---- suckless/slstatus/config.def.h | 12 +++++++----- suckless/slstatus/config.h | 12 +++++++----- 6 files changed, 28 insertions(+), 24 deletions(-) diff --git a/suckless/dmenu/config.def.h b/suckless/dmenu/config.def.h index 14c0118d..252c6beb 100644 --- a/suckless/dmenu/config.def.h +++ b/suckless/dmenu/config.def.h @@ -8,10 +8,10 @@ static const char *fonts[] = { }; static const char *prompt = NULL; /* -p option; prompt to the left of input field */ static const char *colors[SchemeLast][2] = { - /* fg bg */ + /* fg bg */ [SchemeNorm] = { "#ebdbb2", "#282828" }, - [SchemeSel] = { "#ebdbb2", "#98971a" }, - [SchemeOut] = { "#ebdbb2", "#8ec07c" }, + [SchemeSel] = { "#282828", "#ebdbb2" }, + [SchemeOut] = { "#ebdbb2", "#8ec07c" }, }; /* -l option; if nonzero, dmenu uses vertical list with given number of lines */ static unsigned int lines = 0; diff --git a/suckless/dmenu/config.h b/suckless/dmenu/config.h index 14c0118d..252c6beb 100644 --- a/suckless/dmenu/config.h +++ b/suckless/dmenu/config.h @@ -8,10 +8,10 @@ static const char *fonts[] = { }; static const char *prompt = NULL; /* -p option; prompt to the left of input field */ static const char *colors[SchemeLast][2] = { - /* fg bg */ + /* fg bg */ [SchemeNorm] = { "#ebdbb2", "#282828" }, - [SchemeSel] = { "#ebdbb2", "#98971a" }, - [SchemeOut] = { "#ebdbb2", "#8ec07c" }, + [SchemeSel] = { "#282828", "#ebdbb2" }, + [SchemeOut] = { "#ebdbb2", "#8ec07c" }, }; /* -l option; if nonzero, dmenu uses vertical list with given number of lines */ static unsigned int lines = 0; diff --git a/suckless/dwm/config.def.h b/suckless/dwm/config.def.h index 1c6d4ba1..67ed2925 100644 --- a/suckless/dwm/config.def.h +++ b/suckless/dwm/config.def.h @@ -67,8 +67,8 @@ static const char *slockcmd[] = { "slock", NULL }; static const Key keys[] = { /* modifier key function argument */ { MODKEY, XK_p, spawn, {.v = dmenucmd } }, - { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, - { MODKEY|ShiftMask, XK_l, spawn, {.v = slockcmd } }, + { MODKEY, XK_Return, spawn, {.v = termcmd } }, + { MODKEY|ShiftMask, XK_l, spawn, {.v = slockcmd } }, { MODKEY, XK_b, togglebar, {0} }, { MODKEY, XK_j, focusstack, {.i = +1 } }, { MODKEY, XK_k, focusstack, {.i = -1 } }, @@ -76,9 +76,9 @@ static const Key keys[] = { { MODKEY, XK_d, incnmaster, {.i = -1 } }, { MODKEY, XK_h, setmfact, {.f = -0.05} }, { MODKEY, XK_l, setmfact, {.f = +0.05} }, - { MODKEY, XK_Return, zoom, {0} }, + { MODKEY|ShiftMask, XK_Return, zoom, {0} }, { MODKEY, XK_Tab, view, {0} }, - { MODKEY|ShiftMask, XK_c, killclient, {0} }, + { MODKEY, XK_c, killclient, {0} }, { MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, { MODKEY, XK_f, setlayout, {.v = &layouts[1]} }, { MODKEY, XK_m, setlayout, {.v = &layouts[2]} }, diff --git a/suckless/dwm/config.h b/suckless/dwm/config.h index 1c6d4ba1..67ed2925 100644 --- a/suckless/dwm/config.h +++ b/suckless/dwm/config.h @@ -67,8 +67,8 @@ static const char *slockcmd[] = { "slock", NULL }; static const Key keys[] = { /* modifier key function argument */ { MODKEY, XK_p, spawn, {.v = dmenucmd } }, - { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, - { MODKEY|ShiftMask, XK_l, spawn, {.v = slockcmd } }, + { MODKEY, XK_Return, spawn, {.v = termcmd } }, + { MODKEY|ShiftMask, XK_l, spawn, {.v = slockcmd } }, { MODKEY, XK_b, togglebar, {0} }, { MODKEY, XK_j, focusstack, {.i = +1 } }, { MODKEY, XK_k, focusstack, {.i = -1 } }, @@ -76,9 +76,9 @@ static const Key keys[] = { { MODKEY, XK_d, incnmaster, {.i = -1 } }, { MODKEY, XK_h, setmfact, {.f = -0.05} }, { MODKEY, XK_l, setmfact, {.f = +0.05} }, - { MODKEY, XK_Return, zoom, {0} }, + { MODKEY|ShiftMask, XK_Return, zoom, {0} }, { MODKEY, XK_Tab, view, {0} }, - { MODKEY|ShiftMask, XK_c, killclient, {0} }, + { MODKEY, XK_c, killclient, {0} }, { MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, { MODKEY, XK_f, setlayout, {.v = &layouts[1]} }, { MODKEY, XK_m, setlayout, {.v = &layouts[2]} }, diff --git a/suckless/slstatus/config.def.h b/suckless/slstatus/config.def.h index 0fe3b8b6..76913ce6 100644 --- a/suckless/slstatus/config.def.h +++ b/suckless/slstatus/config.def.h @@ -4,7 +4,7 @@ const unsigned int interval = 1000; /* text to show if no value can be retrieved */ -static const char unknown_str[] = "n/a"; +static const char unknown_str[] = "??"; /* maximum output string length */ #define MAXLEN 2048 @@ -65,8 +65,10 @@ static const char unknown_str[] = "n/a"; */ static const struct arg args[] = { /* function format argument */ - { cpu_perc, " %s%% ", NULL }, - { ram_used, " %s", NULL }, - { ram_perc, "(%s%%) ", NULL }, - { datetime, " %s", "%a %F %T" }, + { battery_perc, "󰂉 %s%% ", "BAT0" }, + { vol_perc, " %s%% ", NULL }, + { cpu_perc, " %s%% ", NULL }, + { ram_used, " %s", NULL }, + { ram_perc, "(%s%%) ", NULL }, + { datetime, " %s", "%d/%m/%y %l:%M %p" }, }; diff --git a/suckless/slstatus/config.h b/suckless/slstatus/config.h index 0fe3b8b6..db8ac7c2 100644 --- a/suckless/slstatus/config.h +++ b/suckless/slstatus/config.h @@ -4,7 +4,7 @@ const unsigned int interval = 1000; /* text to show if no value can be retrieved */ -static const char unknown_str[] = "n/a"; +static const char unknown_str[] = "??"; /* maximum output string length */ #define MAXLEN 2048 @@ -65,8 +65,10 @@ static const char unknown_str[] = "n/a"; */ static const struct arg args[] = { /* function format argument */ - { cpu_perc, " %s%% ", NULL }, - { ram_used, " %s", NULL }, - { ram_perc, "(%s%%) ", NULL }, - { datetime, " %s", "%a %F %T" }, + { battery_perc, "󰂉 %s%% ", "BAT0" }, + { vol_perc, " %s%% ", NULL }, + { cpu_perc, " %s%% ", NULL }, + { ram_used, " %s", NULL }, + { ram_perc, "(%s%%) ", NULL }, + { datetime, " %s", "%d/%m/%y %l:%M %p" }, };