From cc823e8aa57122467a23ecbc768079e50e44e396 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Sun, 23 Jun 2024 14:53:40 +0800 Subject: [PATCH] overlays: drop prismlauncher offline mode --- overlays/default.nix | 59 ++++++++++++++++++++++++++++++++++---- overlays/nautilus.nix | 21 -------------- overlays/prismlauncher.nix | 14 --------- overlays/sway.nix | 38 ------------------------ 4 files changed, 54 insertions(+), 78 deletions(-) delete mode 100644 overlays/nautilus.nix delete mode 100644 overlays/prismlauncher.nix delete mode 100644 overlays/sway.nix diff --git a/overlays/default.nix b/overlays/default.nix index e21438e..f56a27c 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -4,9 +4,58 @@ let patches = (old.patches or []) ++ patches; }); in { - patches = _final: prev: - {} - // import ./nautilus.nix {inherit addPatches prev;} - // import ./prismlauncher.nix {inherit addPatches prev;} - // import ./sway.nix {inherit addPatches prev;}; + patches = _final: prev: { + gnome = + prev.gnome + // { + # https://aur.archlinux.org/pkgbase/nautilus-typeahead + nautilus = prev.gnome.nautilus.overrideAttrs { + src = prev.fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "albertvaka"; + repo = "nautilus"; + rev = "f5f593bf36c41756a29d5112a10cf7ec70b8eafb"; + hash = "sha256-PfkCY2gQ8jfPIgTRC9Xzxh4N3f2oB339Hym5RCbKwkw="; + }; + + # Enable type-ahead behavior by default + postPatch = '' + awk -i inplace '/type-ahead-search/{c++;} c==1 && /true/{sub("true", "false"); c++;} 1' data/org.gnome.nautilus.gschema.xml + ''; + }; + }; + + sway-unwrapped = addPatches prev.sway-unwrapped [ + # text_input: Implement input-method popups + # https://github.com/swaywm/sway/pull/7226 + (prev.fetchpatch rec { + name = "0001-text_input-Implement-input-method-popups.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/${name}?h=sway-im&id=b8434b3ad9e8c6946dbf7b14b0f7ef5679452b94"; + hash = "sha256-A+rBaWMWs616WllVoo21AJaf9lxg/oCG0b9tHLfuJII="; + }) + (prev.fetchpatch rec { + name = "0002-chore-fractal-scale-handle.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/${name}?h=sway-im&id=b8434b3ad9e8c6946dbf7b14b0f7ef5679452b94"; + hash = "sha256-YOFm0A4uuRSuiwnvF9xbp8Wl7oGicFGnq61vLegqJ0E="; + }) + (prev.fetchpatch rec { + name = "0003-chore-left_pt-on-method-popup.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/${name}?h=sway-im&id=b8434b3ad9e8c6946dbf7b14b0f7ef5679452b94"; + hash = "sha256-PzhQBRpyB1WhErn05UBtBfaDW5bxnQLRKWu8jy7dEiM="; + }) + + # Tray D-Bus Menu + # https://github.com/swaywm/sway/pull/6249 + (prev.fetchpatch { + name = "0001-Tray-Implement-dbusmenu.patch"; + url = "https://github.com/NickHu/sway/commit/0fc5d7aed84415a77b718ca9dc3c0b3ad2c05b02.patch"; + hash = "sha256-1KuGZGwyGJK8KO4OngS+tWKV/3Yu++bCNnp+xTrlGoY="; + }) + (prev.fetchpatch { + name = "0002-Tray-dont-invoke-dbus-menu-when-tray-is-disabled.patch"; + url = "https://github.com/NickHu/sway/commit/03c14421354e54332e12f78d029dcaa9919fd161.patch"; + hash = "sha256-GhBlCnk7aB6s57wV1FNOPAt6s0oJxLgf2bMw+8ktn8A="; + }) + ]; + }; } diff --git a/overlays/nautilus.nix b/overlays/nautilus.nix deleted file mode 100644 index 3b9e000..0000000 --- a/overlays/nautilus.nix +++ /dev/null @@ -1,21 +0,0 @@ -{prev, ...}: { - gnome = - prev.gnome - // { - # https://aur.archlinux.org/pkgbase/nautilus-typeahead - nautilus = prev.gnome.nautilus.overrideAttrs { - src = prev.fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "albertvaka"; - repo = "nautilus"; - rev = "f5f593bf36c41756a29d5112a10cf7ec70b8eafb"; - hash = "sha256-PfkCY2gQ8jfPIgTRC9Xzxh4N3f2oB339Hym5RCbKwkw="; - }; - - # Enable type-ahead behavior by default - postPatch = '' - awk -i inplace '/type-ahead-search/{c++;} c==1 && /true/{sub("true", "false"); c++;} 1' data/org.gnome.nautilus.gschema.xml - ''; - }; - }; -} diff --git a/overlays/prismlauncher.nix b/overlays/prismlauncher.nix deleted file mode 100644 index b711b45..0000000 --- a/overlays/prismlauncher.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - addPatches, - prev, - ... -}: { - prismlauncher = addPatches prev.prismlauncher [ - # Offline mode for Prism Launcher - # https://github.com/Misterio77/nix-config/blob/main/overlays/offline-mode-prism-launcher.diff - (prev.fetchpatch { - url = "https://raw.githubusercontent.com/Misterio77/nix-config/ac1d7bbcafb6be75e94448c7ae7a94d460e3129d/overlays/offline-mode-prism-launcher.diff"; - hash = "sha256-vMcAvhD0Ms4Tvwpzs/YfORc8ki7MNMurdJJ/yswfxFM="; - }) - ]; -} diff --git a/overlays/sway.nix b/overlays/sway.nix deleted file mode 100644 index a86da38..0000000 --- a/overlays/sway.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - addPatches, - prev, - ... -}: { - sway-unwrapped = addPatches prev.sway-unwrapped [ - # text_input: Implement input-method popups - # https://github.com/swaywm/sway/pull/7226 - (prev.fetchpatch rec { - name = "0001-text_input-Implement-input-method-popups.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/${name}?h=sway-im&id=b8434b3ad9e8c6946dbf7b14b0f7ef5679452b94"; - hash = "sha256-A+rBaWMWs616WllVoo21AJaf9lxg/oCG0b9tHLfuJII="; - }) - (prev.fetchpatch rec { - name = "0002-chore-fractal-scale-handle.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/${name}?h=sway-im&id=b8434b3ad9e8c6946dbf7b14b0f7ef5679452b94"; - hash = "sha256-YOFm0A4uuRSuiwnvF9xbp8Wl7oGicFGnq61vLegqJ0E="; - }) - (prev.fetchpatch rec { - name = "0003-chore-left_pt-on-method-popup.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/${name}?h=sway-im&id=b8434b3ad9e8c6946dbf7b14b0f7ef5679452b94"; - hash = "sha256-PzhQBRpyB1WhErn05UBtBfaDW5bxnQLRKWu8jy7dEiM="; - }) - - # Tray D-Bus Menu - # https://github.com/swaywm/sway/pull/6249 - (prev.fetchpatch { - name = "0001-Tray-Implement-dbusmenu.patch"; - url = "https://github.com/NickHu/sway/commit/0fc5d7aed84415a77b718ca9dc3c0b3ad2c05b02.patch"; - hash = "sha256-1KuGZGwyGJK8KO4OngS+tWKV/3Yu++bCNnp+xTrlGoY="; - }) - (prev.fetchpatch { - name = "0002-Tray-dont-invoke-dbus-menu-when-tray-is-disabled.patch"; - url = "https://github.com/NickHu/sway/commit/03c14421354e54332e12f78d029dcaa9919fd161.patch"; - hash = "sha256-GhBlCnk7aB6s57wV1FNOPAt6s0oJxLgf2bMw+8ktn8A="; - }) - ]; -}