added patched nixpkgs

This commit is contained in:
Julien Malka 2023-09-17 20:46:25 +02:00
parent ab66b30a82
commit 655ac53bfd
Signed by: Luj
GPG key ID: 6FC74C847011FD83

View file

@ -5,77 +5,85 @@ with builtins;
let
overlay-unstable = arch: final: prev:
let
master-patched-src = (import inputs.master { system = arch; }).applyPatches {
nixpkgs-patched-src = (import inputs.nixpkgs { system = arch; }).applyPatches {
name = "nixpkgs-patches";
src = inputs.master;
patches = [ ../patches/signal.patch ];
src = inputs.nixpkgs;
patches = [ ../patches/signal.patch ../patches/bcachefs-systemd-stage-1.patch ];
};
in
{
unstable = inputs.unstable.legacyPackages."${arch}";
master-patched = import master-patched-src { system = arch; };
nixpkgs-patched = import nixpkgs-patched-src { system = arch; };
stable = inputs.nixpkgs.legacyPackages."${arch}";
};
in
{
mkMachine = { host, host-config, modules, nixpkgs ? inputs.nixpkgs, system ? "x86_64-linux", home-manager ? inputs.home-manager }: nixpkgs.lib.nixosSystem {
lib = final;
system = system;
specialArgs = {
inherit inputs;
mkMachine = { host, host-config, modules, nixpkgs ? inputs.nixpkgs, system ? "x86_64-linux", home-manager ? inputs.home-manager }:
let
nixpkgs-patched-src = (import nixpkgs { inherit system; }).applyPatches {
name = "nixpkgs-patched";
src = nixpkgs;
patches = [ ../patches/signal.patch ../patches/bcachefs-systemd-stage-1.patch ];
};
in
nixpkgs.lib.nixosSystem {
lib = final;
system = system;
specialArgs = {
inherit inputs;
nixpkgs-patched = nixpkgs-patched-src;
};
modules = builtins.attrValues modules ++ [
../machines/base.nix
inputs.sops-nix.nixosModules.sops
host-config
home-manager.nixosModules.home-manager
inputs.simple-nixos-mailserver.nixosModule
inputs.hyprland.nixosModules.default
inputs.attic.nixosModules.atticd
inputs.lanzaboote.nixosModules.lanzaboote
inputs.nix-index-database.nixosModules.nix-index
{
home-manager.useGlobalPkgs = true;
nixpkgs.overlays = [
(overlay-unstable system)
(final: prev:
{
hyprland = inputs.hyprland.packages.${system}.default.override {
enableXWayland = true;
nvidiaPatches = false;
legacyRenderer = true;
};
waybar = prev.waybar.overrideAttrs (oldAttrs: {
mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ];
});
tinystatus = prev.pkgs.callPackage ../packages/tinystatus { };
zotero = prev.pkgs.callPackage ../packages/zotero { };
jackett = prev.unstable.jackett;
radarr = prev.unstable.radarr;
flaresolverr = prev.pkgs.callPackage ../packages/flaresolverr { };
htpdate = prev.pkgs.callPackage ../packages/htpdate { };
authelia = prev.pkgs.callPackage ../packages/authelia { };
paperless-ng = prev.pkgs.callPackage ../packages/paperless-ng { };
tailscale = prev.unstable.tailscale;
nodePackages = prev.unstable.nodePackages;
hydrasect = prev.pkgs.callPackage ../packages/hydrasect { };
uptime-kuma = prev.pkgs.callPackage ../packages/uptime-kuma { };
linkal = inputs.linkal.defaultPackage."${system}";
mosh = prev.unstable.mosh;
hyprpaper = inputs.hyprpaper.packages.${system}.default;
attic = inputs.attic.packages.${system}.default;
colmena = inputs.colmena.packages.${system}.colmena;
nixd = inputs.nixd.packages.${system}.default;
keycloak-keywind = prev.pkgs.callPackage ../packages/keycloak-keywind { };
nix-rfc-92 = inputs.nix-rfc-92.packages.${system}.default;
})
];
}
];
extraModules = [ inputs.colmena.nixosModules.deploymentOptions ];
};
modules = builtins.attrValues modules ++ [
../machines/base.nix
inputs.sops-nix.nixosModules.sops
host-config
home-manager.nixosModules.home-manager
inputs.simple-nixos-mailserver.nixosModule
inputs.hyprland.nixosModules.default
inputs.attic.nixosModules.atticd
inputs.lanzaboote.nixosModules.lanzaboote
inputs.nix-index-database.nixosModules.nix-index
{
home-manager.useGlobalPkgs = true;
nixpkgs.overlays = [
(overlay-unstable system)
(final: prev:
{
hyprland = inputs.hyprland.packages.${system}.default.override {
enableXWayland = true;
hidpiXWayland = true;
nvidiaPatches = false;
legacyRenderer = true;
};
waybar = prev.waybar.overrideAttrs (oldAttrs: {
mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ];
});
tinystatus = prev.pkgs.callPackage ../packages/tinystatus { };
zotero = prev.pkgs.callPackage ../packages/zotero { };
jackett = prev.unstable.jackett;
radarr = prev.unstable.radarr;
flaresolverr = prev.pkgs.callPackage ../packages/flaresolverr { };
htpdate = prev.pkgs.callPackage ../packages/htpdate { };
authelia = prev.pkgs.callPackage ../packages/authelia { };
paperless-ng = prev.pkgs.callPackage ../packages/paperless-ng { };
tailscale = prev.unstable.tailscale;
nodePackages = prev.unstable.nodePackages;
hydrasect = prev.pkgs.callPackage ../packages/hydrasect { };
uptime-kuma = prev.pkgs.callPackage ../packages/uptime-kuma { };
linkal = inputs.linkal.defaultPackage."${system}";
mosh = prev.unstable.mosh;
hyprpaper = inputs.hyprpaper.packages.${system}.default;
attic = inputs.attic.packages.${system}.default;
colmena = inputs.colmena.packages.${system}.colmena;
nixd = inputs.nixd.packages.${system}.default;
keycloak-keywind = prev.pkgs.callPackage ../packages/keycloak-keywind { };
nix-rfc-92 = inputs.nix-rfc-92.packages.${system}.default;
})
];
}
];
extraModules = [ inputs.colmena.nixosModules.deploymentOptions ];
};
importConfig = path: (mapAttrs (name: value: import (path + "/${name}/default.nix")) (final.filterAttrs (_: v: v == "directory") (readDir path)));