better list concatenation + renamed vars on overlay

This commit is contained in:
Danilo Reyes 2024-12-06 18:40:59 -06:00
parent 2e6ad43e10
commit ffe8d4aa9a
2 changed files with 39 additions and 45 deletions

View File

@ -28,16 +28,15 @@
style = "adwaita"; style = "adwaita";
}; };
users.users.jawz.packages = users.users.jawz.packages =
let builtins.attrValues {
packages = builtins.attrValues {
inherit (pkgs) inherit (pkgs)
adw-gtk3 # theme legacy applications adw-gtk3 # theme legacy applications
gnome-tweaks # tweaks for the gnome desktop environment gnome-tweaks # tweaks for the gnome desktop environment
papirus-icon-theme # icon theme papirus-icon-theme # icon theme
libgda # for pano shell extension libgda # for pano shell extension
; ;
}; }
extensions = builtins.attrValues { ++ builtins.attrValues {
inherit (pkgs.gnomeExtensions) inherit (pkgs.gnomeExtensions)
appindicator # applets for open applications appindicator # applets for open applications
reading-strip # like putting a finger on every line I read reading-strip # like putting a finger on every line I read
@ -46,10 +45,8 @@
gamemode-indicator-in-system-settings # I guess I'm a gamer now? gamemode-indicator-in-system-settings # I guess I'm a gamer now?
burn-my-windows # special effects for when closing windows burn-my-windows # special effects for when closing windows
; ;
}; }
otherPackages = [ ++ [
config.nur.repos.zzzsy.gnome-shell-extension-pano (pkgs.callPackage ./pkgs/pano/default.nix { })
]; ];
in
packages ++ extensions ++ otherPackages;
} }

View File

@ -1,10 +1,10 @@
{ pkgs }: { pkgs }:
_self: super: { _final: prev: {
gnome = super.gnome.overrideScope ( gnome = prev.gnome.overrideScope (
_gFinal: gPrev: { _final: prev: {
nautilus = gPrev.nautilus.overrideAttrs (nsuper: { nautilus = prev.nautilus.overrideAttrs (old: {
buildInputs = buildInputs =
nsuper.buildInputs old.buildInputs
++ builtins.attrValues { ++ builtins.attrValues {
inherit (pkgs.gst_all_1) inherit (pkgs.gst_all_1)
gst-plugins-good gst-plugins-good
@ -14,23 +14,20 @@ _self: super: {
}); });
} }
); );
lutris = super.lutris.override { lutris = prev.lutris.override {
extraPkgs = extraPkgs =
pkgs: pkgs:
let builtins.attrValues {
corePackages = builtins.attrValues {
inherit (pkgs) pango winetricks; inherit (pkgs) pango winetricks;
}; }
winePackages = [ ++ (with pkgs; [
pkgs.wine64Packages.stable wine64Packages.stable
pkgs.wineWowPackages.stable wineWowPackages.stable
]; ]);
in };
corePackages ++ winePackages; handbrake = prev.handbrake.override { useGtk = true; };
}; discord-ptb = prev.discord.override { withVencord = true; };
handbrake = super.handbrake.override { useGtk = true; }; ripgrep = prev.ripgrep.override { withPCRE2 = true; };
discord-ptb = super.discord.override { withVencord = true; }; papirus-icon-theme = prev.papirus-icon-theme.override { color = "yellow"; };
ripgrep = super.ripgrep.override { withPCRE2 = true; }; blender = prev.blender.override { cudaSupport = true; };
papirus-icon-theme = super.papirus-icon-theme.override { color = "yellow"; };
blender = super.blender.override { cudaSupport = true; };
} }