From 6779ac1c65e9ce29292fa0fa13cc3f6e50670d22 Mon Sep 17 00:00:00 2001
From: arcnmx <arcnmx@users.noreply.github.com>
Date: Sat, 17 Dec 2022 18:44:05 -0800
Subject: [PATCH] building without tf state

---
 modules/meta/tailscale.nix   |  3 ++-
 nixos/systems/tewi/nixos.nix |  2 +-
 system/root.nix              |  4 +++-
 trusted/flake.lock           | 16 ++++++++--------
 trusted/flake.nix            |  4 +++-
 5 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/modules/meta/tailscale.nix b/modules/meta/tailscale.nix
index 80f66581..1b12640e 100644
--- a/modules/meta/tailscale.nix
+++ b/modules/meta/tailscale.nix
@@ -1,6 +1,7 @@
-{ config, pkgs, lib, root, ... }: with lib; let
+{ config, pkgs, lib, tree, ... }: with lib; let
   home = config.deploy.targets.home.tf;
 in {
+  imports = lib.optional (tree.pure.trusted ? modules.meta) tree.pure.trusted.modules.meta.tailscale;
   options = {
     tailnet_uri = mkOption {
       type = types.str;
diff --git a/nixos/systems/tewi/nixos.nix b/nixos/systems/tewi/nixos.nix
index ff6f1044..2e850134 100644
--- a/nixos/systems/tewi/nixos.nix
+++ b/nixos/systems/tewi/nixos.nix
@@ -15,7 +15,7 @@
     ./postgres.nix
     ./nginx.nix
     ../../gui/nfs.nix
-  ];
+  ] ++ lib.optional (meta.trusted ? nixos.systems.tewi.default) meta.trusted.nixos.systems.tewi.default;
 
   services.cockroachdb.locality = "provider=local,network=gensokyo,host=${config.networking.hostName}";
 
diff --git a/system/root.nix b/system/root.nix
index 13d09197..9692522a 100644
--- a/system/root.nix
+++ b/system/root.nix
@@ -1,3 +1,5 @@
-{ config, ... }: {
+{ config, meta, lib, ... }: {
+  imports = lib.optional (meta.trusted ? modules.nixos) meta.trusted.modules.nixos.deploy;
+
   home-manager.users.root.home.stateVersion = "20.09";
 }
diff --git a/trusted/flake.lock b/trusted/flake.lock
index 4a4aa5a7..5dcf8c58 100644
--- a/trusted/flake.lock
+++ b/trusted/flake.lock
@@ -610,18 +610,18 @@
     "trusted": {
       "flake": false,
       "locked": {
-        "lastModified": 1664745519,
-        "narHash": "sha256-tUNmmEjJ6KOOPkHCkJytv4KemXf4idM8erPQgOr7SWc=",
-        "ref": "main",
-        "rev": "f89074f4500dddb1962d49f3f542ce41d7beee87",
-        "revCount": 93,
+        "lastModified": 1671330960,
+        "narHash": "sha256-r8yqTEoOhZmTNlpThApRrZOAwc7+xrBBIXEk6nyx1pc=",
+        "ref": "shim",
+        "rev": "7848692e19091222d1fcafa51ffd48ceeb037ab6",
+        "revCount": 1,
         "type": "git",
-        "url": "ssh://git@github.com/kittywitch/nixfiles-trusted"
+        "url": "gcrypt::ssh://git@github.com/arcnmx/kat-nixfiles-trusted.git"
       },
       "original": {
-        "ref": "main",
+        "ref": "shim",
         "type": "git",
-        "url": "ssh://git@github.com/kittywitch/nixfiles-trusted"
+        "url": "gcrypt::ssh://git@github.com/arcnmx/kat-nixfiles-trusted.git"
       }
     },
     "ts-fold": {
diff --git a/trusted/flake.nix b/trusted/flake.nix
index f974ad31..ae525e0b 100644
--- a/trusted/flake.nix
+++ b/trusted/flake.nix
@@ -1,7 +1,9 @@
 {
   inputs = {
     trusted = {
-      url = "git+ssh://git@github.com/kittywitch/nixfiles-trusted?ref=main";
+      type = "git";
+      url = "gcrypt::ssh://git@github.com/arcnmx/kat-nixfiles-trusted.git";
+      ref = "shim";
       flake = false;
     };
     nixfiles = {