From aa1f72eecaf0e2422132a7a6f3015b6e19f912de Mon Sep 17 00:00:00 2001
From: kat witch <kat@kittywit.ch>
Date: Mon, 26 Apr 2021 01:29:39 +0100
Subject: [PATCH] ygg: Added grimoire (phone)

---
 hosts/dummy/nixos/default.nix     | 11 ++++++++---
 lib/deploy.nix                    | 12 ++++++++----
 profiles/common/nixos/default.nix |  1 -
 profiles/common/nixos/net.nix     |  5 -----
 4 files changed, 16 insertions(+), 13 deletions(-)
 delete mode 100644 profiles/common/nixos/net.nix

diff --git a/hosts/dummy/nixos/default.nix b/hosts/dummy/nixos/default.nix
index 8dd0b45d..d5cc8a5a 100644
--- a/hosts/dummy/nixos/default.nix
+++ b/hosts/dummy/nixos/default.nix
@@ -18,10 +18,15 @@ in {
     enable = true;
     pubkey = "0000000000000000000000000000000000000000000000000000000000000000";
     listen.enable = true;
-    listen.endpoints = flatten (map (c: c.listen.endpoints) (filter (c: c.listen.enable) (attrValues hexYgg)));
+    listen.endpoints = flatten (map (c: c.listen.endpoints)
+      (filter (c: c.listen.enable) (attrValues hexYgg)));
     extra.pubkeys = {
-      satorin = "53d99a74a648ff7bd5bc9ba68ef4f472fb4fb8b2e26dfecea33c781f0d5c9525";
-      shanghai = "0cc3c26366cbfddfb1534b25c5655733d8f429edc941bcce674c46566fc87027";
+      satorin =
+        "53d99a74a648ff7bd5bc9ba68ef4f472fb4fb8b2e26dfecea33c781f0d5c9525";
+      shanghai =
+        "0cc3c26366cbfddfb1534b25c5655733d8f429edc941bcce674c46566fc87027";
+      grimoire =
+        "2a1567a2848540070328c9e938c58d40f2b1a3f08982c15c7edc5dcabfde3330";
     } // (mapAttrs (_: c: c.pubkey) hexYgg);
   };
 
diff --git a/lib/deploy.nix b/lib/deploy.nix
index 593ba59a..0673ad57 100644
--- a/lib/deploy.nix
+++ b/lib/deploy.nix
@@ -17,10 +17,14 @@ let
         config = mkMerge (map (hostName:
           mapAttrs (_: mkMerge) hosts.${hostName}.config.deploy.tf.out.set)
           target);
-      }] ++ concatMap (hostName:
-        filter builtins.pathExists
-        (map (profile: ../profiles + "/${profile}/meta.nix") (attrNames
-          (filterAttrs (_: id) hosts.${hostName}.config.deploy.profile))))
+      }] ++ optional
+        (builtins.pathExists (../private/targets + "/${targetName}"))
+        (../private/targets + "/${targetName}")
+        ++ optional (builtins.pathExists (../targets + "/${targetName}"))
+        (../targets + "/${targetName}") ++ concatMap (hostName:
+          filter builtins.pathExists
+          (map (profile: ../profiles + "/${profile}/meta.nix") (attrNames
+            (filterAttrs (_: id) hosts.${hostName}.config.deploy.profile))))
         target;
 
       deps = {
diff --git a/profiles/common/nixos/default.nix b/profiles/common/nixos/default.nix
index 3cc37fc5..eeffc10d 100644
--- a/profiles/common/nixos/default.nix
+++ b/profiles/common/nixos/default.nix
@@ -3,7 +3,6 @@
 {
   imports = [
     ./system.nix
-    ./net.nix
     ./access.nix
     ./locale.nix
     ./nix.nix
diff --git a/profiles/common/nixos/net.nix b/profiles/common/nixos/net.nix
deleted file mode 100644
index 8188cde8..00000000
--- a/profiles/common/nixos/net.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ config, lib, pkgs, sources, ... }:
-
-{
-  services.tailscale.enable = true;
-}