diff --git a/config.h b/config.h index e37feca..cea96be 100644 --- a/config.h +++ b/config.h @@ -15,15 +15,15 @@ static const int showbar = 1; /* 0 means no bar */ static const int topbar = 1; /* 0 means bottom bar */ static const char *fonts[] = { "mononoki Nerd Font Mono:size=10", "JoyPixels:size=9" }; static const char dmenufont[] = "mononoki Nerd Font Mono:size=10"; -static const char col_gray1[] = "#222222"; -static const char col_gray2[] = "#444444"; +static const char col_gray1[] = "#000000"; +static const char col_gray2[] = "#000000"; static const char col_gray3[] = "#bbbbbb"; static const char col_gray4[] = "#eeeeee"; -static const char col_cyan[] = "#750000"; +static const char col_cyan[] = "#ffffff"; static const char *colors[][3] = { /* fg bg border */ [SchemeNorm] = { col_gray3, col_gray1, col_gray2 }, - [SchemeSel] = { col_gray4, col_cyan, col_cyan }, + [SchemeSel] = { col_gray1, col_cyan, col_cyan }, }; typedef struct { @@ -32,17 +32,21 @@ typedef struct { } Sp; const char *spcmd1[] = { "st", "-g", "150x50", "-c", "sphtop", "-e", "htop", NULL }; const char *spcmd2[] = { "st", "-g", "150x50", "-c", "spterm", NULL }; -const char *spcmd3[] = { "st", "-g", "150x50", "-c", "sppm", "-e", "pulsemixer", NULL }; -const char *spcmd4[] = { "st", "-g", "150x50", "-c", "spncmp", "-e", "ncmpcpp", NULL }; -const char *spcmd5[] = { "st", "-g", "150x50", "-c", "spmutt", "-e", "neomutt", NULL }; -const char *spcmd6[] = { "st", "-g", "150x50", "-c", "spping", "-e", "ping", "1.1.1.1", NULL }; +const char *spcmd3[] = { "st", "-g", "150x50", "-c", "sppmxr", "-e", "pulsemixer", NULL }; +const char *spcmd4[] = { "st", "-g", "150x50", "-c", "spxmrw", "-e", "xmrzachir", NULL }; +const char *spcmd5[] = { "st", "-g", "150x50", "-c", "spncmp", "-e", "ncmpcpp", NULL }; +const char *spcmd6[] = { "st", "-g", "150x50", "-c", "spmutt", "-e", "zsh", "-c", "neomutt", NULL }; +const char *spcmd7[] = { "st", "-g", "150x50", "-c", "spxmpp", "-e", "profanity", NULL }; +const char *spcmd8[] = { "st", "-g", "150x50", "-c", "spircc", "-e", "irssi", NULL }; static Sp scratchpads[] = { { "sphtop", spcmd1 }, { "spterm", spcmd2 }, - { "sppm", spcmd3 }, - { "spncmp", spcmd4 }, - { "spmutt", spcmd5 }, - { "spping", spcmd6 }, + { "sppmxr", spcmd3 }, + { "spxmrw", spcmd4 }, + { "spncmp", spcmd5 }, + { "spmutt", spcmd6 }, + { "spxmpp", spcmd7 }, + { "spircc", spcmd8 }, }; /* tagging */ @@ -80,10 +84,12 @@ static const Rule rules[] = { { "lutris", NULL, NULL, 2, 0, 0, 0, -1 }, { "sphtop", NULL, NULL, SPTAG(0), 1, 1, 1, -1 }, { "spterm", NULL, NULL, SPTAG(1), 1, 1, 1, -1 }, - { "sppm", NULL, NULL, SPTAG(2), 1, 1, 1, -1 }, - { "spncmp", NULL, NULL, SPTAG(3), 1, 1, 1, -1 }, - { "spmutt", NULL, NULL, SPTAG(4), 1, 1, 1, -1 }, - { "spping", NULL, NULL, SPTAG(5), 1, 1, 1, -1 }, + { "sppmxr", NULL, NULL, SPTAG(2), 1, 1, 1, -1 }, + { "spxmrw", NULL, NULL, SPTAG(3), 1, 1, 1, -1 }, + { "spncmp", NULL, NULL, SPTAG(4), 1, 1, 1, -1 }, + { "spmutt", NULL, NULL, SPTAG(5), 1, 1, 1, -1 }, + { "spxmpp", NULL, NULL, SPTAG(6), 1, 1, 1, -1 }, + { "spircc", NULL, NULL, SPTAG(7), 1, 1, 1, -1 }, { NULL, "monero-wallet-gui",NULL, 256, 1, 0, 0, -1 }, }; @@ -103,7 +109,7 @@ static const Layout layouts[] = { }; /* key definitions */ -#define MODKEY Mod3Mask +#define MODKEY Mod1Mask #define TAGKEYS(KEY,TAG) \ { MODKEY, KEY, view, {.ui = 1 << TAG} }, \ { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \ @@ -118,7 +124,7 @@ 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 *rmenucmd[] = { "/usr/sbin/j4-dmenu-desktop", NULL }; */ /* static const char *passmenu[] = { "passmenu", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL }; */ -static const char *termcmd[] = { "urxvtc", NULL }; +static const char *termcmd[] = { "st", NULL }; /* static const char *termcmd[] = { "alacritty", NULL }; */ static const char *sxhkdsig[] = { "pkill", "-USR1", "sxhkd", NULL }; /* static const char *mpdtoggle[] = { "playerctl", "--player=mpd,mpv,%any", "play-pause", NULL }; */ @@ -148,28 +154,32 @@ static Key keys[] = { { MODKEY|ControlMask, XK_z, togglescratch, {.ui = 0 } }, { MODKEY|ControlMask, XK_x, togglescratch, {.ui = 1 } }, { MODKEY|ControlMask, XK_c, togglescratch, {.ui = 2 } }, - { MODKEY|ControlMask, XK_b, togglescratch, {.ui = 3 } }, - { MODKEY|ControlMask, XK_a, togglescratch, {.ui = 4 } }, - { MODKEY|ControlMask, XK_s, togglescratch, {.ui = 5 } }, - { MODKEY, XK_Escape, spawn, {.v = sxhkdsig } }, - // { 0, XF86XK_AudioPlay, spawn, {.v = mpdtoggle } }, - // { 0, XF86XK_AudioNext, spawn, {.v = mpdnext } }, - // { 0, XF86XK_AudioPrev, spawn, {.v = mpdprev } }, - // { ShiftMask, XF86XK_AudioPlay, spawn, {.v = plytoggle } }, - // { ShiftMask, XF86XK_AudioNext, spawn, {.v = plyfwd } }, - // { ShiftMask, XF86XK_AudioPrev, spawn, {.v = plybck } }, - // { 0, XF86XK_MonBrightnessUp, spawn, {.v = blightup } }, - // { 0, XF86XK_MonBrightnessDown, spawn, {.v = blightdown } }, - // { 0, XF86XK_AudioLowerVolume, spawn, {.v = audiodown } }, - // { 0, XF86XK_AudioRaiseVolume, spawn, {.v = audioup } }, - // { 0, XF86XK_AudioMute, spawn, {.v = audiomute } }, - // { 0, XF86XK_AudioMicMute, spawn, {.v = micmute } }, - // { Mod4Mask, XK_l, spawn, {.v = lockscr } }, + { MODKEY|ControlMask, XK_v, togglescratch, {.ui = 3 } }, + { MODKEY|ControlMask, XK_b, togglescratch, {.ui = 4 } }, + { MODKEY|ControlMask, XK_a, togglescratch, {.ui = 5 } }, + { MODKEY|ControlMask, XK_s, togglescratch, {.ui = 6 } }, + { MODKEY|ControlMask, XK_d, togglescratch, {.ui = 7 } }, + { MODKEY, XK_Escape, spawn, {.v = sxhkdsig } }, + // { 0, XF86XK_AudioPlay, spawn, {.v = mpdtoggle } }, + // { 0, XF86XK_AudioNext, spawn, {.v = mpdnext } }, + // { 0, XF86XK_AudioPrev, spawn, {.v = mpdprev } }, + // { ShiftMask, XF86XK_AudioPlay, spawn, {.v = plytoggle } }, + // { ShiftMask, XF86XK_AudioNext, spawn, {.v = plyfwd } }, + // { ShiftMask, XF86XK_AudioPrev, spawn, {.v = plybck } }, + // { 0, XF86XK_MonBrightnessUp, spawn, {.v = blightup } }, + // { 0, XF86XK_MonBrightnessDown, spawn, {.v = blightdown } }, + // { 0, XF86XK_AudioLowerVolume, spawn, {.v = audiodown } }, + // { 0, XF86XK_AudioRaiseVolume, spawn, {.v = audioup } }, + // { 0, XF86XK_AudioMute, spawn, {.v = audiomute } }, + // { 0, XF86XK_AudioMicMute, spawn, {.v = micmute } }, + // { Mod4Mask, XK_l, spawn, {.v = lockscr } }, { MODKEY, XK_b, togglebar, {0} }, { MODKEY, XK_j, focusstack, {.i = +1 } }, { MODKEY, XK_k, focusstack, {.i = -1 } }, { MODKEY|ShiftMask, XK_j, pushdown, {.i = +1 } }, { MODKEY|ShiftMask, XK_k, pushup, {.i = -1 } }, + { MODKEY|Mod4Mask, XK_j, pushmdown, {.i = +1 } }, + { MODKEY|Mod4Mask, XK_k, pushmup, {.i = -1 } }, { MODKEY|ControlMask, XK_k, setcfact, {.f = +0.25} }, { MODKEY|ControlMask, XK_j, setcfact, {.f = -0.25} }, { MODKEY|ControlMask, XK_o, setcfact, {.f = 0.00} }, diff --git a/dwm.c b/dwm.c index 603497c..aa637c0 100644 --- a/dwm.c +++ b/dwm.c @@ -1662,6 +1662,50 @@ pushup(const Arg *arg) { arrange(selmon); } +void +pushmdown(const Arg *arg) { + Client *sel = selmon->sel, *c; + + if(!sel || sel->isfloating || sel == nexttiled(selmon->clients)) + return; + if((c = nexttiled(sel->next))) { + detach(sel); + sel->next = c->next; + c->next = sel; + } else { + detach(sel); + attach(sel); + } + focus(sel); + arrange(selmon); +} + +void +pushmup(const Arg *arg) { + Client *sel = selmon->sel, *c; + + if(!sel || sel->isfloating) + return; + if((c = prevtiled(sel))) { + detach(sel); + sel->next = c; + if(selmon->clients == c) + selmon->clients = sel; + else { + for(c = selmon->clients; c->next != sel->next; c = c->next); + c->next = sel; + } + } else { + for(c = sel; c->next; c = c->next); + detach(sel); + sel->next = NULL; + c->next = sel; + } + focus(sel); + arrange(selmon); +} + + void quit(const Arg *arg) {