diff --git a/.config/suckless/dmenu/Makefile b/.config/suckless/dmenu/Makefile index 29f64cd..bec66bf 100644 --- a/.config/suckless/dmenu/Makefile +++ b/.config/suckless/dmenu/Makefile @@ -1,6 +1,6 @@ PREFIX = /usr/local -CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L +CPPFLAGS = -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L CFLAGS = -std=c99 -pedantic -Wall -Os -I/usr/X11R6/include -I/usr/include/freetype2 $(CPPFLAGS) LDFLAGS = -L/usr/X11R6/lib -lX11 -lfontconfig -lXft diff --git a/.config/suckless/dmenu/scripts/powermenu.sh b/.config/suckless/dmenu/scripts/powermenu.sh new file mode 100755 index 0000000..f74d6b7 --- /dev/null +++ b/.config/suckless/dmenu/scripts/powermenu.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +output=$(echo -e "Poweroff\nReboot\nQuit Dwm" | dmenu -p "Power Actions: " -l 3) +if [ $output == "Poweroff" ]; then + st -e sh -c "doas poweroff" +else if [ $output == "Reboot"]; then + st -e sh -c "doas reboot" +else if [ $output == "Quit Dwm"]; then + st -e sh -c "pkill X" +fi diff --git a/.config/suckless/dwm/Makefile b/.config/suckless/dwm/Makefile index 05c4297..b43e09c 100644 --- a/.config/suckless/dwm/Makefile +++ b/.config/suckless/dwm/Makefile @@ -1,6 +1,6 @@ PREFIX = /usr/local -CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700L +CPPFLAGS = -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=700L CFLAGS = -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os -I/usr/X11R6/include -I/usr/include/freetype2 ${CPPFLAGS} LDFLAGS = -L/usr/X11R6/lib -lX11 -lfontconfig -lXft diff --git a/.config/suckless/dwm/config.h b/.config/suckless/dwm/config.h index f2adf60..b84f6d9 100644 --- a/.config/suckless/dwm/config.h +++ b/.config/suckless/dwm/config.h @@ -46,6 +46,7 @@ static const Key keys[] = { { MODKEY, XK_Return, spawn, {.v = termcmd } }, { MODKEY, XK_space, spawn, {.v = dmenucmd } }, { MODKEY, XK_f, spawn, {.v = browsercmd } }, + { MODKEY|ShiftMask, XK_l, spawn, SHCMD("sh /home/andrew/.config/suckless/dmenu/scripts/powermenu.sh") }, { MODKEY, XK_h, focusstack, {.i = +1 } }, { MODKEY, XK_l, focusstack, {.i = -1 } }, { MODKEY, XK_j, setmfact, {.f = -0.05} }, diff --git a/.config/suckless/dwm/dwm.c b/.config/suckless/dwm/dwm.c index 6df966d..2c23da0 100644 --- a/.config/suckless/dwm/dwm.c +++ b/.config/suckless/dwm/dwm.c @@ -1149,12 +1149,6 @@ propertynotify(XEvent *e) } } -void -quit(const Arg *arg) -{ - running = 0; -} - Monitor * recttomon(int x, int y, int w, int h) { diff --git a/env.sh b/env.sh index a7c4937..844489e 100755 --- a/env.sh +++ b/env.sh @@ -17,7 +17,6 @@ ORIGINAL_DOTS=( "${DOTFILES_CONFIG}nvim/" "${DOTFILES_CONFIG}dunst/" "${DOTFILES_CONFIG}picom.conf" - "${DOTFILES_LOCAL}bin/" "${DOTFILES_LOCAL}share/fonts/" "${DOTFILES_HOME}.xinitrc" "${DOTFILES_HOME}.bashrc" @@ -27,7 +26,6 @@ COPY_DOTS=( "${CONFIG}nvim/" "${CONFIG}dunst/" "${CONFIG}picom.conf" - "${LOCAL}bin/" "${LOCAL}share/fonts/" "${PERSONAL_HOME}.xinitrc" "${PERSONAL_HOME}.bashrc"