From db14a74d6a24f0c4402ffc953cbe372cc408ebf8 Mon Sep 17 00:00:00 2001 From: stkhan Date: Thu, 8 Jun 2023 22:09:38 -0500 Subject: Change modes to profiles and clean --- modes/master/Makefile | 4 --- modes/master/blocks.h | 15 ---------- modes/master/keys.h | 72 ------------------------------------------------ profiles/master/Makefile | 4 +++ profiles/master/blocks.h | 15 ++++++++++ profiles/master/keys.h | 72 ++++++++++++++++++++++++++++++++++++++++++++++++ scripts/cp.sh | 4 +-- scripts/set_theme.sh | 6 ++-- 8 files changed, 96 insertions(+), 96 deletions(-) delete mode 100644 modes/master/Makefile delete mode 100644 modes/master/blocks.h delete mode 100644 modes/master/keys.h create mode 100644 profiles/master/Makefile create mode 100644 profiles/master/blocks.h create mode 100644 profiles/master/keys.h diff --git a/modes/master/Makefile b/modes/master/Makefile deleted file mode 100644 index 55b881e..0000000 --- a/modes/master/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -all: master - -master: - cp keys.h ../../wm/dwm-6.4/ diff --git a/modes/master/blocks.h b/modes/master/blocks.h deleted file mode 100644 index 2b7566c..0000000 --- a/modes/master/blocks.h +++ /dev/null @@ -1,15 +0,0 @@ -//Modify this file to change what commands output to your statusbar, and recompile using the make command. -static const Block blocks[] = { - - /*Icon*/ /*Command*/ /*Update Interval*/ /*Update Signal*/ - {"", "dwmblocks-mpc", 2, 2}, - {"", "dwmblocks-du", 60, 0}, - {"", "dwmblocks-volume", 0, 10}, - {"", "dwmblocks-battery", 1, 0}, - {"🕗 ", "date '+%k:%M'", 1, 0}, - {"📅 ", "date '+%A, %B %d %G'", 1, 0}, -}; - -//sets delimeter between status commands. NULL character ('\0') means no delimeter. -static char delim[] = " | "; -static unsigned int delimLen = 5; diff --git a/modes/master/keys.h b/modes/master/keys.h deleted file mode 100644 index 2277b77..0000000 --- a/modes/master/keys.h +++ /dev/null @@ -1,72 +0,0 @@ -static Key keys[] = { - /* modifier key function argument */ - { MODKEY, XK_d, spawn, {.v = dmenucmd } }, - { MODKEY, XK_Return, spawn, {.v = termcmd } }, - { MODKEY, XK_b, togglebar, {0} }, - { MODKEY, XK_j, focusstack, {.i = +1 } }, - { MODKEY, XK_k, focusstack, {.i = -1 } }, - { MODKEY, XK_i, incnmaster, {.i = +1 } }, - { MODKEY, XK_u, incnmaster, {.i = -1 } }, - { MODKEY, XK_h, setmfact, {.f = -0.05} }, - { MODKEY, XK_l, setmfact, {.f = +0.05} }, - { MODKEY|ShiftMask, XK_Return, zoom, {0} }, - { MODKEY, XK_Tab, view, {0} }, - { MODKEY, XK_x, killclient, {0} }, - { MODKEY, XK_space, setlayout, {0} }, - { MODKEY|ShiftMask, XK_space, togglefloating, {0} }, - { MODKEY, XK_0, view, {.ui = ~0 } }, - { MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } }, - { MODKEY, XK_comma, focusmon, {.i = -1 } }, - { MODKEY, XK_period, focusmon, {.i = +1 } }, - { MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } }, - { MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } }, - { MODKEY, XK_F3, spawn, SHCMD("st ranger") }, - { MODKEY, XK_F5, spawn, SHCMD("st ncmpcpp") }, - { MODKEY, XK_f, spawn, SHCMD("brave") }, - { MODKEY|ShiftMask, XK_f, spawn, SHCMD("brave --incognito") }, - { MODKEY, XK_w, spawn, SHCMD("curl wttr.in > ~/.cache/weather_report; st less -Srf ~/.cache/weather_report") }, - { MODKEY, XK_F11, spawn, SHCMD("pamixer --allow-boost -i 5; kill -44 $(pidof dwmblocks)") }, - { MODKEY, XK_F10, spawn, SHCMD("pamixer --allow-boost -d 5; kill -44 $(pidof dwmblocks)") }, - { MODKEY|ShiftMask, XK_F10, spawn, SHCMD("pavucontrol") }, - { MODKEY|ShiftMask, XK_F11, spawn, SHCMD("pavucontrol") }, - { MODKEY, XK_F7, spawn, BASHCMD("mpc toggle") }, - { MODKEY, XK_F8, spawn, BASHCMD("mpc prev") }, - { MODKEY, XK_F6, spawn, BASHCMD("mpc next") }, - { MODKEY, XK_m, spawn, SHCMD("st neomutt") }, - { MODKEY, XK_F9, spawn, BASHCMD("pamixer -t; kill -44 $(pidof dwmblocks)") }, - { MODKEY, XK_a, spawn, SHCMD("st newsboat") }, - { MODKEY|ShiftMask, XK_l, spawn, SHCMD("slock") }, - { MODKEY, XK_n, spawn, SHCMD("dmenuvpn") }, - { MODKEY|ShiftMask, XK_F9, spawn, SHCMD("amixer set Capture toggle") }, - { MODKEY, XK_F1, spawn, SHCMD("sudo light -U 5; kill -44 $(pidof dwmblocks)") }, - { MODKEY, XK_z, spawn, SHCMD("passgen --generate") }, - { MODKEY|ShiftMask, XK_z, spawn, SHCMD("passgen --decrypt") }, - { MODKEY, XK_F2, spawn, SHCMD("sudo light -A 5; kill -44 $(pidof dwmblocks)") }, - { MODKEY, XK_p, spawn, SHCMD("nsxiv -t ~/Pictures") }, - { MODKEY, XK_F12, spawn, SHCMD("power") }, - { MODKEY, XK_F4, spawn, SHCMD("galculator") }, - { MODKEY, XK_e, spawn, SHCMD("sarc.sh --unicode") }, - { MODKEY, XK_g, spawn, SHCMD("web_search") }, - { MODKEY, XK_t, spawn, SHCMD("st vim ~/.cache/todo") }, - { MODKEY, XK_y, spawn, SHCMD("st mpv `yt-dlp -g -f 18 $(xclip -o)`") }, - { WINKEY, XK_1, spawn, SHCMD("st vim ~/.cache/.sarc_notes.1") }, - { WINKEY, XK_2, spawn, SHCMD("st vim ~/.cache/.sarc_notes.2") }, - { WINKEY, XK_3, spawn, SHCMD("st vim ~/.cache/.sarc_notes.3") }, - { WINKEY, XK_4, spawn, SHCMD("st vim ~/.cache/.sarc_notes.4") }, - { WINKEY, XK_5, spawn, SHCMD("st vim ~/.cache/.sarc_notes.5") }, - { WINKEY, XK_6, spawn, SHCMD("st vim ~/.cache/.sarc_notes.6") }, - { WINKEY, XK_7, spawn, SHCMD("st vim ~/.cache/.sarc_notes.7") }, - { WINKEY, XK_8, spawn, SHCMD("st vim ~/.cache/.sarc_notes.8") }, - { WINKEY, XK_9, spawn, SHCMD("st vim ~/.cache/.sarc_notes.9") }, - TAGKEYS( XK_1, 0) - TAGKEYS( XK_2, 1) - TAGKEYS( XK_3, 2) - TAGKEYS( XK_4, 3) - TAGKEYS( XK_5, 4) - TAGKEYS( XK_6, 5) - TAGKEYS( XK_7, 6) - TAGKEYS( XK_8, 7) - TAGKEYS( XK_9, 8) - { ControlMask, XK_q, quit, {1} }, - { MODKEY|ShiftMask, XK_q, quit, {0} }, -}; diff --git a/profiles/master/Makefile b/profiles/master/Makefile new file mode 100644 index 0000000..55b881e --- /dev/null +++ b/profiles/master/Makefile @@ -0,0 +1,4 @@ +all: master + +master: + cp keys.h ../../wm/dwm-6.4/ diff --git a/profiles/master/blocks.h b/profiles/master/blocks.h new file mode 100644 index 0000000..2b7566c --- /dev/null +++ b/profiles/master/blocks.h @@ -0,0 +1,15 @@ +//Modify this file to change what commands output to your statusbar, and recompile using the make command. +static const Block blocks[] = { + + /*Icon*/ /*Command*/ /*Update Interval*/ /*Update Signal*/ + {"", "dwmblocks-mpc", 2, 2}, + {"", "dwmblocks-du", 60, 0}, + {"", "dwmblocks-volume", 0, 10}, + {"", "dwmblocks-battery", 1, 0}, + {"🕗 ", "date '+%k:%M'", 1, 0}, + {"📅 ", "date '+%A, %B %d %G'", 1, 0}, +}; + +//sets delimeter between status commands. NULL character ('\0') means no delimeter. +static char delim[] = " | "; +static unsigned int delimLen = 5; diff --git a/profiles/master/keys.h b/profiles/master/keys.h new file mode 100644 index 0000000..2277b77 --- /dev/null +++ b/profiles/master/keys.h @@ -0,0 +1,72 @@ +static Key keys[] = { + /* modifier key function argument */ + { MODKEY, XK_d, spawn, {.v = dmenucmd } }, + { MODKEY, XK_Return, spawn, {.v = termcmd } }, + { MODKEY, XK_b, togglebar, {0} }, + { MODKEY, XK_j, focusstack, {.i = +1 } }, + { MODKEY, XK_k, focusstack, {.i = -1 } }, + { MODKEY, XK_i, incnmaster, {.i = +1 } }, + { MODKEY, XK_u, incnmaster, {.i = -1 } }, + { MODKEY, XK_h, setmfact, {.f = -0.05} }, + { MODKEY, XK_l, setmfact, {.f = +0.05} }, + { MODKEY|ShiftMask, XK_Return, zoom, {0} }, + { MODKEY, XK_Tab, view, {0} }, + { MODKEY, XK_x, killclient, {0} }, + { MODKEY, XK_space, setlayout, {0} }, + { MODKEY|ShiftMask, XK_space, togglefloating, {0} }, + { MODKEY, XK_0, view, {.ui = ~0 } }, + { MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } }, + { MODKEY, XK_comma, focusmon, {.i = -1 } }, + { MODKEY, XK_period, focusmon, {.i = +1 } }, + { MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } }, + { MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } }, + { MODKEY, XK_F3, spawn, SHCMD("st ranger") }, + { MODKEY, XK_F5, spawn, SHCMD("st ncmpcpp") }, + { MODKEY, XK_f, spawn, SHCMD("brave") }, + { MODKEY|ShiftMask, XK_f, spawn, SHCMD("brave --incognito") }, + { MODKEY, XK_w, spawn, SHCMD("curl wttr.in > ~/.cache/weather_report; st less -Srf ~/.cache/weather_report") }, + { MODKEY, XK_F11, spawn, SHCMD("pamixer --allow-boost -i 5; kill -44 $(pidof dwmblocks)") }, + { MODKEY, XK_F10, spawn, SHCMD("pamixer --allow-boost -d 5; kill -44 $(pidof dwmblocks)") }, + { MODKEY|ShiftMask, XK_F10, spawn, SHCMD("pavucontrol") }, + { MODKEY|ShiftMask, XK_F11, spawn, SHCMD("pavucontrol") }, + { MODKEY, XK_F7, spawn, BASHCMD("mpc toggle") }, + { MODKEY, XK_F8, spawn, BASHCMD("mpc prev") }, + { MODKEY, XK_F6, spawn, BASHCMD("mpc next") }, + { MODKEY, XK_m, spawn, SHCMD("st neomutt") }, + { MODKEY, XK_F9, spawn, BASHCMD("pamixer -t; kill -44 $(pidof dwmblocks)") }, + { MODKEY, XK_a, spawn, SHCMD("st newsboat") }, + { MODKEY|ShiftMask, XK_l, spawn, SHCMD("slock") }, + { MODKEY, XK_n, spawn, SHCMD("dmenuvpn") }, + { MODKEY|ShiftMask, XK_F9, spawn, SHCMD("amixer set Capture toggle") }, + { MODKEY, XK_F1, spawn, SHCMD("sudo light -U 5; kill -44 $(pidof dwmblocks)") }, + { MODKEY, XK_z, spawn, SHCMD("passgen --generate") }, + { MODKEY|ShiftMask, XK_z, spawn, SHCMD("passgen --decrypt") }, + { MODKEY, XK_F2, spawn, SHCMD("sudo light -A 5; kill -44 $(pidof dwmblocks)") }, + { MODKEY, XK_p, spawn, SHCMD("nsxiv -t ~/Pictures") }, + { MODKEY, XK_F12, spawn, SHCMD("power") }, + { MODKEY, XK_F4, spawn, SHCMD("galculator") }, + { MODKEY, XK_e, spawn, SHCMD("sarc.sh --unicode") }, + { MODKEY, XK_g, spawn, SHCMD("web_search") }, + { MODKEY, XK_t, spawn, SHCMD("st vim ~/.cache/todo") }, + { MODKEY, XK_y, spawn, SHCMD("st mpv `yt-dlp -g -f 18 $(xclip -o)`") }, + { WINKEY, XK_1, spawn, SHCMD("st vim ~/.cache/.sarc_notes.1") }, + { WINKEY, XK_2, spawn, SHCMD("st vim ~/.cache/.sarc_notes.2") }, + { WINKEY, XK_3, spawn, SHCMD("st vim ~/.cache/.sarc_notes.3") }, + { WINKEY, XK_4, spawn, SHCMD("st vim ~/.cache/.sarc_notes.4") }, + { WINKEY, XK_5, spawn, SHCMD("st vim ~/.cache/.sarc_notes.5") }, + { WINKEY, XK_6, spawn, SHCMD("st vim ~/.cache/.sarc_notes.6") }, + { WINKEY, XK_7, spawn, SHCMD("st vim ~/.cache/.sarc_notes.7") }, + { WINKEY, XK_8, spawn, SHCMD("st vim ~/.cache/.sarc_notes.8") }, + { WINKEY, XK_9, spawn, SHCMD("st vim ~/.cache/.sarc_notes.9") }, + TAGKEYS( XK_1, 0) + TAGKEYS( XK_2, 1) + TAGKEYS( XK_3, 2) + TAGKEYS( XK_4, 3) + TAGKEYS( XK_5, 4) + TAGKEYS( XK_6, 5) + TAGKEYS( XK_7, 6) + TAGKEYS( XK_8, 7) + TAGKEYS( XK_9, 8) + { ControlMask, XK_q, quit, {1} }, + { MODKEY|ShiftMask, XK_q, quit, {0} }, +}; diff --git a/scripts/cp.sh b/scripts/cp.sh index e460aeb..2722351 100755 --- a/scripts/cp.sh +++ b/scripts/cp.sh @@ -1,6 +1,6 @@ #!/bin/bash source ./.config -cp ./modes/$MODE/keys.h ./wm/dwm-6.4/ -cp ./modes/$MODE/blocks.h ./wm/dwmblocks/ +cp ./profiles/$PROFILE/keys.h ./wm/dwm-6.4/ +cp ./profiles/$PROFILE/blocks.h ./wm/dwmblocks/ cp ./theme/$THEME/$THEME.png ~/.config/wallpaper.png cp ./theme/$THEME/colors.h . diff --git a/scripts/set_theme.sh b/scripts/set_theme.sh index fedc758..2022848 100755 --- a/scripts/set_theme.sh +++ b/scripts/set_theme.sh @@ -1,8 +1,8 @@ #!/bin/sh -echo "Choose a mode (type master if unsure): "; ls ./modes/ -read mode -echo "MODE=$mode" >> ./.config +echo "Choose a mode (type master if unsure): "; ls ./profiles/ +read profile +echo "PROFILE=$profile" >> ./.config echo "Choose a theme:" && ls ./theme/ read theme -- cgit v1.2.3