diff --git a/env/wayland/default.nix b/env/wayland/default.nix index 7fbf43a..bfc218f 100644 --- a/env/wayland/default.nix +++ b/env/wayland/default.nix @@ -6,7 +6,7 @@ imports = [../common/fonts.nix]; environment.etc."greetd/environments".text = '' - sway + bspwm Hyprland ''; @@ -15,7 +15,7 @@ enable = true; settings = rec { initial_session = { - command = "sway"; + command = "Hyprland"; user = "zack"; }; default_session = initial_session; diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix index 1712975..0b797c1 100644 --- a/modules/home-manager/default.nix +++ b/modules/home-manager/default.nix @@ -14,7 +14,7 @@ in { ../rice/ags ../rice/hyprland - ../rice/sway + # ../rice/sway ../rice/gtk.nix ../rice/kitty.nix # ../rice/waybar @@ -88,6 +88,7 @@ in { pkgs.nix-output-monitor pkgs.nh + pkgs.dwl pkgs.killall (pkgs.writeShellScriptBin "rebuild" '' diff --git a/modules/rice/dwl/default.nix b/modules/rice/dwl/default.nix new file mode 100644 index 0000000..2c63c08 --- /dev/null +++ b/modules/rice/dwl/default.nix @@ -0,0 +1,2 @@ +{ +} diff --git a/modules/rice/dwl/dwl-config.h b/modules/rice/dwl/dwl-config.h new file mode 100644 index 0000000..45ed4db --- /dev/null +++ b/modules/rice/dwl/dwl-config.h @@ -0,0 +1,204 @@ +/* appearance */ +static const int sloppyfocus = 1; /* focus follows mouse */ +static const int bypass_surface_visibility = 0; /* 1 means idle inhibitors will disable idle tracking even if it's surface isn't visible */ +static const unsigned int borderpx = 0; /* border pixel of windows */ +static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */ +static const float rootcolor[] = {0.3, 0.3, 0.3, 1.0}; +static const float bordercolor[] = {0.5, 0.5, 0.5, 1.0}; +static const float focuscolor[] = {1.0, 0.0, 0.0, 1.0}; +static const int smartborders = 1; +/* To conform the xdg-protocol, set the alpha to zero to restore the old behavior */ +static const float fullscreen_bg[] = {0.1, 0.1, 0.1, 1.0}; + +static const unsigned int gappih = 10; /* horiz inner gap between windows */ +static const unsigned int gappiv = 10; /* vert inner gap between windows */ +static const unsigned int gappoh = 10; /* horiz outer gap between windows and screen edge */ +static const unsigned int gappov = 10; /* vert outer gap between windows and screen edge */ +static const unsigned int monoclegaps = 0; /* vert outer gap between windows and screen edge */ +static const int smartgaps = 1; /* 1 means no outer gap when there is only one window */ + +/* pointer constraints */ +static const int allow_constrain = 1; + +/* cursor warping */ +static const bool cursor_warp = false; + +/* tagging - tagcount must be no greater than 31 */ +static const int tagcount = 9; + +static const Rule rules[] = { + /* app_id title tags mask isfloating monitor */ + /* examples: + */ + { "Gimp", NULL, 0, 1, -1 }, + { NULL, "Ferdium", 1, 0, 2 }, + { "firefox", NULL, 1, 0, 1 }, +}; + +/* layout(s) */ +static const Layout layouts[] = { + /* symbol arrange function */ + { "[]=", tile }, + { "><>", NULL }, /* no layout function means floating behavior */ + { "[M]", monocle }, +}; + +/* monitors */ +static const MonitorRule monrules[] = { + /* name mfact nmaster scale layout rotate/reflect */ + /* example of a HiDPI laptop monitor: + { "eDP-1", 0.5, 1, 2, &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL }, + */ + /* defaults */ + {"DP-1", 0.5, 1, 1, &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL, 0, 0, 3840, 2160, 60, 0, 0}, + {"DP-2", 0.5, 1, 1, &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL, 3840, 0, 3840, 2160, 60, 0, 0}, + {"HDMI-A-1", 0.5, 1, 1, &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL, 3840 * 2, 0, 3840, 2160, 60, 0, 0}, +}; + +/* keyboard */ +static const struct xkb_rule_names xkb_rules = { + /* can specify fields: rules, model, layout, variant, options */ + /* example: + .options = "ctrl:nocaps", + */ + .options = NULL, +}; + +static const int repeat_rate = 25; +static const int repeat_delay = 600; +static const char *kblayouts[] = {"us", "cz"}; + +/* Trackpad */ +static const int tap_to_click = 1; +static const int tap_and_drag = 1; +static const int drag_lock = 1; +static const int natural_scrolling = 0; +static const int disable_while_typing = 1; +static const int left_handed = 0; +static const int middle_button_emulation = 0; +/* You can choose between: +LIBINPUT_CONFIG_SCROLL_NO_SCROLL +LIBINPUT_CONFIG_SCROLL_2FG +LIBINPUT_CONFIG_SCROLL_EDGE +LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN +*/ +static const enum libinput_config_scroll_method scroll_method = LIBINPUT_CONFIG_SCROLL_2FG; + +/* You can choose between: +LIBINPUT_CONFIG_CLICK_METHOD_NONE +LIBINPUT_CONFIG_CLICK_METHOD_BUTTON_AREAS +LIBINPUT_CONFIG_CLICK_METHOD_CLICKFINGER +*/ +static const enum libinput_config_click_method click_method = LIBINPUT_CONFIG_CLICK_METHOD_BUTTON_AREAS; + +/* You can choose between: +LIBINPUT_CONFIG_SEND_EVENTS_ENABLED +LIBINPUT_CONFIG_SEND_EVENTS_DISABLED +LIBINPUT_CONFIG_SEND_EVENTS_DISABLED_ON_EXTERNAL_MOUSE +*/ +static const uint32_t send_events_mode = LIBINPUT_CONFIG_SEND_EVENTS_ENABLED; + +/* You can choose between: +LIBINPUT_CONFIG_ACCEL_PROFILE_FLAT +LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE +*/ +static const enum libinput_config_accel_profile accel_profile = LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE; +static const double accel_speed = 0.0; + +static const enum libinput_config_tap_button_map button_map = LIBINPUT_CONFIG_TAP_MAP_LRM; + +/* Autostart */ +static const char *const autostart[] = { + "sh", "-c", "swww init", NULL, + "sh", "-c", "sleep 5s && systemctl --user start graphical-session.target", NULL, + "sh", "-c", "ferdium --ozone-platform=wayland", NULL, + "sh", "-c", "firefox", NULL, + "sh", "-c", "firefox", NULL, + //"sh", "-c", "fuzzel_timer", "daemon", NULL, + NULL /* terminate */ +}; + + +/* If you want to use the windows key change this to WLR_MODIFIER_LOGO */ +#define MODKEY WLR_MODIFIER_LOGO +#define TAGKEYS(KEY,SKEY,TAG) \ + { MODKEY, KEY, view, {.ui = 1 << TAG} }, \ + { MODKEY|WLR_MODIFIER_CTRL, KEY, toggleview, {.ui = 1 << TAG} }, \ + { MODKEY|WLR_MODIFIER_SHIFT, SKEY, tag, {.ui = 1 << TAG} }, \ + { MODKEY|WLR_MODIFIER_CTRL|WLR_MODIFIER_SHIFT,SKEY,toggletag, {.ui = 1 << TAG} } + +/* helper for spawning shell commands in the pre dwm-5.0 fashion */ +#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } } + +/* commands */ +static const char *termcmd[] = { "kitty", NULL }; +static const char *menucmd[] = { "anyrun", NULL }; +static const char *volume_up_cmd[] = { "wpctl", "set-volume", "@DEFAULT_AUDIO_SINK@", "5%+", NULL }; +static const char *volume_down_cmd[] = { "wpctl", "set-volume", "@DEFAULT_AUDIO_SINK@", "5%-", NULL }; +static const char *timer_cmd[] = { "timer_fuzzel", NULL }; + +static const char *mpc_play_cmd[] = { "mpc", "play", NULL }; +static const char *mpc_pause_cmd[] = { "mpc", "pause", NULL }; +static const char *mpc_next_cmd[] = { "mpc", "next", NULL }; +static const char *mpc_prev_cmd[] = { "mpc", "prev", NULL }; + +static const Key keys[] = { + /* Note that Shift changes certain key codes: c -> C, 2 -> at, etc. */ + /* modifier key function argument */ + { MODKEY, XKB_KEY_Return, spawn, {.v = termcmd} }, + { MODKEY, XKB_KEY_r, spawn, {.v = menucmd} }, + { MODKEY, XKB_KEY_q, killclient, {0} }, + { MODKEY, XKB_KEY_f, togglefullscreen, {0} }, + + { MODKEY, XKB_KEY_p, togglekblayout, {0} }, + + { MODKEY, XKB_KEY_h, focusdirection, {.i = WLR_DIRECTION_LEFT} }, + { MODKEY, XKB_KEY_k, focusdirection, {.i = WLR_DIRECTION_UP} }, + { MODKEY, XKB_KEY_j, focusdirection, {.i = WLR_DIRECTION_DOWN} }, + { MODKEY, XKB_KEY_l, focusdirection, {.i = WLR_DIRECTION_RIGHT} }, + { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_H, tagmon, {.i = WLR_DIRECTION_LEFT} }, + { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_L, tagmon, {.i = WLR_DIRECTION_RIGHT} }, + { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_K, focusstack, {.i = +1} }, + { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_J, focusstack, {.i = -1} }, + { 0, XKB_KEY_XF86AudioRaiseVolume, spawn, {.v = volume_up_cmd}}, + { 0, XKB_KEY_XF86AudioLowerVolume, spawn, {.v = volume_down_cmd}}, + { MODKEY, XKB_KEY_t, spawn, {.v = timer_cmd}}, + + { 0, XKB_KEY_XF86AudioPlay, spawn, {.v = mpc_play_cmd}}, + { 0, XKB_KEY_XF86AudioStop, spawn, {.v = mpc_pause_cmd}}, + { 0, XKB_KEY_XF86AudioNext, spawn, {.v = mpc_next_cmd}}, + { 0, XKB_KEY_XF86AudioPrev, spawn, {.v = mpc_prev_cmd}}, + + + { MODKEY, XKB_KEY_d, incnmaster, {.i = -1} }, + { MODKEY, XKB_KEY_i, setlayout, {.v = &layouts[0]} }, + { MODKEY, XKB_KEY_o, setlayout, {.v = &layouts[1]} }, + { MODKEY, XKB_KEY_space, setlayout, {0} }, + { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space, togglefloating, {0} }, + { MODKEY, XKB_KEY_0, view, {.ui = ~0} }, + { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_parenright, tag, {.ui = ~0} }, + { MODKEY, XKB_KEY_comma, focusmon, {.i = WLR_DIRECTION_LEFT} }, + { MODKEY, XKB_KEY_period, focusmon, {.i = WLR_DIRECTION_RIGHT} }, + TAGKEYS( XKB_KEY_1, XKB_KEY_exclam, 0), + TAGKEYS( XKB_KEY_2, XKB_KEY_at, 1), + TAGKEYS( XKB_KEY_3, XKB_KEY_numbersign, 2), + TAGKEYS( XKB_KEY_4, XKB_KEY_dollar, 3), + TAGKEYS( XKB_KEY_5, XKB_KEY_percent, 4), + TAGKEYS( XKB_KEY_6, XKB_KEY_asciicircum, 5), + TAGKEYS( XKB_KEY_7, XKB_KEY_ampersand, 6), + TAGKEYS( XKB_KEY_8, XKB_KEY_asterisk, 7), + TAGKEYS( XKB_KEY_9, XKB_KEY_parenleft, 8), + { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Q, quit, {0} }, + + /* Ctrl-Alt-Backspace and Ctrl-Alt-Fx used to be handled by X server */ + { WLR_MODIFIER_CTRL|WLR_MODIFIER_ALT,XKB_KEY_Terminate_Server, quit, {0} }, +#define CHVT(n) { WLR_MODIFIER_CTRL|WLR_MODIFIER_ALT,XKB_KEY_XF86Switch_VT_##n, chvt, {.ui = (n)} } + CHVT(1), CHVT(2), CHVT(3), CHVT(4), CHVT(5), CHVT(6), + CHVT(7), CHVT(8), CHVT(9), CHVT(10), CHVT(11), CHVT(12), +}; + +static const Button buttons[] = { + { MODKEY, BTN_LEFT, moveresize, {.ui = CurMove} }, + { MODKEY, BTN_MIDDLE, togglefloating, {0} }, + { MODKEY, BTN_RIGHT, moveresize, {.ui = CurResize} }, +};