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

View File

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