diff --git a/build.sh b/build.sh index 83ccec6..76dd00b 100755 --- a/build.sh +++ b/build.sh @@ -8,4 +8,8 @@ for patch in patches/*.diff; do done cp config.h dwm-final/ cd dwm-final || exit 1 -make "$@" +if [ "$1" = "-i" ]; then + sudo make install +else + make +fi diff --git a/config.h b/config.h index 4b69f87..b9b9287 100644 --- a/config.h +++ b/config.h @@ -10,6 +10,8 @@ #define BROWSER_FLAG_INCOG "--incognito" #define BROWSER_FLAG_1 "--enable-blink-features=MiddleClickAutoscroll" +#define STATUSBAR "dwmblocks" + /* appearance */ static const unsigned int borderpx = 2; /* border pixel of windows */ static const unsigned int snap = 32; /* snap pixel */ @@ -264,20 +266,20 @@ static const Key keys[] = { // { MODKEY, XK_y, spawn, {.v = (const char *[]){NULL}} }, // { MODKEY | ShiftMask, XK_y, spawn, {.v = (const char *[]){NULL}} }, { MODKEY, XK_f, togglefullscreen, {0} }, - { MODKEY | ShiftMask, XK_f, spawn, {.v = &layouts[6]} }, - { MODKEY, XK_g, spawn, {.v = &layouts[0]} }, - { MODKEY | ShiftMask, XK_g, spawn, {.v = &layouts[1]} }, + { MODKEY | ShiftMask, XK_f, setlayout, {.v = &layouts[6]} }, + { MODKEY, XK_g, setlayout, {.v = &layouts[0]} }, + { MODKEY | ShiftMask, XK_g, setlayout, {.v = &layouts[1]} }, { MODKEY, XK_c, setlayout, {.v = &layouts[2]} }, - { MODKEY | ShiftMask, XK_c, spawn, {.v = &layouts[3]} }, - { MODKEY, XK_r, spawn, {.v = &layouts[4]} }, - { MODKEY | ShiftMask, XK_r, spawn, {.v = &layouts[5]} }, + { MODKEY | ShiftMask, XK_c, setlayout, {.v = &layouts[3]} }, + { MODKEY, XK_r, setlayout, {.v = &layouts[4]} }, + { MODKEY | ShiftMask, XK_r, setlayout, {.v = &layouts[5]} }, { MODKEY, XK_l, focusdir, {.i = 1 } }, // { MODKEY | ShiftMask, XK_l, spawn, {.v = (const char *[]){NULL}} }, // { MODKEY, XK_slash, spawn, {.v = (const char *[]){NULL}} }, // { MODKEY | ShiftMask, XK_slash, spawn, {.v = (const char *[]){NULL}} }, // { MODKEY, XK_equal, spawn, {.v = (const char *[]){NULL}} }, // { MODKEY | ShiftMask, XK_equal, spawn, {.v = (const char *[]){NULL}} }, - { MODKEY, XK_a, setmfact, {.f = -0.05} }, + // { MODKEY, XK_a, spawn, {.v = (const char *[]){NULL}} }, // { MODKEY | ShiftMask, XK_a, spawn, {.v = (const char *[]){NULL}} }, { MODKEY, XK_o, togglescratch, {.v = spproc} }, // { MODKEY | ShiftMask, XK_o, spawn, {.v = (const char *[]){NULL}} }, @@ -296,6 +298,7 @@ static const Key keys[] = { { MODKEY, XK_n, focusstack, {.i = PREVSEL} }, { MODKEY | ShiftMask, XK_n, focusstack, {.i = 0} }, { MODKEY, XK_s, setmfact, {.f = +0.05} }, + { MODKEY | ShiftMask, XK_s, setmfact, {.f = -0.05} }, // { MODKEY | ShiftMask, XK_s, spawn, {.v = (const char *[]){NULL}} }, // { MODKEY, XK_minus, spawn, {.v = (const char *[]){NULL}} }, // { MODKEY | ShiftMask, XK_minus, spawn, {.v = (const char *[]){NULL}} }, diff --git a/patches.h b/patches.h index 662f3f1..d73cf4c 100644 --- a/patches.h +++ b/patches.h @@ -29,7 +29,7 @@ * dwmblocks: https://github.com/torrinfail/dwmblocks * https://dwm.suckless.org/patches/statuscmd/ */ -#define BAR_DWMBLOCKS_PATCH 0 +#define BAR_DWMBLOCKS_PATCH 1 /* Originally the dwmblocks + statuscmd patch used a user defined signal (SIGUSR1) * for communicating with dwmblocks to indicate update signal and what button was @@ -77,7 +77,7 @@ #define BAR_LAYOUTMENU_PATCH 0 /* Show layout symbol in bar */ -#define BAR_LTSYMBOL_PATCH 0 +#define BAR_LTSYMBOL_PATCH 1 /* Adds powerline arrows for the status. * This uses statuscolors logic for choosing colors for the powerline. As these markers @@ -144,7 +144,7 @@ * when clicking the status bar. Refer to the website for usage. * https://dwm.suckless.org/patches/statuscmd/ */ -#define BAR_STATUSCMD_PATCH 0 +#define BAR_STATUSCMD_PATCH 1 /* Status2d allows colors and rectangle drawing in your dwm status bar. * This patch is incompatible with the statuscolors patch which takes precedence. @@ -890,7 +890,7 @@ * This is to prevent you accidentally losing all your work. * https://dwm.suckless.org/patches/onlyquitonempty/ */ -#define ONLYQUITONEMPTY_PATCH 1 +#define ONLYQUITONEMPTY_PATCH 0 /* The pertag patch adds nmaster, mfacts and layouts per tag rather than per * monitor (default).