move some overlays into theire own package set

This commit is contained in:
jopejoe1 2024-01-13 16:40:15 +01:00
parent 7af0974976
commit 3ce6095f3c
6 changed files with 82 additions and 85 deletions

103
flake.nix
View file

@ -82,55 +82,60 @@
}; };
}; };
outputs = inputs@{ self, nixpkgs, ... }: { outputs = inputs@{ self, nixpkgs, ... }:
nixosModules.default = import ./modules; {
homeManagerModules.default = import ./home-modules; nixosModules.default = import ./modules;
nixosConfigurations = { homeManagerModules.default = import ./home-modules;
kami = nixpkgs.lib.nixosSystem { packages = nixpkgs.lib.attrsets.genAttrs nixpkgs.lib.systems.flakeExposed (system: import ./packages {
system = "x86_64-linux"; inherit system inputs;
specialArgs = inputs; pkgs = nixpkgs.legacyPackages.${system};
modules = [ });
./systems/kami nixosConfigurations = {
self.outputs.nixosModules.default kami = nixpkgs.lib.nixosSystem {
]; system = "x86_64-linux";
}; specialArgs = inputs;
yokai = nixpkgs.lib.nixosSystem { modules = [
system = "aarch64-linux"; ./systems/kami
specialArgs = inputs; self.outputs.nixosModules.default
modules = [ ];
./systems/yokai };
self.outputs.nixosModules.default yokai = nixpkgs.lib.nixosSystem {
]; system = "aarch64-linux";
}; specialArgs = inputs;
inugami = nixpkgs.lib.nixosSystem { modules = [
system = "aarch64-linux"; ./systems/yokai
specialArgs = inputs; self.outputs.nixosModules.default
modules = [ ];
./systems/inugami };
self.outputs.nixosModules.default inugami = nixpkgs.lib.nixosSystem {
]; system = "aarch64-linux";
}; specialArgs = inputs;
tuny = nixpkgs.lib.nixosSystem { modules = [
system = "x86_64-linux"; ./systems/inugami
specialArgs = inputs; self.outputs.nixosModules.default
modules = [ ];
./systems/tuny };
self.outputs.nixosModules.default tuny = nixpkgs.lib.nixosSystem {
]; system = "x86_64-linux";
}; specialArgs = inputs;
installer = nixpkgs.lib.nixosSystem { modules = [
system = "x86_64-linux"; ./systems/tuny
specialArgs = inputs; self.outputs.nixosModules.default
modules = [ ];
./systems/installer };
self.outputs.nixosModules.default installer = nixpkgs.lib.nixosSystem {
]; system = "x86_64-linux";
}; specialArgs = inputs;
steamdeck = nixpkgs.lib.nixosSystem { modules = [
system = "x86_64-linux"; ./systems/installer
specialArgs = inputs; self.outputs.nixosModules.default
modules = [ ./systems/steamdeck self.outputs.nixosModules.default ]; ];
};
steamdeck = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = inputs;
modules = [ ./systems/steamdeck self.outputs.nixosModules.default ];
};
}; };
}; };
};
} }

View file

@ -13,39 +13,8 @@ in {
self.inputs.prismlauncher.overlays.default self.inputs.prismlauncher.overlays.default
(_self: super: rec { (_self: super: rec {
firefox-addons = self.inputs.firefox-addons.packages.${config.nixpkgs.hostPlatform.system};
firefox-addons = self.inputs.firefox-addons.packages."${config.nixpkgs.hostPlatform.system}"; localPkgs = self.outputs.packages.${config.nixpkgs.hostPlatform.system};
tela-icon-theme = super.tela-icon-theme.overrideAttrs
(_old: { src = self.inputs.tela-icon-theme; });
openrgb = super.openrgb.overrideAttrs
(_old: { src = self.inputs.openrgb; });
prismlauncher = super.prismlauncher.overrideAttrs (old: {
patches = (old.patches or [ ]) ++ [
self.inputs.prism-game-options-patch
./prism-ftb.patch
];
});
libadwaita = super.libadwaita.overrideAttrs (old: {
patches = (old.patches or [ ])
++ [ ./adwaita-theming-support.patch ];
doCheck = false;
});
discord = (super.discord.overrideAttrs (old: {
desktopItem = old.desktopItem.override
(old: { exec = old.exec + " --disable-gpu-sandbox"; });
})).override {
withOpenASAR = true;
withVencord = true;
withTTS = true;
};
catppuccin-plymouth =
super.catppuccin-plymouth.override { variant = "frappe"; };
}) })
]; ];
}; };

23
packages/default.nix Normal file
View file

@ -0,0 +1,23 @@
{ inputs, pkgs, system }:
{
tela-icon-theme-git = pkgs.tela-icon-theme.overrideAttrs {
src = inputs.tela-icon-theme;
};
openrgb-git = pkgs.openrgb.overrideAttrs {
src = inputs.openrgb;
};
libadwaita-follow-theme = pkgs.libadwaita.overrideAttrs (old: {
patches = (old.patches or [ ])++ [ ./adwaita-theming-support.patch ];
doCheck = false;
});
prismlauncher-withExtraStuff = inputs.prismlauncher.packages.${system}.prismlauncher.overrideAttrs (old: {
patches = (old.patches or [ ]) ++ [
inputs.prism-game-options-patch
./prism-ftb.patch
];
});
}

View file

@ -1,4 +1,4 @@
{ config, pkgs, lib, nixos-hardware, ... }: { config, pkgs, lib, nixos-hardware, self, ... }:
{ {
imports = [ imports = [
@ -76,7 +76,7 @@
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
prismlauncher localPkgs.prismlauncher-withExtraStuff
mixxx mixxx
picard picard
mangohud mangohud
@ -93,7 +93,7 @@
catppuccin-kvantum catppuccin-kvantum
catppuccin-kde catppuccin-kde
catppuccin-gtk catppuccin-gtk
tela-icon-theme localPkgs.tela-icon-theme-git
]; ];
programs = { programs = {