depot -> meta for specialArgs, whee

default.nix

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

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";

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

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";

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

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";

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";

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

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";

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

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";

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

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;
       };
     };

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

wiki

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