Compare commits
No commits in common. "b1a17f605d2e500cf73726967d0a8fba4bd370c9" and "48ba1729e674c26876a0d7a6a4c0655017c15ba4" have entirely different histories.
b1a17f605d
...
48ba1729e6
3 changed files with 7378 additions and 0 deletions
7319
hmModules/wezterm/Cargo.lock
generated
Normal file
7319
hmModules/wezterm/Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load diff
|
@ -1,6 +1,64 @@
|
||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
hostname,
|
||||||
|
...
|
||||||
|
}:
|
||||||
{
|
{
|
||||||
programs.wezterm = {
|
programs.wezterm = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
package =
|
||||||
|
if hostname == "pircard" then
|
||||||
|
(pkgs.wezterm.overrideAttrs (old: rec {
|
||||||
|
pname = "wezterm";
|
||||||
|
version = "20240406-cce0706";
|
||||||
|
src = pkgs.fetchFromGitHub {
|
||||||
|
owner = "wez";
|
||||||
|
repo = "${pname}";
|
||||||
|
rev = "cce0706b1f2a9e2d1f02c57f2d1cd367c91df1ae";
|
||||||
|
fetchSubmodules = true;
|
||||||
|
hash = "sha256-BBPxidOpFrw/tIRTqMSREyJF3QEWOwlIoVRT3FD62sQ=";
|
||||||
|
};
|
||||||
|
cargoDeps = pkgs.rustPlatform.importCargoLock {
|
||||||
|
lockFile = "${src}/Cargo.lock";
|
||||||
|
outputHashes = {
|
||||||
|
"xcb-imdkit-0.3.0" = "sha256-fTpJ6uNhjmCWv7dZqVgYuS2Uic36XNYTbqlaly5QBjI=";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
patches = (old.patches or [ ]) ++ [
|
||||||
|
(pkgs.fetchpatch {
|
||||||
|
# fix(wayland): ensure repaint event is sent in show
|
||||||
|
url = "https://patch-diff.githubusercontent.com/raw/wez/wezterm/pull/5264.patch";
|
||||||
|
hash = "sha256-c+frVaBEL0h3PJvNu3AW2iap+uUXBY8olbm7Wsxuh4Q=";
|
||||||
|
})
|
||||||
|
(pkgs.writeText "wezterm-remove_capabilities.patch" ''
|
||||||
|
diff --git a/window/src/os/wayland/seat.rs b/window/src/os/wayland/seat.rs
|
||||||
|
index 3798f4259..e91591130 100644
|
||||||
|
--- a/window/src/os/wayland/seat.rs
|
||||||
|
+++ b/window/src/os/wayland/seat.rs
|
||||||
|
@@ -65,9 +65,15 @@ impl SeatHandler for WaylandState {
|
||||||
|
_conn: &Connection,
|
||||||
|
_qh: &QueueHandle<Self>,
|
||||||
|
_seat: WlSeat,
|
||||||
|
- _capability: smithay_client_toolkit::seat::Capability,
|
||||||
|
+ capability: smithay_client_toolkit::seat::Capability,
|
||||||
|
) {
|
||||||
|
- todo!()
|
||||||
|
+ if capability == Capability::Keyboard && self.keyboard.is_some() {
|
||||||
|
+ self.keyboard.take().unwrap().release();
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if capability == Capability::Pointer && self.pointer.is_some() {
|
||||||
|
+ self.pointer = None;
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
fn remove_seat(&mut self, _conn: &Connection, _qh: &QueueHandle<Self>, _seat: WlSeat) {
|
||||||
|
'')
|
||||||
|
];
|
||||||
|
}))
|
||||||
|
else
|
||||||
|
pkgs.wezterm;
|
||||||
|
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
return {
|
return {
|
||||||
-- enable_wayland = false; -- https://github.com/wez/wezterm/issues/4483
|
-- enable_wayland = false; -- https://github.com/wez/wezterm/issues/4483
|
||||||
|
|
|
@ -58,6 +58,7 @@
|
||||||
"element"
|
"element"
|
||||||
"zmkbatx"
|
"zmkbatx"
|
||||||
"tremotesf"
|
"tremotesf"
|
||||||
|
# "emacs"
|
||||||
"firefox"
|
"firefox"
|
||||||
"gpg"
|
"gpg"
|
||||||
"mpv"
|
"mpv"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue