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 = [
./nautilus.nix
./sway.nix
./prismlauncher.nix
nixpkgs.overlays = [
(import ./nautilus.nix)
(import ./prismlauncher.nix)
(import ./sway.nix)
];
}

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

@ -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")
];
});
}

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

@ -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")
];
});
};
}

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

@ -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=";
})
];
});
}

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

@ -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=";
})
];
});
}