From 611599180488bf6c2f0bb462d50f9335fcbe4ddb Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Thu, 9 Nov 2023 12:21:04 +0800 Subject: [PATCH] nixos,overlays: imports -> import --- nixos/packages/overlays/default.nix | 8 +-- nixos/packages/overlays/firefox.nix | 46 +++++++---------- nixos/packages/overlays/nautilus.nix | 60 ++++++++++------------- nixos/packages/overlays/prismlauncher.nix | 34 +++++-------- nixos/packages/overlays/sway.nix | 34 +++++-------- 5 files changed, 75 insertions(+), 107 deletions(-) diff --git a/nixos/packages/overlays/default.nix b/nixos/packages/overlays/default.nix index ff355ec..7ccfbd1 100644 --- a/nixos/packages/overlays/default.nix +++ b/nixos/packages/overlays/default.nix @@ -1,7 +1,7 @@ {...}: { - imports = [ - ./nautilus.nix - ./sway.nix - ./prismlauncher.nix + nixpkgs.overlays = [ + (import ./nautilus.nix) + (import ./prismlauncher.nix) + (import ./sway.nix) ]; } diff --git a/nixos/packages/overlays/firefox.nix b/nixos/packages/overlays/firefox.nix index 3484fcc..8a49bb7 100644 --- a/nixos/packages/overlays/firefox.nix +++ b/nixos/packages/overlays/firefox.nix @@ -1,28 +1,20 @@ -{...}: { - nixpkgs = { - overlays = [ - ( - final: prev: { - firefox-unwrapped = prev.firefox-unwrapped.overrideAttrs (old: { - # Firefox but with .mozilla moved to .config/mozilla - # .patch file from aur/firefox-xdg - # dont actually use this, it take ages to build... =.= - patches = - (old.patches or []) - ++ [ - (prev.fetchgit { - url = "https://aur.archlinux.org/firefox-xdg.git"; - rev = "ab291ab81140867dea4c08e4e1e4e3da0c73e4a6"; - hash = "sha256-6VgCt028qs/Y5kl20qLUYwFI63pItsHPbLimOFIdsyo="; - sparseCheckout = [ - "firefox-xdg-support.diff" - ]; - } - + "/firefox-xdg-support.diff") - ]; - }); - } - ) - ]; - }; +final: prev: { + firefox-unwrapped = prev.firefox-unwrapped.overrideAttrs (old: { + # Firefox but with .mozilla moved to .config/mozilla + # .patch file from aur/firefox-xdg + # dont actually use this, it take ages to build... =.= + patches = + (old.patches or []) + ++ [ + (prev.fetchgit { + url = "https://aur.archlinux.org/firefox-xdg.git"; + rev = "ab291ab81140867dea4c08e4e1e4e3da0c73e4a6"; + hash = "sha256-6VgCt028qs/Y5kl20qLUYwFI63pItsHPbLimOFIdsyo="; + sparseCheckout = [ + "firefox-xdg-support.diff" + ]; + } + + "/firefox-xdg-support.diff") + ]; + }); } diff --git a/nixos/packages/overlays/nautilus.nix b/nixos/packages/overlays/nautilus.nix index b377162..5206a57 100644 --- a/nixos/packages/overlays/nautilus.nix +++ b/nixos/packages/overlays/nautilus.nix @@ -1,35 +1,27 @@ -{...}: { - nixpkgs = { - overlays = [ - ( - final: prev: { - gnome = - prev.gnome - // { - # Restore Nautilus's typeahead ability - # .patch file from from aur/nautilus-typeahead - nautilus = prev.gnome.nautilus.overrideAttrs (old: { - patches = - (old.patches or []) - ++ [ - (prev.fetchgit { - url = "https://aur.archlinux.org/nautilus-typeahead.git"; - ### 44.2 - rev = "dc295b3191818d16550400e645e108d9e265baa3"; - hash = "sha256-jCZcmPvmEodDzv+HHp7s+azLKVIno1ue72dQO+WbENU="; - ### 45.0 - #rev = "26776193230b0d56f714d31d79c5e716ac413a26"; - #hash = "sha256-hVWZCQwHzL4j+FcgsEhuumhBkl6d8IIbcYddh08QMJM="; - sparseCheckout = [ - "nautilus-restore-typeahead.patch" - ]; - } - + "/nautilus-restore-typeahead.patch") - ]; - }); - }; - } - ) - ]; - }; +final: prev: { + gnome = + prev.gnome + // { + # Restore Nautilus's typeahead ability + # .patch file from from aur/nautilus-typeahead + nautilus = prev.gnome.nautilus.overrideAttrs (old: { + patches = + (old.patches or []) + ++ [ + (prev.fetchgit { + url = "https://aur.archlinux.org/nautilus-typeahead.git"; + ### 44.2 + rev = "dc295b3191818d16550400e645e108d9e265baa3"; + hash = "sha256-jCZcmPvmEodDzv+HHp7s+azLKVIno1ue72dQO+WbENU="; + ### 45.0 + #rev = "26776193230b0d56f714d31d79c5e716ac413a26"; + #hash = "sha256-hVWZCQwHzL4j+FcgsEhuumhBkl6d8IIbcYddh08QMJM="; + sparseCheckout = [ + "nautilus-restore-typeahead.patch" + ]; + } + + "/nautilus-restore-typeahead.patch") + ]; + }); + }; } diff --git a/nixos/packages/overlays/prismlauncher.nix b/nixos/packages/overlays/prismlauncher.nix index 00cefd6..be2ccd4 100644 --- a/nixos/packages/overlays/prismlauncher.nix +++ b/nixos/packages/overlays/prismlauncher.nix @@ -1,22 +1,14 @@ -{...}: { - nixpkgs = { - overlays = [ - ( - final: prev: { - prismlauncher = prev.prismlauncher.overrideAttrs (old: { - # Offline mode for Prism Launcher - # .patch file from some Misterio77's nix-config repo - patches = - (old.patches or []) - ++ [ - (prev.fetchpatch { - url = "https://raw.githubusercontent.com/Misterio77/nix-config/main/overlays/offline-mode-prism-launcher.diff"; - hash = "sha256-vMcAvhD0Ms4Tvwpzs/YfORc8ki7MNMurdJJ/yswfxFM="; - }) - ]; - }); - } - ) - ]; - }; +final: prev: { + prismlauncher = prev.prismlauncher.overrideAttrs (old: { + # Offline mode for Prism Launcher + # .patch file from some Misterio77's nix-config repo + patches = + (old.patches or []) + ++ [ + (prev.fetchpatch { + url = "https://raw.githubusercontent.com/Misterio77/nix-config/main/overlays/offline-mode-prism-launcher.diff"; + hash = "sha256-vMcAvhD0Ms4Tvwpzs/YfORc8ki7MNMurdJJ/yswfxFM="; + }) + ]; + }); } diff --git a/nixos/packages/overlays/sway.nix b/nixos/packages/overlays/sway.nix index 36935dc..e032e1f 100644 --- a/nixos/packages/overlays/sway.nix +++ b/nixos/packages/overlays/sway.nix @@ -1,22 +1,14 @@ -{...}: { - nixpkgs = { - overlays = [ - ( - final: prev: { - sway-unwrapped = prev.sway-unwrapped.overrideAttrs (old: { - # Add input panel to sway - # .patch file from https://github.com/swaywm/sway/pull/7226 - patches = - (old.patches or []) - ++ [ - (prev.fetchurl { - url = "https://github.com/swaywm/sway/commit/d1c6e44886d1047b3aa6ff6aaac383eadd72f36a.patch"; - sha256 = "sha256-UnNnAgXVBPjhF7ytVpGEStbJK1RQuRIci5PgGEvLp80="; - }) - ]; - }); - } - ) - ]; - }; +final: prev: { + sway-unwrapped = prev.sway-unwrapped.overrideAttrs (old: { + # Add input panel to sway + # .patch file from https://github.com/swaywm/sway/pull/7226 + patches = + (old.patches or []) + ++ [ + (prev.fetchurl { + url = "https://github.com/swaywm/sway/commit/d1c6e44886d1047b3aa6ff6aaac383eadd72f36a.patch"; + sha256 = "sha256-UnNnAgXVBPjhF7ytVpGEStbJK1RQuRIci5PgGEvLp80="; + }) + ]; + }); }