From 5e60b24dc1de1abbd062215a662bae6c47112f1b Mon Sep 17 00:00:00 2001 From: FabricSoul Date: Tue, 29 Jul 2025 19:04:29 -0400 Subject: [PATCH 1/7] migrate from shell to flake --- flake.nix | 43 +++++++++++++++++++++++++++++++++++++++++++ shell.nix | 18 ------------------ 2 files changed, 43 insertions(+), 18 deletions(-) create mode 100644 flake.nix delete mode 100644 shell.nix diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..df28ad0 --- /dev/null +++ b/flake.nix @@ -0,0 +1,43 @@ +{ + description = "flake for my dwl"; + + inputs = { + nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; + }; + + outputs = { + self, + nixpkgs, + }: let + system = "x86_64-linux"; + pkgs = nixpkgs.legacyPackages.${system}; + in { + packages.${system}.default = pkgs.stdenv.mkDerivation rec { + pname = "dwl-fabric"; + version = "0.1"; + + # Set the source to your local dwl directory + src = ./.; + + # Add the necessary build dependencies for dwl + buildInputs = with pkgs; [ + xwayland + libxkbcommon + wayland + wayland-protocols + wlroots + xorg.libxcb + pkg-config + ]; + + # The build and installation process + buildPhase = '' + make + ''; + + installPhase = '' + make install PREFIX=$out + ''; + }; + }; +} diff --git a/shell.nix b/shell.nix deleted file mode 100644 index 01ef840..0000000 --- a/shell.nix +++ /dev/null @@ -1,18 +0,0 @@ -{pkgs ? import {}}: -pkgs.mkShell { - packages = with pkgs; [ - gnumake - pkg-config - wayland - xwayland - xorg.libxcb - xorg.xcbutilwm - wayland-protocols - wayland-scanner - libinput - wlroots - libxkbcommon - pixman - systemd - ]; -} From 4f5129f30773ce44afd4749780c77bcb818df01a Mon Sep 17 00:00:00 2001 From: FabricSoul Date: Tue, 29 Jul 2025 19:19:19 -0400 Subject: [PATCH 2/7] fix build dependencies --- flake.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index df28ad0..ba35385 100644 --- a/flake.nix +++ b/flake.nix @@ -19,15 +19,17 @@ # Set the source to your local dwl directory src = ./.; + nativeBuildInputs = with pkgs; [ + pkg-config + wayland # Provides the 'wayland-scanner' tool + ]; # Add the necessary build dependencies for dwl buildInputs = with pkgs; [ xwayland libxkbcommon - wayland wayland-protocols wlroots xorg.libxcb - pkg-config ]; # The build and installation process From 0b663f49e676646d3a777a5b5a6684a71861ac40 Mon Sep 17 00:00:00 2001 From: FabricSoul Date: Tue, 29 Jul 2025 19:24:05 -0400 Subject: [PATCH 3/7] add wayland-scanner dependency --- flake.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/flake.nix b/flake.nix index ba35385..31d029a 100644 --- a/flake.nix +++ b/flake.nix @@ -22,6 +22,7 @@ nativeBuildInputs = with pkgs; [ pkg-config wayland # Provides the 'wayland-scanner' tool + wayland-scanner ]; # Add the necessary build dependencies for dwl buildInputs = with pkgs; [ From fd3571b755392c5d97ea982bced7f5e9edaee936 Mon Sep 17 00:00:00 2001 From: FabricSoul Date: Tue, 29 Jul 2025 19:30:25 -0400 Subject: [PATCH 4/7] add dependencies --- flake.lock | 27 +++++++++++++++++++++++++++ flake.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 flake.lock diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..57e82e5 --- /dev/null +++ b/flake.lock @@ -0,0 +1,27 @@ +{ + "nodes": { + "nixpkgs": { + "locked": { + "lastModified": 1753694789, + "narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "dc9637876d0dcc8c9e5e22986b857632effeb727", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix index 31d029a..5060596 100644 --- a/flake.nix +++ b/flake.nix @@ -23,6 +23,8 @@ pkg-config wayland # Provides the 'wayland-scanner' tool wayland-scanner + libinput + pixman ]; # Add the necessary build dependencies for dwl buildInputs = with pkgs; [ From 240484a0ddd3982cab1db3e6878f7f09b038149f Mon Sep 17 00:00:00 2001 From: FabricSoul Date: Tue, 29 Jul 2025 19:31:40 -0400 Subject: [PATCH 5/7] add ignore result/ --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 0dde90e..9a4cd14 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ dwl *-protocol.h .ccls-cache config.h +result/ From c0030572543d4be42837b93f75158dc83a3b0324 Mon Sep 17 00:00:00 2001 From: FabricSoul Date: Tue, 29 Jul 2025 19:58:39 -0400 Subject: [PATCH 6/7] add config.h --- .gitignore | 1 - config.h | 178 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 178 insertions(+), 1 deletion(-) create mode 100644 config.h diff --git a/.gitignore b/.gitignore index 9a4cd14..2d75d82 100644 --- a/.gitignore +++ b/.gitignore @@ -3,5 +3,4 @@ dwl *-protocol.c *-protocol.h .ccls-cache -config.h result/ diff --git a/config.h b/config.h new file mode 100644 index 0000000..ea31a17 --- /dev/null +++ b/config.h @@ -0,0 +1,178 @@ +/* Taken from https://github.com/djpohly/dwl/issues/466 */ +#define COLOR(hex) { ((hex >> 24) & 0xFF) / 255.0f, \ + ((hex >> 16) & 0xFF) / 255.0f, \ + ((hex >> 8) & 0xFF) / 255.0f, \ + (hex & 0xFF) / 255.0f } +/* 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 = 1; /* border pixel of windows */ +static const float rootcolor[] = COLOR(0x222222ff); +static const float bordercolor[] = COLOR(0x444444ff); +static const float focuscolor[] = COLOR(0x005577ff); +static const float urgentcolor[] = COLOR(0xff0000ff); +/* This conforms to the xdg-protocol. Set the alpha to zero to restore the old behavior */ +static const float fullscreen_bg[] = {0.0f, 0.0f, 0.0f, 1.0f}; /* You can also use glsl colors */ + +/* tagging - TAGCOUNT must be no greater than 31 */ +#define TAGCOUNT (9) + +/* logging */ +static int log_level = WLR_ERROR; + +/* NOTE: ALWAYS keep a rule declared even if you don't use rules (e.g leave at least one example) */ +static const Rule rules[] = { + /* app_id title tags mask isfloating monitor */ + /* examples: */ + { "Gimp_EXAMPLE", NULL, 0, 1, -1 }, /* Start on currently visible tags floating, not tiled */ + { "firefox_EXAMPLE", NULL, 1 << 8, 0, -1 }, /* Start on ONLY tag "9" */ +}; + +/* layout(s) */ +static const Layout layouts[] = { + /* symbol arrange function */ + { "[]=", tile }, + { "><>", NULL }, /* no layout function means floating behavior */ + { "[M]", monocle }, +}; + +/* monitors */ +/* (x=-1, y=-1) is reserved as an "autoconfigure" monitor position indicator + * WARNING: negative values other than (-1, -1) cause problems with Xwayland clients + * https://gitlab.freedesktop.org/xorg/xserver/-/issues/899 +*/ +/* NOTE: ALWAYS add a fallback rule, even if you are completely sure it won't be used */ +static const MonitorRule monrules[] = { + /* name mfact nmaster scale layout rotate/reflect x y */ + /* example of a HiDPI laptop monitor: + { "eDP-1", 0.5f, 1, 2, &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL, -1, -1 }, + */ + /* defaults */ + { NULL, 0.55f, 1, 1, &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL, -1, -1 }, +}; + +/* 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; + +/* 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; + +/* You can choose between: +LIBINPUT_CONFIG_TAP_MAP_LRM -- 1/2/3 finger tap maps to left/right/middle +LIBINPUT_CONFIG_TAP_MAP_LMR -- 1/2/3 finger tap maps to left/middle/right +*/ +static const enum libinput_config_tap_button_map button_map = LIBINPUT_CONFIG_TAP_MAP_LRM; + +/* If you want to use the windows key for MODKEY, use WLR_MODIFIER_LOGO */ +#define MODKEY WLR_MODIFIER_LOGO + +#define TAGKEYS(KEY,SKEY,TAG) \ + { MODKEY, KEY, view, {.ui = 1 << TAG} }, \ + { MODKEY, KEY, toggleview, {.ui = 1 << TAG} }, \ + { MODKEY, SKEY, tag, {.ui = 1 << TAG} }, \ + { MODKEY,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[] = { "wofi", "--show", "drun", NULL }; +static const char *browsercmd[] = { "firefox", NULL }; + +static const Key keys[] = { + /* Note that Shift changes certain key codes: c -> C, 2 -> at, etc. */ + /* modifier key function argument */ + { MODKEY, XKB_KEY_Space, spawn, {.v = menucmd} }, + { MODKEY, XKB_KEY_Return, spawn, {.v = termcmd} }, + { MODKEY, XKB_KEY_b, spawn, {.v = browsercmd} }, + { MODKEY, XKB_KEY_j, focusstack, {.i = +1} }, + { MODKEY, XKB_KEY_k, focusstack, {.i = -1} }, + { MODKEY, XKB_KEY_i, incnmaster, {.i = +1} }, + { MODKEY, XKB_KEY_d, incnmaster, {.i = -1} }, + { MODKEY, XKB_KEY_h, setmfact, {.f = -0.05f} }, + { MODKEY, XKB_KEY_l, setmfact, {.f = +0.05f} }, + { MODKEY, XKB_KEY_Return, zoom, {0} }, + { MODKEY, XKB_KEY_Tab, view, {0} }, + { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_C, killclient, {0} }, + { MODKEY, XKB_KEY_t, setlayout, {.v = &layouts[0]} }, + { MODKEY, XKB_KEY_f, setlayout, {.v = &layouts[1]} }, + { MODKEY, XKB_KEY_m, setlayout, {.v = &layouts[2]} }, + { MODKEY, XKB_KEY_space, setlayout, {0} }, + { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space, togglefloating, {0} }, + { MODKEY, XKB_KEY_e, togglefullscreen, {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} }, + { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_less, tagmon, {.i = WLR_DIRECTION_LEFT} }, + { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_greater, tagmon, {.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} }, + /* Ctrl-Alt-Fx is used to switch to another VT, if you don't know what a VT is + * do not remove them. + */ +#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} }, +}; From c5562e62c5ad3f1d8a84db21cf20d88e44bc0788 Mon Sep 17 00:00:00 2001 From: FabricSoul Date: Tue, 29 Jul 2025 20:11:57 -0400 Subject: [PATCH 7/7] add config.h --- config.h | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/config.h b/config.h index ea31a17..10ad053 100644 --- a/config.h +++ b/config.h @@ -24,8 +24,12 @@ static int log_level = WLR_ERROR; static const Rule rules[] = { /* app_id title tags mask isfloating monitor */ /* examples: */ - { "Gimp_EXAMPLE", NULL, 0, 1, -1 }, /* Start on currently visible tags floating, not tiled */ - { "firefox_EXAMPLE", NULL, 1 << 8, 0, -1 }, /* Start on ONLY tag "9" */ + { "EVE", NULL, 1 << 0, 0, -1 }, // Workspace 1 for EVE + { "QQ", NULL, 1 << 5, 0, -1 }, // Workspace 6 for QQ + { "discord", NULL, 1 << 5, 0, -1 }, // Workspace 6 for discord + { "kitty", NULL, 1 << 3, 0, -1 }, // Workspace 4 for kitty + { "firefox", NULL, 1 << 4, 0, -1 }, // Workspace 5 for firefox + { NULL, "图片查看器", 0, 1, -1 }, // Float the picture viewer by title }; /* layout(s) */ @@ -107,28 +111,28 @@ LIBINPUT_CONFIG_TAP_MAP_LMR -- 1/2/3 finger tap maps to left/middle/right static const enum libinput_config_tap_button_map button_map = LIBINPUT_CONFIG_TAP_MAP_LRM; /* If you want to use the windows key for MODKEY, use WLR_MODIFIER_LOGO */ -#define MODKEY WLR_MODIFIER_LOGO +#define MODKEY WLR_MODIFIER_ALT #define TAGKEYS(KEY,SKEY,TAG) \ { MODKEY, KEY, view, {.ui = 1 << TAG} }, \ - { MODKEY, KEY, toggleview, {.ui = 1 << TAG} }, \ - { MODKEY, SKEY, tag, {.ui = 1 << TAG} }, \ - { MODKEY,SKEY,toggletag, {.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[] = { "wofi", "--show", "drun", NULL }; +static const char *termcmd[] = { "kitty", NULL }; +static const char *menucmd[] = { "wofi", "--show", "drun", NULL }; static const char *browsercmd[] = { "firefox", NULL }; static const Key keys[] = { /* Note that Shift changes certain key codes: c -> C, 2 -> at, etc. */ /* modifier key function argument */ - { MODKEY, XKB_KEY_Space, spawn, {.v = menucmd} }, - { MODKEY, XKB_KEY_Return, spawn, {.v = termcmd} }, - { MODKEY, XKB_KEY_b, spawn, {.v = browsercmd} }, + { MODKEY, XKB_KEY_space, spawn, {.v = menucmd} }, + { MODKEY, XKB_KEY_t, spawn, {.v = termcmd} }, + { MODKEY, XKB_KEY_b, spawn, {.v = browsercmd} }, { MODKEY, XKB_KEY_j, focusstack, {.i = +1} }, { MODKEY, XKB_KEY_k, focusstack, {.i = -1} }, { MODKEY, XKB_KEY_i, incnmaster, {.i = +1} }, @@ -141,8 +145,7 @@ static const Key keys[] = { { MODKEY, XKB_KEY_t, setlayout, {.v = &layouts[0]} }, { MODKEY, XKB_KEY_f, setlayout, {.v = &layouts[1]} }, { MODKEY, XKB_KEY_m, setlayout, {.v = &layouts[2]} }, - { MODKEY, XKB_KEY_space, setlayout, {0} }, - { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space, togglefloating, {0} }, + { MODKEY, XKB_KEY_v, togglefloating, {0} }, { MODKEY, XKB_KEY_e, togglefullscreen, {0} }, { MODKEY, XKB_KEY_0, view, {.ui = ~0} }, { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_parenright, tag, {.ui = ~0} },