sway: use latest git version

https://github.com/swaywm/sway/pull/7226 is merged
https://github.com/swaywm/sway/pull/6249 looks dead :(

also simplified ./overlays

nixos/profiles/common/core/default.nix

@@ -21,10 +21,9 @@
   ];
 
   nixpkgs.overlays = [
-    inputs.self.overlays.nautilus.typeahead
+    inputs.self.overlays.nautilus
-    inputs.self.overlays.prismlauncher.offline-mode
+    inputs.self.overlays.prismlauncher
-    inputs.self.overlays.sway.input-method-popup
+    inputs.self.overlays.sway
-    inputs.self.overlays.sway.tray-dbus-menu
   ];
 
   ### home-manager

overlays/default.nix

@@ -4,14 +4,7 @@ let
       patches = (old.patches or []) ++ patches;
     });
 in {
-  nautilus = {
+  nautilus = import ./nautilus.nix {inherit addPatches;};
-    typeahead = import ./nautilus/typeahead.nix {inherit addPatches;};
+  prismlauncher = import ./prismlauncher.nix {inherit addPatches;};
-  };
+  sway = import ./sway;
-  prismlauncher = {
-    offline-mode = import ./prismlauncher/offline-mode.nix {inherit addPatches;};
-  };
-  sway = {
-    input-method-popup = import ./sway/input-method-popup.nix {inherit addPatches;};
-    tray-dbus-menu = import ./sway/tray-dbus-menu.nix {inherit addPatches;};
-  };
 }

overlays/sway/_1.8.nix

@@ -1,5 +1,12 @@
 {addPatches, ...}: _final: prev: {
   sway-unwrapped = addPatches prev.sway-unwrapped [
+    # text_input: Implement input-method popups
+    # https://github.com/swaywm/sway/pull/7226
+    (prev.fetchpatch {
+      url = "https://github.com/swaywm/sway/commit/d1c6e44886d1047b3aa6ff6aaac383eadd72f36a.patch";
+      hash = "sha256-LsCoK60FKp3d8qopGtrbCFXofxHT+kOv1e1PiLSyvsA=";
+    })
+
     # Tray D-Bus Menu
     # https://github.com/swaywm/sway/pull/6249
     (prev.runCommand "2f304ef0532a45d00b2ec2c7fc63adef0aec7607.patch" {} ''

overlays/sway/_1.9.nix

@@ -0,0 +1,32 @@
+_final: prev: {
+  sway-unwrapped = prev.sway-unwrapped.overrideAttrs rec {
+    version = "1.9";
+
+    src = prev.fetchFromGitHub {
+      owner = "swaywm";
+      repo = "sway";
+      rev = version;
+      hash = "sha256-/6+iDkQfdLcL/pTJaqNc6QdP4SRVOYLjfOItEu/bZtg";
+    };
+
+    buildInputs = with prev; [
+      cairo
+      gdk-pixbuf
+      json_c
+      libGL
+      libdrm
+      libevdev
+      libinput
+      librsvg
+      libxkbcommon
+      pango
+      pcre2
+      wayland
+      wayland-protocols
+      wlroots_0_17
+      xorg.xcbutilwm
+    ];
+
+    patches = [];
+  };
+}

overlays/sway/default.nix

@@ -0,0 +1,49 @@
+_final: prev: {
+  sway-unwrapped = prev.sway-unwrapped.overrideAttrs (old: {
+    version = "1.10-unstable-2024-02-23";
+    src = prev.fetchFromGitHub {
+      owner = "swaywm";
+      repo = "sway";
+      rev = "fc640d5f6c82883c35e90a64f0098486e6091293";
+      hash = "sha256-n0U1RoSv3fuOkey2gXPX+O4mRA2PCASpkRrIE5069BI";
+    };
+
+    buildInputs = with prev; [
+      (wlroots.overrideAttrs {
+        version = "1.18.0-unstable-2024-02-23";
+        src = prev.fetchFromGitLab {
+          domain = "gitlab.freedesktop.org";
+          owner = "wlroots";
+          repo = "wlroots";
+          rev = "54e1fefd2e29cb00dff7c02801913d793ceab7d6";
+          hash = "sha256-VX2AAzcYl255yF43+uetcOS+uYzAVfk7WccWONpjmYU=";
+        };
+      })
+
+      cairo
+      gdk-pixbuf
+      json_c
+      libGL
+      libdrm
+      libevdev
+      libinput
+      librsvg
+      libxkbcommon
+      pango
+      pcre2
+      wayland
+      wayland-protocols
+      xorg.xcbutilwm
+    ];
+
+    patches = let
+      removePatches = ["LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM.patch"];
+    in
+      builtins.filter (patch: !builtins.elem (patch.name or null) removePatches) (old.patches or [])
+      ++ [
+        # rebased version of https://github.com/swaywm/sway/pull/6249
+        # using sed at this point is just stupid (see ./_1.8.nix)
+        ./0001-Tray-Implement-dbusmenu.patch
+      ];
+  });
+}

overlays/sway/input-method-popup.nix

@@ -1,10 +0,0 @@
-{addPatches, ...}: _final: prev: {
-  sway-unwrapped = addPatches prev.sway-unwrapped [
-    # text_input: Implement input-method popups
-    # https://github.com/swaywm/sway/pull/7226
-    (prev.fetchpatch {
-      url = "https://github.com/swaywm/sway/commit/d1c6e44886d1047b3aa6ff6aaac383eadd72f36a.patch";
-      hash = "sha256-LsCoK60FKp3d8qopGtrbCFXofxHT+kOv1e1PiLSyvsA=";
-    })
-  ];
-}