From 02c0c676adc5821086569e743fe4187e7fed4838 Mon Sep 17 00:00:00 2001 From: "Devin J. Pohly" Date: Wed, 22 Apr 2020 22:01:49 -0500 Subject: move config.h to config.def.h --- Makefile | 3 +++ config.def.h | 46 ++++++++++++++++++++++++++++++++++++++++++++++ config.h | 46 ---------------------------------------------- 3 files changed, 49 insertions(+), 46 deletions(-) create mode 100644 config.def.h delete mode 100644 config.h diff --git a/Makefile b/Makefile index f4018cb..29d30a1 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,9 @@ xdg-shell-protocol.c: xdg-shell-protocol.o: xdg-shell-protocol.h +config.h: | config.def.h + cp config.def.h $@ + dwl.o: config.h xdg-shell-protocol.h dwl: xdg-shell-protocol.o diff --git a/config.def.h b/config.def.h new file mode 100644 index 0000000..c6953e6 --- /dev/null +++ b/config.def.h @@ -0,0 +1,46 @@ +/* appearance */ +static const float rootcolor[] = {0.3, 0.3, 0.3, 1.0}; + +/* layout(s) */ +static const Layout layouts[] = { + /* symbol arrange function */ + { "[]=", tile }, + { "><>", NULL }, /* no layout function means floating behavior */ +}; + +/* monitors */ +static const MonitorRule monrules[] = { + /* name mfact nmaster scale layout */ + { "X11-1", 0.5, 1, 1, &layouts[0] }, + { "eDP-1", 0.5, 1, 2, &layouts[0] }, + { "HDMI-A-1", 0.5, 1, 1, &layouts[0] }, + /* defaults (required) */ + { NULL, 0.5, 1, 1, &layouts[0] }, +}; + +/* keyboard */ +static const struct xkb_rule_names xkb_rules = { + .rules = NULL, + .model = NULL, + .layout = "dvorak", + .variant = NULL, + .options = "ctrl:nocaps,altwin:swap_lalt_lwin,terminate:ctrl_alt_bksp", +}; + +#define MODKEY WLR_MODIFIER_ALT + +/* commands */ +static const char *termcmd[] = { "kitty", "-o", "linux_display_server=wayland", NULL }; + +static const Key keys[] = { + { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Return, spawn, {.v = termcmd } }, + { MODKEY, XKB_KEY_Escape, quit, {0} }, + { MODKEY, XKB_KEY_F1, focusnext, {0} }, + { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_L, setlayout, {.v = &layouts[0]} }, + { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_F, setlayout, {.v = &layouts[1]} }, +}; + +static const Button buttons[] = { + { MODKEY, BTN_LEFT, movemouse, {0} }, + { MODKEY, BTN_RIGHT, resizemouse, {0} }, +}; diff --git a/config.h b/config.h deleted file mode 100644 index c6953e6..0000000 --- a/config.h +++ /dev/null @@ -1,46 +0,0 @@ -/* appearance */ -static const float rootcolor[] = {0.3, 0.3, 0.3, 1.0}; - -/* layout(s) */ -static const Layout layouts[] = { - /* symbol arrange function */ - { "[]=", tile }, - { "><>", NULL }, /* no layout function means floating behavior */ -}; - -/* monitors */ -static const MonitorRule monrules[] = { - /* name mfact nmaster scale layout */ - { "X11-1", 0.5, 1, 1, &layouts[0] }, - { "eDP-1", 0.5, 1, 2, &layouts[0] }, - { "HDMI-A-1", 0.5, 1, 1, &layouts[0] }, - /* defaults (required) */ - { NULL, 0.5, 1, 1, &layouts[0] }, -}; - -/* keyboard */ -static const struct xkb_rule_names xkb_rules = { - .rules = NULL, - .model = NULL, - .layout = "dvorak", - .variant = NULL, - .options = "ctrl:nocaps,altwin:swap_lalt_lwin,terminate:ctrl_alt_bksp", -}; - -#define MODKEY WLR_MODIFIER_ALT - -/* commands */ -static const char *termcmd[] = { "kitty", "-o", "linux_display_server=wayland", NULL }; - -static const Key keys[] = { - { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Return, spawn, {.v = termcmd } }, - { MODKEY, XKB_KEY_Escape, quit, {0} }, - { MODKEY, XKB_KEY_F1, focusnext, {0} }, - { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_L, setlayout, {.v = &layouts[0]} }, - { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_F, setlayout, {.v = &layouts[1]} }, -}; - -static const Button buttons[] = { - { MODKEY, BTN_LEFT, movemouse, {0} }, - { MODKEY, BTN_RIGHT, resizemouse, {0} }, -}; -- cgit v1.2.3