Lots of updates

This commit is contained in:
2022-07-10 20:46:03 -07:00
parent a4ba216d71
commit d46a301f68
17 changed files with 698 additions and 226 deletions
+17 -11
View File
@@ -29,15 +29,18 @@
chuteUnstable.url = "git+https://git.fudo.org/chute/chute.git?ref=master";
pricebot.url = "git+https://git.fudo.org/fudo-public/pricebot.git";
nixpkgsUnstable.url = "nixpkgs/nixos-unstable";
# zigbee2mqtt-converters.url = "path:/net/projects/niten/zigbee2mqtt-converters";
nixpkgs2111.url = "nixpkgs/nixos-21.11";
wallfly.url = "git+https://git.fudo.org/fudo-public/wallfly.git";
};
outputs = { self, nixpkgs, fudo-home, fudo-lib, fudo-entities, fudo-pkgs
, fudo-secrets, chute, chuteUnstable, nixpkgsUnstable,
# zigbee2mqtt-converters,
... }@inputs:
, fudo-secrets, chute, chuteUnstable, nixpkgsUnstable, nixpkgs2111, pricebot
, wallfly, ... }@inputs:
with nixpkgs.lib;
let
fudo-nixos-hosts = filterAttrs (hostname: hostOpts: hostOpts.nixos-system)
@@ -48,10 +51,7 @@
unstable-for = arch:
import nixpkgsUnstable {
system = arch;
config = {
allowUnfree = true;
permittedInsecurePackages = [ "openssh-with-gssapi-8.4p1" ];
};
config.allowUnfree = true;
};
pkgs-for = arch:
@@ -69,7 +69,13 @@
chute = chute.packages.${arch}.chute;
chuteUnstable = chuteUnstable.packages.${arch}.chute;
})
(final: prev: { pkgsUnstable = unstable; })
(final: prev: {
pkgs2111 = import nixpkgs2111 {
system = arch;
config.allowUnfree = true;
};
pkgsUnstable = unstable;
})
(final: prev: { nyxt = unstable.nyxt; })
];
};
@@ -91,8 +97,8 @@
fudo-secrets.nixosModule
fudo-lib.nixosModule
fudo-entities.nixosModule
# zigbee2mqtt-converters.nixosModule
pricebot.nixosModule
wallfly.nixosModule
./config
(config-dir + "/hardware/${hostname}.nix")