diff --git a/default.nix b/default.nix index 6343efdf..82f5fe0f 100644 --- a/default.nix +++ b/default.nix @@ -39,8 +39,7 @@ let specialArgs = { inherit sources; - inherit depot; - }; + } // depot; }; # The evaluated meta config. diff --git a/depot/hosts/athame/meta.nix b/depot/hosts/athame/meta.nix index 23e552bb..4ba83ad3 100644 --- a/depot/hosts/athame/meta.nix +++ b/depot/hosts/athame/meta.nix @@ -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"; diff --git a/depot/hosts/athame/nixos.nix b/depot/hosts/athame/nixos.nix index fce6c089..fee07c1c 100644 --- a/depot/hosts/athame/nixos.nix +++ b/depot/hosts/athame/nixos.nix @@ -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 diff --git a/depot/hosts/beltane/meta.nix b/depot/hosts/beltane/meta.nix index b4d40dfb..bc15391c 100644 --- a/depot/hosts/beltane/meta.nix +++ b/depot/hosts/beltane/meta.nix @@ -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"; diff --git a/depot/hosts/beltane/nixos.nix b/depot/hosts/beltane/nixos.nix index 1da1bde4..4ba69fd7 100644 --- a/depot/hosts/beltane/nixos.nix +++ b/depot/hosts/beltane/nixos.nix @@ -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 diff --git a/depot/hosts/dummy/meta.nix b/depot/hosts/dummy/meta.nix index 11be5a38..f8942ded 100644 --- a/depot/hosts/dummy/meta.nix +++ b/depot/hosts/dummy/meta.nix @@ -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"; diff --git a/depot/hosts/ostara/meta.nix b/depot/hosts/ostara/meta.nix index 6a391f52..df1b325b 100644 --- a/depot/hosts/ostara/meta.nix +++ b/depot/hosts/ostara/meta.nix @@ -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"; diff --git a/depot/hosts/ostara/nixos.nix b/depot/hosts/ostara/nixos.nix index 27f8c4f5..9503a0c3 100644 --- a/depot/hosts/ostara/nixos.nix +++ b/depot/hosts/ostara/nixos.nix @@ -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 diff --git a/depot/hosts/samhain/meta.nix b/depot/hosts/samhain/meta.nix index 501c7dff..4dd747db 100644 --- a/depot/hosts/samhain/meta.nix +++ b/depot/hosts/samhain/meta.nix @@ -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"; diff --git a/depot/hosts/samhain/nixos.nix b/depot/hosts/samhain/nixos.nix index 9d5a07e3..19000b6e 100644 --- a/depot/hosts/samhain/nixos.nix +++ b/depot/hosts/samhain/nixos.nix @@ -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 diff --git a/depot/hosts/yule/meta.nix b/depot/hosts/yule/meta.nix index 98f361f8..ff866ddc 100644 --- a/depot/hosts/yule/meta.nix +++ b/depot/hosts/yule/meta.nix @@ -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"; diff --git a/depot/hosts/yule/nixos.nix b/depot/hosts/yule/nixos.nix index be874285..9f3b87fe 100644 --- a/depot/hosts/yule/nixos.nix +++ b/depot/hosts/yule/nixos.nix @@ -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 diff --git a/depot/modules/meta/network.nix b/depot/modules/meta/network.nix index 7b47abcb..0c210459 100644 --- a/depot/modules/meta/network.nix +++ b/depot/modules/meta/network.nix @@ -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; }; }; diff --git a/depot/profiles/base/default.nix b/depot/profiles/base/default.nix index b4a3a98b..4175fc65 100644 --- a/depot/profiles/base/default.nix +++ b/depot/profiles/base/default.nix @@ -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 diff --git a/wiki b/wiki index 7426b920..b7cbb297 160000 --- a/wiki +++ b/wiki @@ -1 +1 @@ -Subproject commit 7426b9204cd919c2e9bc87254f9654e830bf34da +Subproject commit b7cbb2972190f2bf92fa20ee58d746a32bc639e1