swag
This commit is contained in:
@@ -23,6 +23,10 @@
|
||||
home-manager-2305.url = "github:nix-community/home-manager/release-23.05";
|
||||
home-manager-2305.inputs.nixpkgs.follows = "nixpkgs-2305";
|
||||
|
||||
# https://github.com/nix-community/nix-index-database
|
||||
nix-index-database.url = "github:Mic92/nix-index-database";
|
||||
nix-index-database.inputs.nixpkgs.follows = "nixpkgs-2311"; # only used for .packages
|
||||
|
||||
# https://github.com/NixOS/nixos-hardware
|
||||
nixos-hardware.url = "github:NixOS/nixos-hardware";
|
||||
|
||||
@@ -151,6 +155,7 @@
|
||||
(ifExists "${self}/hosts/${hostname}")
|
||||
inputs.sops-nix.nixosModules.sops
|
||||
inputs.home-manager.nixosModule
|
||||
#inputs.nix-index-database.nixosModules.nix-index
|
||||
] ++ modules ++ extra-modules;
|
||||
#++ inputs.flake-programs-sqlite.nixosModules.programs-sqlite; # TODO: make work
|
||||
|
||||
@@ -167,6 +172,7 @@
|
||||
};
|
||||
home-manager.sharedModules = [
|
||||
inputs.sops-nix.homeManagerModules.sops
|
||||
inputs.nix-index-database.hmModules.nix-index
|
||||
];
|
||||
|
||||
# still needed even if using networkd
|
||||
@@ -212,8 +218,8 @@
|
||||
in {
|
||||
inherit system; # TODO: cross system
|
||||
fqdn = cfg.networking.fqdn;
|
||||
allowedTCPPorts = cfg.networking.firewall.allowedTCPPorts;
|
||||
allowedUDPPorts = cfg.networking.firewall.allowedUDPPorts;
|
||||
allowedTCPPorts = cfg.networking.firewall.allowedTCPPorts or [];
|
||||
allowedUDPPorts = cfg.networking.firewall.allowedUDPPorts or [];
|
||||
bootloader = if cfg.boot.loader.grub.enable then "grub"
|
||||
else if cfg.boot.loader.systemd-boot.enable then "systemd-boot"
|
||||
else null;
|
||||
@@ -266,6 +272,7 @@
|
||||
nixosModules = mkHosts (mkModule []);
|
||||
nixosConfigurations = mkHosts (mkConfig []);
|
||||
nixosReports = mkHosts (mkReport []);
|
||||
nixosHostnames = builtins.attrNames self.nixosReports; # faster to eval
|
||||
|
||||
packages = forAllSystems ({ inputs, pkgs, lib, flakes, ... }: let
|
||||
mk-nspawn-deployer = hostname: # TODO: nspawn-tarball.nix populates /etc/nixos with junk
|
||||
@@ -296,6 +303,7 @@
|
||||
home.homeDirectory = home;
|
||||
home-manager.sharedModules = [
|
||||
inputs.sops-nix.homeManagerModules.sops
|
||||
inputs.nix-index-database.hmModules.nix-index
|
||||
];
|
||||
}];
|
||||
extraSpecialArgs = {
|
||||
|
||||
Reference in New Issue
Block a user