From 57c51c4f7cdf14735dc43b65578006c39758e532 Mon Sep 17 00:00:00 2001
From: min <minish@riseup.net>
Date: Sun, 22 Dec 2024 00:24:33 -0500
Subject: [PATCH] Refactor eidola (services dir)

---
 .sops.yaml                                  | 12 ------------
 nixos/hosts/eidola/configuration.nix        |  3 ++-
 nixos/hosts/eidola/services/default.nix     |  5 +++++
 nixos/hosts/eidola/{ => services}/samba.nix |  0
 4 files changed, 7 insertions(+), 13 deletions(-)
 create mode 100644 nixos/hosts/eidola/services/default.nix
 rename nixos/hosts/eidola/{ => services}/samba.nix (100%)

diff --git a/.sops.yaml b/.sops.yaml
index 221be7c..a21a8f7 100644
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -3,18 +3,6 @@ keys:
   - &eidola age1uqxzduupzes3tgfrrlret0n6thyldmlef60nqfzk689lmg6yayvsqpwxj6
   - &silver age19yhycdgqczrvttszq97ccljh684x3r7f5dj4p0wdwqsrusqlcayse0vsh3
 creation_rules:
-  - path_regex: k8s/.*/secrets/.*\.yaml$
-    encrypted_regex: "^(data|stringData)$"
-    key_groups:
-      - pgp:
-          - *min
-  - path_regex: secrets/k3s-token\.txt$
-    key_groups:
-      - pgp:
-          - *min
-        age:
-          - *silver
-          - *eidola
   - path_regex: secrets/eidola\.yaml$
     key_groups:
       - pgp:
diff --git a/nixos/hosts/eidola/configuration.nix b/nixos/hosts/eidola/configuration.nix
index e781c8e..37a483a 100644
--- a/nixos/hosts/eidola/configuration.nix
+++ b/nixos/hosts/eidola/configuration.nix
@@ -4,13 +4,14 @@
   ...
 }: {
   imports = [
+    ./services
+
     ./hardware.nix
     ./disk-config.nix
     ./mounts.nix
     ./secrets.nix
     ./nebula.nix
     ./zfs.nix
-    ./samba.nix
     ./prometheus.nix
   ];
 
diff --git a/nixos/hosts/eidola/services/default.nix b/nixos/hosts/eidola/services/default.nix
new file mode 100644
index 0000000..70956a6
--- /dev/null
+++ b/nixos/hosts/eidola/services/default.nix
@@ -0,0 +1,5 @@
+{...}: {
+  imports = [
+    ./samba.nix
+  ];
+}
diff --git a/nixos/hosts/eidola/samba.nix b/nixos/hosts/eidola/services/samba.nix
similarity index 100%
rename from nixos/hosts/eidola/samba.nix
rename to nixos/hosts/eidola/services/samba.nix