Update nix
diff --git a/flake.lock b/flake.lock
index 448954e..610eb02 100644
--- a/flake.lock
+++ b/flake.lock
@@ -53,11 +53,11 @@
"fzf-tab": {
"flake": false,
"locked": {
- "lastModified": 1660535318,
- "narHash": "sha256-xP0IoCeyZyYU+iKUkIoIAMn75r6R3TJYhAKoQgC1dWg=",
+ "lastModified": 1665819678,
+ "narHash": "sha256-VK+qJsyo0rQ2FV6lzUPhGTYNznHCuu4eOCcREqaD8jQ=",
"owner": "Aloxaf",
"repo": "fzf-tab",
- "rev": "938eef72e93ddb0609205a663bf0783f4e1b5fae",
+ "rev": "3aa44739958691c4de06496e5bb18e0a629edd6d",
"type": "github"
},
"original": {
@@ -89,11 +89,11 @@
]
},
"locked": {
- "lastModified": 1656169755,
- "narHash": "sha256-Nlnm4jeQWEGjYrE6hxi/7HYHjBSZ/E0RtjCYifnNsWk=",
+ "lastModified": 1665475263,
+ "narHash": "sha256-T4at7d+KsQNWh5rfjvOtQCaIMWjSDlSgQZKvxb+LcEY=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "4a3d01fb53f52ac83194081272795aa4612c2381",
+ "rev": "17208be516fc36e2ab0ceb064d931e90eb88b2a3",
"type": "github"
},
"original": {
@@ -111,11 +111,11 @@
"utils": "utils"
},
"locked": {
- "lastModified": 1664286632,
- "narHash": "sha256-fKENvLanhmBENlIbmDAVB8SKSbwdLLBYKu6B7oJ0rLc=",
+ "lastModified": 1665935997,
+ "narHash": "sha256-HXiRzU6EuCSiAJRxovBYPgu0OozrVZBbZL5yxvyYOac=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "6dc8a43f397c92afbc3f771385ac803d96d5eeb5",
+ "rev": "86bc0e349fcc7ab7a9ac7e6892c6bd6ac12fd1ee",
"type": "github"
},
"original": {
@@ -147,11 +147,11 @@
},
"locked": {
"dir": "nix",
- "lastModified": 1663565216,
- "narHash": "sha256-S6m7utTGclQL93YtX2KWK8qaaaBDNs6UYxrBsz1w9s0=",
+ "lastModified": 1664950533,
+ "narHash": "sha256-TooqJDgGNyyhpIGB8U28Y3poYUFW4jeH9h59D7cKSls=",
"owner": "kmonad",
"repo": "kmonad",
- "rev": "cbdace2bb7b27e47c2397e662265a28a1030b7c7",
+ "rev": "af8c2253754882b5b50c824ce9906d35f9b95657",
"type": "github"
},
"original": {
@@ -163,11 +163,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1664370076,
- "narHash": "sha256-NDnIo0nxJozLwEw0VPM+RApMA90uTfbvaNNtC5eB7Os=",
+ "lastModified": 1665922128,
+ "narHash": "sha256-D2+U5xF4AiSMPTBZ6V+wudrxmxM+Fnw8pW7PUWC1yPo=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "854fdc68881791812eddd33b2fed94b954979a8e",
+ "rev": "d7c3a973c7f20cfeca999d03e3da7344e0bb55f1",
"type": "github"
},
"original": {
@@ -179,11 +179,11 @@
},
"nixpkgs-22_05": {
"locked": {
- "lastModified": 1664201777,
- "narHash": "sha256-cUW9DqELUNi1jNMwVSbfq4yl5YGyOfeu+UHUUImbby0=",
+ "lastModified": 1665870850,
+ "narHash": "sha256-EkC/Kkc9cr2orI868OHnh6F8/aqS4TZy38ie+KnhfS8=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "00f877f4927b6f7d7b75731b5a1e2ae7324eaf14",
+ "rev": "945a85cb7ee31f5f8c49432d77b610b777662d4f",
"type": "github"
},
"original": {
@@ -195,11 +195,11 @@
},
"nixpkgs-minion": {
"locked": {
- "lastModified": 1663751825,
- "narHash": "sha256-zZGO1KoERNuPThU9UpbJdUFXcQFWAPjclUucGzwifO8=",
+ "lastModified": 1666001526,
+ "narHash": "sha256-SC8Mzk0IpXDgpXfGMBvlZHTuCfrurn/Q2WhZfNOP7/I=",
"owner": "Minion3665",
"repo": "nixpkgs",
- "rev": "11137dec06dcd0b35a3c5377a49e3a67c5d9c8d4",
+ "rev": "ca2a2a832b400265c402857bda8189b4a8924aab",
"type": "github"
},
"original": {
@@ -282,11 +282,11 @@
"nixpkgs-22_05": "nixpkgs-22_05"
},
"locked": {
- "lastModified": 1664204020,
- "narHash": "sha256-LAey3hr8b9EAt3n304Wt9Vm4uQFd8pSRtLX8leuYFDs=",
+ "lastModified": 1665897743,
+ "narHash": "sha256-B0+jYpGOd/ngA6ECAV91+Y61KfCE/Iy8GDWV44PHNzA=",
"owner": "Mic92",
"repo": "sops-nix",
- "rev": "912f9ff41fd9353dec1f783170793699789fe9aa",
+ "rev": "2d662d681a82cd586c8c12e34d36c2c2b73338e6",
"type": "github"
},
"original": {
diff --git a/patches/kitty/646bdb-fix-keyboard-repeat-after-switching-seats.patch b/patches/kitty/646bdb-fix-keyboard-repeat-after-switching-seats.patch
deleted file mode 100644
index 85fde89..0000000
--- a/patches/kitty/646bdb-fix-keyboard-repeat-after-switching-seats.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 646bdbd0022d01915ffe2fcbca73b026b835df87 Mon Sep 17 00:00:00 2001
-From: Kovid Goyal <kovid@kovidgoyal.net>
-Date: Fri, 10 Jun 2022 21:38:30 +0530
-Subject: [PATCH] Wayland: Fix a regression in the previous release that caused
- mouse cursor animation and keyboard repeat to stop working when switching
- seats
-
-Fixes #5188
----
- docs/changelog.rst | 3 +++
- glfw/wl_init.c | 10 ++--------
- 2 files changed, 5 insertions(+), 8 deletions(-)
-
-diff --git a/docs/changelog.rst b/docs/changelog.rst
-index afdf4ecfa4..9d253f5227 100644
---- a/docs/changelog.rst
-+++ b/docs/changelog.rst
-@@ -40,6 +40,9 @@ Detailed list of changes
-
- - Reduce startup latency by ~50 milliseconds when running kittens via key-bindings or remote control (:iss:`5159`)
-
-+- Wayland: Fix a regression in the previous release that caused mouse cursor
-+ animation and keyboard repeat to stop working when switching seats (:iss:`5188`)
-+
-
- 0.25.2 [2022-06-07]
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-diff --git a/glfw/wl_init.c b/glfw/wl_init.c
-index eeddcf9f0b..383ed86e10 100644
---- a/glfw/wl_init.c
-+++ b/glfw/wl_init.c
-@@ -573,10 +573,7 @@ static void seatHandleCapabilities(void* data UNUSED,
- {
- wl_pointer_destroy(_glfw.wl.pointer);
- _glfw.wl.pointer = NULL;
-- if (_glfw.wl.cursorAnimationTimer) {
-- removeTimer(&_glfw.wl.eventLoopData, _glfw.wl.cursorAnimationTimer);
-- _glfw.wl.cursorAnimationTimer = 0;
-- }
-+ if (_glfw.wl.cursorAnimationTimer) toggleTimer(&_glfw.wl.eventLoopData, _glfw.wl.cursorAnimationTimer, 0);
- }
-
- if ((caps & WL_SEAT_CAPABILITY_KEYBOARD) && !_glfw.wl.keyboard)
-@@ -589,10 +586,7 @@ static void seatHandleCapabilities(void* data UNUSED,
- wl_keyboard_destroy(_glfw.wl.keyboard);
- _glfw.wl.keyboard = NULL;
- _glfw.wl.keyboardFocusId = 0;
-- if (_glfw.wl.keyRepeatInfo.keyRepeatTimer) {
-- removeTimer(&_glfw.wl.eventLoopData, _glfw.wl.keyRepeatInfo.keyRepeatTimer);
-- _glfw.wl.keyRepeatInfo.keyRepeatTimer = 0;
-- }
-+ if (_glfw.wl.keyRepeatInfo.keyRepeatTimer) toggleTimer(&_glfw.wl.eventLoopData, _glfw.wl.keyRepeatInfo.keyRepeatTimer, 0);
- }
- }
-