nyancat/flake
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nixos,overlays: imports -> import

Browse source
This commit is contained in:
Guanran Wang 2023-11-09 12:21:04 +08:00
parent 96f5d82a5d
commit 6115991804
Signed by: nyancat
SSH key fingerprint: SHA256:8oWGKciPALWut/6WA27oFKofX+6Wtc0gQnsefXLQx/8
5 changed files with 75 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
nixos/packages/overlays/default.nix
View file

@ -1,7 +1,7 @@
{...}: { {...}: {
imports = [ nixpkgs.overlays = [
./nautilus.nix (import ./nautilus.nix)
./sway.nix (import ./prismlauncher.nix)
./prismlauncher.nix (import ./sway.nix)
]; ];
} }

46
nixos/packages/overlays/firefox.nix
View file

@ -1,28 +1,20 @@
{...}: { final: prev: {
nixpkgs = { firefox-unwrapped = prev.firefox-unwrapped.overrideAttrs (old: {
overlays = [ # Firefox but with .mozilla moved to .config/mozilla
( # .patch file from aur/firefox-xdg
final: prev: { # dont actually use this, it take ages to build... =.=
firefox-unwrapped = prev.firefox-unwrapped.overrideAttrs (old: { patches =
# Firefox but with .mozilla moved to .config/mozilla (old.patches or [])
# .patch file from aur/firefox-xdg ++ [
# dont actually use this, it take ages to build... =.= (prev.fetchgit {
patches = url = "https://aur.archlinux.org/firefox-xdg.git";
(old.patches or []) rev = "ab291ab81140867dea4c08e4e1e4e3da0c73e4a6";
++ [ hash = "sha256-6VgCt028qs/Y5kl20qLUYwFI63pItsHPbLimOFIdsyo=";
(prev.fetchgit { sparseCheckout = [
url = "https://aur.archlinux.org/firefox-xdg.git"; "firefox-xdg-support.diff"
rev = "ab291ab81140867dea4c08e4e1e4e3da0c73e4a6"; ];
hash = "sha256-6VgCt028qs/Y5kl20qLUYwFI63pItsHPbLimOFIdsyo="; }
sparseCheckout = [ + "/firefox-xdg-support.diff")
"firefox-xdg-support.diff" ];
]; });
}
+ "/firefox-xdg-support.diff")
];
});
}
)
];
};
} }

60
nixos/packages/overlays/nautilus.nix
View file

@ -1,35 +1,27 @@
{...}: { final: prev: {
nixpkgs = { gnome =
overlays = [ prev.gnome
( // {
final: prev: { # Restore Nautilus's typeahead ability
gnome = # .patch file from from aur/nautilus-typeahead
prev.gnome nautilus = prev.gnome.nautilus.overrideAttrs (old: {
// { patches =
# Restore Nautilus's typeahead ability (old.patches or [])
# .patch file from from aur/nautilus-typeahead ++ [
nautilus = prev.gnome.nautilus.overrideAttrs (old: { (prev.fetchgit {
patches = url = "https://aur.archlinux.org/nautilus-typeahead.git";
(old.patches or []) ### 44.2
++ [ rev = "dc295b3191818d16550400e645e108d9e265baa3";
(prev.fetchgit { hash = "sha256-jCZcmPvmEodDzv+HHp7s+azLKVIno1ue72dQO+WbENU=";
url = "https://aur.archlinux.org/nautilus-typeahead.git"; ### 45.0
### 44.2 #rev = "26776193230b0d56f714d31d79c5e716ac413a26";
rev = "dc295b3191818d16550400e645e108d9e265baa3"; #hash = "sha256-hVWZCQwHzL4j+FcgsEhuumhBkl6d8IIbcYddh08QMJM=";
hash = "sha256-jCZcmPvmEodDzv+HHp7s+azLKVIno1ue72dQO+WbENU="; sparseCheckout = [
### 45.0 "nautilus-restore-typeahead.patch"
#rev = "26776193230b0d56f714d31d79c5e716ac413a26"; ];
#hash = "sha256-hVWZCQwHzL4j+FcgsEhuumhBkl6d8IIbcYddh08QMJM="; }
sparseCheckout = [ + "/nautilus-restore-typeahead.patch")
"nautilus-restore-typeahead.patch" ];
]; });
} };
+ "/nautilus-restore-typeahead.patch")
];
});
};
}
)
];
};
} }

34
nixos/packages/overlays/prismlauncher.nix
View file

@ -1,22 +1,14 @@
{...}: { final: prev: {
nixpkgs = { prismlauncher = prev.prismlauncher.overrideAttrs (old: {
overlays = [ # Offline mode for Prism Launcher
( # .patch file from some Misterio77's nix-config repo
final: prev: { patches =
prismlauncher = prev.prismlauncher.overrideAttrs (old: { (old.patches or [])
# Offline mode for Prism Launcher ++ [
# .patch file from some Misterio77's nix-config repo (prev.fetchpatch {
patches = url = "https://raw.githubusercontent.com/Misterio77/nix-config/main/overlays/offline-mode-prism-launcher.diff";
(old.patches or []) hash = "sha256-vMcAvhD0Ms4Tvwpzs/YfORc8ki7MNMurdJJ/yswfxFM=";
++ [ })
(prev.fetchpatch { ];
url = "https://raw.githubusercontent.com/Misterio77/nix-config/main/overlays/offline-mode-prism-launcher.diff"; });
hash = "sha256-vMcAvhD0Ms4Tvwpzs/YfORc8ki7MNMurdJJ/yswfxFM=";
})
];
});
}
)
];
};
} }

34
nixos/packages/overlays/sway.nix
View file

@ -1,22 +1,14 @@
{...}: { final: prev: {
nixpkgs = { sway-unwrapped = prev.sway-unwrapped.overrideAttrs (old: {
overlays = [ # Add input panel to sway
( # .patch file from https://github.com/swaywm/sway/pull/7226
final: prev: { patches =
sway-unwrapped = prev.sway-unwrapped.overrideAttrs (old: { (old.patches or [])
# Add input panel to sway ++ [
# .patch file from https://github.com/swaywm/sway/pull/7226 (prev.fetchurl {
patches = url = "https://github.com/swaywm/sway/commit/d1c6e44886d1047b3aa6ff6aaac383eadd72f36a.patch";
(old.patches or []) sha256 = "sha256-UnNnAgXVBPjhF7ytVpGEStbJK1RQuRIci5PgGEvLp80=";
++ [ })
(prev.fetchurl { ];
url = "https://github.com/swaywm/sway/commit/d1c6e44886d1047b3aa6ff6aaac383eadd72f36a.patch"; });
sha256 = "sha256-UnNnAgXVBPjhF7ytVpGEStbJK1RQuRIci5PgGEvLp80=";
})
];
});
}
)
];
};
} }