gensokyo-zone/infrastructure
1
0
Fork 0
mirror of https://github.com/gensokyo-zone/infrastructure.git synced 2026-02-09 12:29:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor, mumble domain change, sway changes

Browse source
This commit is contained in:
kat witch 2021-03-24 16:51:48 +00:00
parent 22cf8ab600
commit 1de1018c02
No known key found for this signature in database
GPG key ID: 1B477797DCA5EC72
113 changed files with 53 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/hosts.nix
View file

@ -1,5 +1,5 @@
{ pkgs, hostsDir ? ../config/hosts, privateHostsDir ? ../config/private/hosts
, commonImports ? [ ../config/nixos.nix ../modules/nixos ], pkgsPath ? ../pkgs
{ pkgs, hostsDir ? ../hosts, privateHostsDir ? ../private/hosts
, commonImports ? [ ../nixos.nix ../modules/nixos ], pkgsPath ? ../pkgs
, sources ? { }, witch ? { } }:
with pkgs.lib;
@ -12,8 +12,8 @@ rec {
{ config, ... }: {
_module.args = { inherit hosts groups; };
imports = [
(import (hostsDir + "/${hostName}/configuration.nix"))
(import (privateHostsDir + "/${hostName}/configuration.nix"))
(import (hostsDir + "/${hostName}/nixos"))
(import (privateHostsDir + "/${hostName}/nixos"))
../modules/nixos/deploy
] ++ commonImports;
networking = { inherit hostName; };
@ -32,7 +32,7 @@ rec {
else
{ })
];
specialArgs = { inherit sources witch; };
specialArgs = { inherit sources witch hostName; };
})) hostNames);
groupNames = unique (concatLists