This commit is contained in:
parent
f7afa33a13
commit
3df730a55a
2 changed files with 9 additions and 16 deletions
14
flake.nix
14
flake.nix
|
|
@ -113,11 +113,15 @@
|
||||||
importConfigs =
|
importConfigs =
|
||||||
n:
|
n:
|
||||||
map (x: {
|
map (x: {
|
||||||
${x} = {nodes, ...}: {
|
${x} =
|
||||||
networking.hostName = x;
|
{ nodes, pkgs, ... }:
|
||||||
imports = modules ++ [ (./instances/${x}) ];
|
{
|
||||||
_module.args.otherNodes = lib.filterAttrs (n: v: n != x) nodes;
|
nixpkgs.overlays = overlays;
|
||||||
};
|
nix.package = pkgs.unstable.lixPackageSets.latest.lix;
|
||||||
|
networking.hostName = x;
|
||||||
|
imports = modules ++ [ (./instances/${x}) ];
|
||||||
|
_module.args.otherNodes = lib.filterAttrs (n: v: n != x) nodes;
|
||||||
|
};
|
||||||
}) n;
|
}) n;
|
||||||
in
|
in
|
||||||
lib.foldl' lib.recursiveUpdate { } (
|
lib.foldl' lib.recursiveUpdate { } (
|
||||||
|
|
|
||||||
|
|
@ -28,15 +28,4 @@ inputs: self: super: {
|
||||||
python-uhid = super.callPackage ../packages/uhid.nix {};
|
python-uhid = super.callPackage ../packages/uhid.nix {};
|
||||||
caddy-desec = super.callPackage ../packages/caddy-desec.nix {};
|
caddy-desec = super.callPackage ../packages/caddy-desec.nix {};
|
||||||
|
|
||||||
# todo: remove on next supersonic release
|
|
||||||
supersonic-wayland = super.supersonic-wayland.overrideAttrs (old: {
|
|
||||||
patches = (if old?patches then old.patches else []) ++ [
|
|
||||||
(self.fetchpatch2 {
|
|
||||||
url = "https://github.com/dweymouth/supersonic/commit/ee742cf34ef7225d345c16354d9c21d72a41bf4a.patch";
|
|
||||||
hash = "sha256-kSeEbzrfJ4Pe8JC4rIWlSmADOcjrCRBNWlcO8VfVnn4=";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
vendorHash = "sha256-Sh3PxRwb6ElSeWzdvIQ+nD9VVGlpUDwxG7nAoGWPTRQ=";
|
|
||||||
});
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue