depot -> meta for specialArgs, whee

This commit is contained in:
kat witch 2021-08-09 03:04:41 +01:00
parent 43d5814348
commit a5670724da
No known key found for this signature in database
GPG key ID: 1B477797DCA5EC72
15 changed files with 28 additions and 29 deletions

View file

@ -39,8 +39,7 @@ let
specialArgs = {
inherit sources;
inherit depot;
};
} // depot;
};
# The evaluated meta config.

View file

@ -1,4 +1,4 @@
{ depot, lib, config, ... }: with lib; {
{ profiles, lib, config, ... }: with lib; {
config = {
deploy.targets.infra = {
tf = {
@ -15,7 +15,7 @@ config = {
network.nodes.athame = {
imports = lib.hostImport {
hostName = "athame";
inherit (depot) profiles;
inherit profiles;
};
networking = {
hostName = "athame";

View file

@ -1,11 +1,11 @@
{ depot, config, lib, pkgs, ... }:
{ meta, config, lib, pkgs, ... }:
with lib;
{
# Imports
imports = with depot; [
imports = with meta; [
profiles.hardware.hcloud-imperative
users.kat.server
services.fail2ban

View file

@ -1,4 +1,4 @@
{ lib, config, depot, ... }: with lib; {
{ profiles, config, lib, ... }: with lib; {
config = {
deploy.targets.beltane = {
tf = {
@ -15,7 +15,7 @@
network.nodes.beltane = {
imports = lib.hostImport {
hostName = "beltane";
inherit (depot) profiles;
inherit profiles;
};
networking = {
hostName = "beltane";

View file

@ -1,11 +1,11 @@
{ depot, tf, config, pkgs, lib, ... }:
{ meta, tf, config, pkgs, lib, ... }:
with lib;
{
# Imports
imports = with depot; [
imports = with meta; [
profiles.hardware.rm-310
profiles.gui
users.kat.guiFull

View file

@ -1,9 +1,9 @@
{ lib, config, depot, ... }: with lib; {
{ lib, config, profiles, ... }: with lib; {
deploy.targets.dummy.enable = false;
network.nodes.dummy = {
imports = lib.hostImport {
hostName = "dummy";
inherit (depot) profiles;
inherit profiles;
};
networking = {
hostName = "dummy";

View file

@ -1,4 +1,4 @@
{ lib, config, depot, ... }: with lib; {
{ profiles, config, lib, ... }: with lib; {
config = {
deploy.targets.ostara = {
tf = {
@ -15,7 +15,7 @@
network.nodes.ostara = {
imports = lib.hostImport {
hostName = "ostara";
inherit (depot) profiles;
inherit profiles;
};
networking = {
hostName = "ostara";

View file

@ -1,11 +1,11 @@
{ depot, config, pkgs, lib, ... }:
{ meta, config, pkgs, lib, ... }:
with lib;
{
# Imports
imports = with depot; [
imports = with meta; [
profiles.hardware.eeepc-1015pem
profiles.laptop
services.kattv

View file

@ -1,4 +1,4 @@
{ lib, config, depot, ... }: with lib; {
{ meta, config, profiles, ... }: with lib; {
config = {
deploy.targets.personal = {
tf = {
@ -15,7 +15,7 @@
network.nodes.samhain = {
imports = lib.hostImport {
hostName = "samhain";
inherit (depot) profiles;
inherit profiles;
};
networking = {
hostName = "samhain";

View file

@ -1,4 +1,4 @@
{ depot, tf, config, pkgs, lib, sources, ... }:
{ meta, tf, config, pkgs, lib, sources, ... }:
with lib;
@ -9,7 +9,7 @@ let
in {
# Imports
imports = with depot; [
imports = with meta; [
profiles.hardware.ms-7b86
profiles.gui
profiles.vfio

View file

@ -1,4 +1,4 @@
{ lib, config, depot, ... }: with lib; {
{ profiles, config, lib, ... }: with lib; {
config = {
deploy.targets.personal = {
tf = {
@ -15,7 +15,7 @@
network.nodes.yule = {
imports = lib.hostImport {
hostName = "yule";
inherit (depot) profiles;
inherit profiles;
};
networking = {
hostName = "yule";

View file

@ -1,11 +1,11 @@
{ depot, config, pkgs, lib, ... }:
{ meta, config, pkgs, lib, ... }:
with lib;
{
# Imports
imports = with depot; [
imports = with meta; [
profiles.hardware.v330-14arr
profiles.gui
profiles.laptop

View file

@ -1,4 +1,4 @@
{ pkgs, sources, depot, lib, config, ... }:
{ pkgs, sources, lib, config, ... }:
/*
This module:
@ -59,7 +59,7 @@ with lib;
];
specialArgs = {
inherit (config.network) nodes;
inherit sources depot;
inherit sources;
meta = config;
};
};

View file

@ -1,7 +1,7 @@
{ config, depot, lib, pkgs, ... }:
{ config, meta, lib, pkgs, ... }:
{
imports = with depot; [
imports = with meta; [
users.kat.base
# users.kairi.base TODO
users.arc

2
wiki

@ -1 +1 @@
Subproject commit 7426b9204cd919c2e9bc87254f9654e830bf34da
Subproject commit b7cbb2972190f2bf92fa20ee58d746a32bc639e1