From 441b7e062f49b70ed14625a3ec70be4f130ce558 Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <contact@ingolf-wagner.de>
Date: Wed, 19 Jun 2024 13:19:55 +0200
Subject: [PATCH] clanCore -> clan.core

---
 components/network/syncthing.nix                    |  6 +++---
 components/network/tinc/private.nix                 |  4 ++--
 components/network/tinc/secret.nix                  |  4 ++--
 components/nixos/tor-ssh.nix                        |  6 +++---
 machines/cherry/configuration.nix                   |  2 +-
 machines/cherry/hardware-configuration/default.nix  |  4 ++--
 machines/cherry/network-tinc_retiolum.nix           |  6 +++---
 machines/cherry/network-wireguard.nix               |  8 ++++----
 machines/chungus/hardware-configuration/default.nix |  4 ++--
 machines/chungus/network-tinc-retiolum.nix          |  6 +++---
 machines/chungus/network-wireguard.nix              |  8 ++++----
 machines/chungus/services-s3.nix                    |  4 ++--
 machines/chungus/sync-rbackup.nix                   | 12 ++++++------
 machines/chungus/sync-syncoid.nix                   |  4 ++--
 machines/chungus/taskwarrior-autotag.nix            |  8 ++++----
 machines/cream/network-tinc_retiolum.nix            |  6 +++---
 machines/cream/network-wireguard.nix                |  8 ++++----
 machines/orbi/hardware-configuration/default.nix    |  4 ++--
 machines/orbi/media-nextcloud.nix                   |  8 ++++----
 machines/orbi/network-wireguard.nix                 |  6 +++---
 machines/orbi/service-photoprism.nix                |  1 +
 machines/orbi/social-matrix-terranix.nix            |  4 ++--
 22 files changed, 62 insertions(+), 61 deletions(-)

diff --git a/components/network/syncthing.nix b/components/network/syncthing.nix
index 1af1f22..1dae709 100644
--- a/components/network/syncthing.nix
+++ b/components/network/syncthing.nix
@@ -13,13 +13,13 @@ with lib; {
 
   # networking.firewall.interfaces."gummybears".allowedTCPPorts = [ 8384 ];
 
-  clanCore.facts.services.syncthing = factsGenerator.syncthing { };
+  clan.core.facts.services.syncthing = factsGenerator.syncthing { };
 
   services.syncthing = {
     guiAddress = lib.mkDefault "${config.networking.hostName}.private:8384";
     overrideDevices = lib.mkDefault true;
-    key = config.clanCore.facts.services.syncthing.secret."syncthing.key".path;
-    cert = config.clanCore.facts.services.syncthing.secret."syncthing.cert".path;
+    key = config.clan.core.facts.services.syncthing.secret."syncthing.key".path;
+    cert = config.clan.core.facts.services.syncthing.secret."syncthing.cert".path;
     settings.devices =
       let
         device = machine: id: {
diff --git a/components/network/tinc/private.nix b/components/network/tinc/private.nix
index 9a36725..9867819 100644
--- a/components/network/tinc/private.nix
+++ b/components/network/tinc/private.nix
@@ -61,11 +61,11 @@ in
 {
   networking.firewall.trustedInterfaces = [ "tinc.${network}" ];
 
-  clanCore.facts.services.tinc_private = factsGenerator.tinc { name = "private"; };
+  clan.core.facts.services.tinc_private = factsGenerator.tinc { name = "private"; };
 
   services.tinc.networks = {
     ${network} = {
-      ed25519PrivateKeyFile = config.clanCore.facts.services.tinc_private.secret."tinc.private.ed25519_key.priv".path;
+      ed25519PrivateKeyFile = config.clan.core.facts.services.tinc_private.secret."tinc.private.ed25519_key.priv".path;
       interfaceType = "tap";
       extraConfig = ''
         LocalDiscovery = yes
diff --git a/components/network/tinc/secret.nix b/components/network/tinc/secret.nix
index 0f2336f..5728a9f 100644
--- a/components/network/tinc/secret.nix
+++ b/components/network/tinc/secret.nix
@@ -19,11 +19,11 @@ let
   network = "secret";
 in
 {
-  clanCore.facts.services.tinc_secret = factsGenerator.tinc { name = "secret"; };
+  clan.core.facts.services.tinc_secret = factsGenerator.tinc { name = "secret"; };
 
   services.tinc.networks = {
     ${network} = {
-      ed25519PrivateKeyFile = config.clanCore.facts.services.tinc_secret.secret."tinc.secret.ed25519_key.priv".path;
+      ed25519PrivateKeyFile = config.clan.core.facts.services.tinc_secret.secret."tinc.secret.ed25519_key.priv".path;
       extraConfig = ''
         LocalDiscovery = yes
         Port = ${toString port}
diff --git a/components/nixos/tor-ssh.nix b/components/nixos/tor-ssh.nix
index 0ba6b0f..26acf6d 100644
--- a/components/nixos/tor-ssh.nix
+++ b/components/nixos/tor-ssh.nix
@@ -64,11 +64,11 @@ with types;
       #};
 
       # tor setup
-      clanCore.facts.services.initrd_tor = factsGenerator.tor { name = "initrd"; };
+      clan.core.facts.services.initrd_tor = factsGenerator.tor { name = "initrd"; };
 
       boot.initrd.secrets = {
-        "/etc/tor/onion/bootup/tor.priv" = config.clanCore.facts.services.initrd_tor.secret."tor.initrd.priv".path;
-        "/etc/tor/onion/bootup/hostname" = config.clanCore.facts.services.initrd_tor.secret."tor.initrd.hostname".path;
+        "/etc/tor/onion/bootup/tor.priv" = config.clan.core.facts.services.initrd_tor.secret."tor.initrd.priv".path;
+        "/etc/tor/onion/bootup/hostname" = config.clan.core.facts.services.initrd_tor.secret."tor.initrd.hostname".path;
       };
 
       #boot.initrd.extraUtilsCommands = ''
diff --git a/machines/cherry/configuration.nix b/machines/cherry/configuration.nix
index 24b53e7..775e816 100644
--- a/machines/cherry/configuration.nix
+++ b/machines/cherry/configuration.nix
@@ -20,7 +20,7 @@
   ];
 
 
-  #clanCore.facts.services =
+  #clan.core.facts.services =
   #  let
   #    promptKey = key:
   #      {
diff --git a/machines/cherry/hardware-configuration/default.nix b/machines/cherry/hardware-configuration/default.nix
index 2568ccd..141fce2 100644
--- a/machines/cherry/hardware-configuration/default.nix
+++ b/machines/cherry/hardware-configuration/default.nix
@@ -12,8 +12,8 @@
   # ZFS stuff
   # ---------
   boot.supportedFilesystems = [ "zfs" ];
-  clanCore.facts.services.zfs = factsGenerator.zfs { };
-  networking.hostId = config.clanCore.facts.services.zfs.public."zfs.hostId".value;
+  clan.core.facts.services.zfs = factsGenerator.zfs { };
+  networking.hostId = config.clan.core.facts.services.zfs.public."zfs.hostId".value;
   services.zfs.autoSnapshot.enable = true;
 
   # todo not needed anymore if srvos is used
diff --git a/machines/cherry/network-tinc_retiolum.nix b/machines/cherry/network-tinc_retiolum.nix
index bd37a07..31c4b1d 100644
--- a/machines/cherry/network-tinc_retiolum.nix
+++ b/machines/cherry/network-tinc_retiolum.nix
@@ -1,14 +1,14 @@
 { config, factsGenerator, ... }:
 {
 
-  clanCore.facts.services.tinc_retiolum = factsGenerator.tinc { name = "retiolum"; };
+  clan.core.facts.services.tinc_retiolum = factsGenerator.tinc { name = "retiolum"; };
 
   networking.retiolum.port = 720;
   networking.retiolum.nodename = "cherry";
 
   services.tinc.networks.retiolum = {
-    ed25519PrivateKeyFile = config.clanCore.facts.services.tinc_retiolum.secret."tinc.retiolum.ed25519_key.priv".path;
-    rsaPrivateKeyFile = config.clanCore.facts.services.tinc_retiolum.secret."tinc.retiolum.rsa_key.priv".path;
+    ed25519PrivateKeyFile = config.clan.core.facts.services.tinc_retiolum.secret."tinc.retiolum.ed25519_key.priv".path;
+    rsaPrivateKeyFile = config.clan.core.facts.services.tinc_retiolum.secret."tinc.retiolum.rsa_key.priv".path;
   };
 
   #fileSystems."/retiolum/sicily" = {
diff --git a/machines/cherry/network-wireguard.nix b/machines/cherry/network-wireguard.nix
index 2cab941..f509825 100644
--- a/machines/cherry/network-wireguard.nix
+++ b/machines/cherry/network-wireguard.nix
@@ -1,8 +1,8 @@
 { config, factsGenerator, clanLib, ... }:
 {
   networking.firewall.allowedUDPPorts = [ 51820 ];
-  clanCore.facts.services.wireguard = factsGenerator.wireguard { name = "wg0"; };
-  clanCore.facts.services.wireguard_ip = factsGenerator.public {
+  clan.core.facts.services.wireguard = factsGenerator.wireguard { name = "wg0"; };
+  clan.core.facts.services.wireguard_ip = factsGenerator.public {
     "wireguard.wg0.cidr" = "10.100.0.7/32";
     "wireguard.wg0.ip" = "10.100.0.7";
   };
@@ -13,10 +13,10 @@
     # https://www.procustodibus.com/blog/2020/11/wireguard-hub-and-spoke-config/
     wg0 = {
       address = [
-        config.clanCore.facts.services.wireguard_ip.public."wireguard.wg0.cidr".value
+        config.clan.core.facts.services.wireguard_ip.public."wireguard.wg0.cidr".value
       ];
       listenPort = 51820; # to match firewall allowedUDPPorts (without this wg uses random port numbers)
-      privateKeyFile = config.clanCore.facts.services.wireguard.secret."wireguard.wg0.key".path;
+      privateKeyFile = config.clan.core.facts.services.wireguard.secret."wireguard.wg0.key".path;
       mtu = 1280;
 
       peers = [
diff --git a/machines/chungus/hardware-configuration/default.nix b/machines/chungus/hardware-configuration/default.nix
index 7fbcf86..60488a0 100644
--- a/machines/chungus/hardware-configuration/default.nix
+++ b/machines/chungus/hardware-configuration/default.nix
@@ -10,8 +10,8 @@
   boot.tmp.useTmpfs = true; # make /tmp a tmpfs (performance!)
 
   boot.supportedFilesystems = [ "zfs" ];
-  clanCore.facts.services.zfs = factsGenerator.zfs { };
-  networking.hostId = toString config.clanCore.facts.services.zfs.public."zfs.hostId".value;
+  clan.core.facts.services.zfs = factsGenerator.zfs { };
+  networking.hostId = toString config.clan.core.facts.services.zfs.public."zfs.hostId".value;
   services.zfs = {
     autoSnapshot.enable = true;
     autoScrub.enable = true;
diff --git a/machines/chungus/network-tinc-retiolum.nix b/machines/chungus/network-tinc-retiolum.nix
index 724d3eb..2bac2d0 100644
--- a/machines/chungus/network-tinc-retiolum.nix
+++ b/machines/chungus/network-tinc-retiolum.nix
@@ -1,12 +1,12 @@
 { config, factsGenerator, ... }:
 {
-  clanCore.facts.services.tinc_retiolum = factsGenerator.tinc { name = "retiolum"; };
+  clan.core.facts.services.tinc_retiolum = factsGenerator.tinc { name = "retiolum"; };
 
   networking.retiolum.port = 720;
   networking.retiolum.nodename = "centauri";
 
   services.tinc.networks.retiolum = {
-    ed25519PrivateKeyFile = config.clanCore.facts.services.tinc_retiolum.secret."tinc.retiolum.ed25519_key.priv".path;
-    rsaPrivateKeyFile = config.clanCore.facts.services.tinc_retiolum.secret."tinc.retiolum.rsa_key.priv".path;
+    ed25519PrivateKeyFile = config.clan.core.facts.services.tinc_retiolum.secret."tinc.retiolum.ed25519_key.priv".path;
+    rsaPrivateKeyFile = config.clan.core.facts.services.tinc_retiolum.secret."tinc.retiolum.rsa_key.priv".path;
   };
 }
diff --git a/machines/chungus/network-wireguard.nix b/machines/chungus/network-wireguard.nix
index fa22c0a..ad538fc 100644
--- a/machines/chungus/network-wireguard.nix
+++ b/machines/chungus/network-wireguard.nix
@@ -1,8 +1,8 @@
 { config, factsGenerator, clanLib, ... }:
 {
   networking.firewall.allowedUDPPorts = [ 51820 ];
-  clanCore.facts.services.wireguard = factsGenerator.wireguard { name = "wg0"; };
-  clanCore.facts.services.wireguard_ip = factsGenerator.public {
+  clan.core.facts.services.wireguard = factsGenerator.wireguard { name = "wg0"; };
+  clan.core.facts.services.wireguard_ip = factsGenerator.public {
     "wireguard.wg0.cidr" = "10.100.0.2/32";
     "wireguard.wg0.ip" = "10.100.0.2";
   };
@@ -13,10 +13,10 @@
     # https://www.procustodibus.com/blog/2020/11/wireguard-hub-and-spoke-config/
     wg0 = {
       address = [
-        config.clanCore.facts.services.wireguard_ip.public."wireguard.wg0.cidr".value
+        config.clan.core.facts.services.wireguard_ip.public."wireguard.wg0.cidr".value
       ];
       listenPort = 51820; # to match firewall allowedUDPPorts (without this wg uses random port numbers)
-      privateKeyFile = config.clanCore.facts.services.wireguard.secret."wireguard.wg0.key".path;
+      privateKeyFile = config.clan.core.facts.services.wireguard.secret."wireguard.wg0.key".path;
       mtu = 1280;
 
       peers = [
diff --git a/machines/chungus/services-s3.nix b/machines/chungus/services-s3.nix
index 16532e5..db5112a 100644
--- a/machines/chungus/services-s3.nix
+++ b/machines/chungus/services-s3.nix
@@ -1,12 +1,12 @@
 { config, factsGenerator, ... }:
 {
 
-  clanCore.facts.services.s3 = factsGenerator.password { name = "root"; service = "s3"; };
+  clan.core.facts.services.s3 = factsGenerator.password { name = "root"; service = "s3"; };
 
   services.minio = {
     enable = true;
     region = "home";
-    rootCredentialsFile = config.clanCore.facts.services.s3.secret."s3.root".path;
+    rootCredentialsFile = config.clan.core.facts.services.s3.secret."s3.root".path;
   };
 
   services.nginx = {
diff --git a/machines/chungus/sync-rbackup.nix b/machines/chungus/sync-rbackup.nix
index 63f81a9..2213cf6 100644
--- a/machines/chungus/sync-rbackup.nix
+++ b/machines/chungus/sync-rbackup.nix
@@ -3,33 +3,33 @@ let
   tld = config.clan.static-hosts.topLevelDomain;
 in
 {
-  clanCore.facts.services.rbackup = factsGenerator.ssh { name = "rbackup"; };
+  clan.core.facts.services.rbackup = factsGenerator.ssh { name = "rbackup"; };
 
   # todo : replace all of them with syncoid
   rbackup.plans = {
     git = {
-      sshKeyPath = config.clanCore.facts.services.rbackup.secret."ssh.rbackup.id_ed25519".path;
+      sshKeyPath = config.clan.core.facts.services.rbackup.secret."ssh.rbackup.id_ed25519".path;
       src = "root@orbi.${tld}:/var/lib/forgejo/";
       dst = "/mirror/git";
     };
     taskwarrior = {
-      sshKeyPath = config.clanCore.facts.services.rbackup.secret."ssh.rbackup.id_ed25519".path;
+      sshKeyPath = config.clan.core.facts.services.rbackup.secret."ssh.rbackup.id_ed25519".path;
       src = "root@orbi.${tld}:/var/lib/taskserver/";
       dst = "/mirror/taskwarrior";
     };
     vaultwarden = {
-      sshKeyPath = config.clanCore.facts.services.rbackup.secret."ssh.rbackup.id_ed25519".path;
+      sshKeyPath = config.clan.core.facts.services.rbackup.secret."ssh.rbackup.id_ed25519".path;
       src = "root@orbi.${tld}:/var/lib/bitwarden_rs/";
       dst = "/mirror/vaultwarden";
     };
     radarr = {
-      sshKeyPath = config.clanCore.facts.services.rbackup.secret."ssh.rbackup.id_ed25519".path;
+      sshKeyPath = config.clan.core.facts.services.rbackup.secret."ssh.rbackup.id_ed25519".path;
       src = "root@orbi.${tld}:/media/arr/radarr";
       dst = "/media/arr/radarr";
       delete = false;
     };
     sonarr = {
-      sshKeyPath = config.clanCore.facts.services.rbackup.secret."ssh.rbackup.id_ed25519".path;
+      sshKeyPath = config.clan.core.facts.services.rbackup.secret."ssh.rbackup.id_ed25519".path;
       src = "root@orbi.${tld}:/media/arr/sonarr";
       dst = "/media/arr/sonarr";
       delete = false;
diff --git a/machines/chungus/sync-syncoid.nix b/machines/chungus/sync-syncoid.nix
index 87821db..3846161 100644
--- a/machines/chungus/sync-syncoid.nix
+++ b/machines/chungus/sync-syncoid.nix
@@ -4,13 +4,13 @@ let
 in
 {
 
-  clanCore.facts.services.syncoid = factsGenerator.ssh { name = "syncoid"; };
+  clan.core.facts.services.syncoid = factsGenerator.ssh { name = "syncoid"; };
   systemd.tmpfiles.settings.syncoid = {
     "/run/facts/ssh.syncoid.id_ed25519"."C+" = {
       user = config.services.syncoid.user;
       group = config.services.syncoid.group;
       mode = "400";
-      argument = config.clanCore.facts.services.syncoid.secret."ssh.syncoid.id_ed25519".path;
+      argument = config.clan.core.facts.services.syncoid.secret."ssh.syncoid.id_ed25519".path;
     };
   };
 
diff --git a/machines/chungus/taskwarrior-autotag.nix b/machines/chungus/taskwarrior-autotag.nix
index 1717fb6..521e8ec 100644
--- a/machines/chungus/taskwarrior-autotag.nix
+++ b/machines/chungus/taskwarrior-autotag.nix
@@ -2,7 +2,7 @@
 
 {
 
-  clanCore.facts.services.taskserver = {
+  clan.core.facts.services.taskserver = {
     secret."taskserver.ca" = { };
     secret."taskserver.cert" = { };
     secret."taskserver.key" = { };
@@ -34,9 +34,9 @@
 
     credentials = "1337/palo/ad40dce8-4b38-4011-b032-60a91b6f22cd";
 
-    caFile = config.clanCore.facts.services.taskserver.secret."taskserver.ca".path;
-    certificateFile = config.clanCore.facts.services.taskserver.secret."taskserver.cert".path;
-    keyFile = config.clanCore.facts.services.taskserver.secret."taskserver.key".path;
+    caFile = config.clan.core.facts.services.taskserver.secret."taskserver.ca".path;
+    certificateFile = config.clan.core.facts.services.taskserver.secret."taskserver.cert".path;
+    keyFile = config.clan.core.facts.services.taskserver.secret."taskserver.key".path;
   };
 
 }
diff --git a/machines/cream/network-tinc_retiolum.nix b/machines/cream/network-tinc_retiolum.nix
index b056bba..f71459c 100644
--- a/machines/cream/network-tinc_retiolum.nix
+++ b/machines/cream/network-tinc_retiolum.nix
@@ -1,14 +1,14 @@
 { config, factsGenerator, ... }:
 {
 
-  clanCore.facts.services.tinc_retiolum = factsGenerator.tinc { name = "retiolum"; };
+  clan.core.facts.services.tinc_retiolum = factsGenerator.tinc { name = "retiolum"; };
 
   networking.retiolum.port = 720;
   networking.retiolum.nodename = "sol";
 
   services.tinc.networks.retiolum = {
-    ed25519PrivateKeyFile = config.clanCore.facts.services.tinc_retiolum.secret."tinc.retiolum.ed25519_key.priv".path;
-    rsaPrivateKeyFile = config.clanCore.facts.services.tinc_retiolum.secret."tinc.retiolum.rsa_key.priv".path;
+    ed25519PrivateKeyFile = config.clan.core.facts.services.tinc_retiolum.secret."tinc.retiolum.ed25519_key.priv".path;
+    rsaPrivateKeyFile = config.clan.core.facts.services.tinc_retiolum.secret."tinc.retiolum.rsa_key.priv".path;
   };
 
   #fileSystems."/retiolum/sicily" = {
diff --git a/machines/cream/network-wireguard.nix b/machines/cream/network-wireguard.nix
index f5c147a..b139c7a 100644
--- a/machines/cream/network-wireguard.nix
+++ b/machines/cream/network-wireguard.nix
@@ -1,8 +1,8 @@
 { config, factsGenerator, clanLib, ... }:
 {
   networking.firewall.allowedUDPPorts = [ 51820 ];
-  clanCore.facts.services.wireguard = factsGenerator.wireguard { name = "wg0"; };
-  clanCore.facts.services.wireguard_ip = factsGenerator.public {
+  clan.core.facts.services.wireguard = factsGenerator.wireguard { name = "wg0"; };
+  clan.core.facts.services.wireguard_ip = factsGenerator.public {
     "wireguard.wg0.cidr" = "10.100.0.6/32";
     "wireguard.wg0.ip" = "10.100.0.6";
   };
@@ -13,10 +13,10 @@
     # https://www.procustodibus.com/blog/2020/11/wireguard-hub-and-spoke-config/
     wg0 = {
       address = [
-        config.clanCore.facts.services.wireguard_ip.public."wireguard.wg0.cidr".value
+        config.clan.core.facts.services.wireguard_ip.public."wireguard.wg0.cidr".value
       ];
       listenPort = 51820; # to match firewall allowedUDPPorts (without this wg uses random port numbers)
-      privateKeyFile = config.clanCore.facts.services.wireguard.secret."wireguard.wg0.key".path;
+      privateKeyFile = config.clan.core.facts.services.wireguard.secret."wireguard.wg0.key".path;
       mtu = 1280;
 
       peers = [
diff --git a/machines/orbi/hardware-configuration/default.nix b/machines/orbi/hardware-configuration/default.nix
index d994a8c..2958053 100644
--- a/machines/orbi/hardware-configuration/default.nix
+++ b/machines/orbi/hardware-configuration/default.nix
@@ -51,8 +51,8 @@ in
   boot.tmp.useTmpfs = true; # make /tmp a tmpfs (performance!)
 
   boot.supportedFilesystems = [ "zfs" ];
-  clanCore.facts.services.zfs = factsGenerator.zfs { };
-  networking.hostId = config.clanCore.facts.services.zfs.public."zfs.hostId".value;
+  clan.core.facts.services.zfs = factsGenerator.zfs { };
+  networking.hostId = config.clan.core.facts.services.zfs.public."zfs.hostId".value;
 
   systemd.network.networks."10-uplink".networkConfig.Address = ipv6.address;
   boot.initrd.systemd.network.networks."10-uplink" = config.systemd.network.networks."10-uplink";
diff --git a/machines/orbi/media-nextcloud.nix b/machines/orbi/media-nextcloud.nix
index 28fb259..5d32b26 100644
--- a/machines/orbi/media-nextcloud.nix
+++ b/machines/orbi/media-nextcloud.nix
@@ -51,8 +51,8 @@ in
     };
   };
 
-  clanCore.facts.services.nextcloud_root = factsGenerator.password { service = "nextcloud"; name = "root"; };
-  clanCore.facts.services.nextcloud_database = factsGenerator.password { service = "nextcloud"; name = "database"; };
+  clan.core.facts.services.nextcloud_root = factsGenerator.password { service = "nextcloud"; name = "root"; };
+  clan.core.facts.services.nextcloud_database = factsGenerator.password { service = "nextcloud"; name = "database"; };
 
   # Container Setup
   # ===============
@@ -64,12 +64,12 @@ in
 
     bindMounts = {
       rootpassword = {
-        hostPath = config.clanCore.facts.services.nextcloud_root.secret."nextcloud.root".path;
+        hostPath = config.clan.core.facts.services.nextcloud_root.secret."nextcloud.root".path;
         mountPoint = "/run/secrets/nextcloud.root.intput";
         isReadOnly = true;
       };
       databasepassword = {
-        hostPath = config.clanCore.facts.services.nextcloud_database.secret."nextcloud.database".path;
+        hostPath = config.clan.core.facts.services.nextcloud_database.secret."nextcloud.database".path;
         mountPoint = "/run/secrets/nextcloud.database.input";
         isReadOnly = true;
       };
diff --git a/machines/orbi/network-wireguard.nix b/machines/orbi/network-wireguard.nix
index 2df5eb2..8f314de 100644
--- a/machines/orbi/network-wireguard.nix
+++ b/machines/orbi/network-wireguard.nix
@@ -13,8 +13,8 @@ let
 in
 {
   networking.firewall.allowedUDPPorts = [ 51820 ];
-  clanCore.facts.services.wireguard = factsGenerator.wireguard { name = "wg0"; };
-  clanCore.facts.services.wireguard_ip = factsGenerator.public {
+  clan.core.facts.services.wireguard = factsGenerator.wireguard { name = "wg0"; };
+  clan.core.facts.services.wireguard_ip = factsGenerator.public {
     "wireguard.wg0.endpoint" = "95.216.66.212:51820";
     "wireguard.wg0.cidr" = "10.100.0.1/24";
     "wireguard.wg0.ip" = "10.100.0.1";
@@ -29,7 +29,7 @@ in
     wg0 = {
       address = [ "10.100.0.1/32" ];
       listenPort = 51820; # to match firewall allowedUDPPorts (without this wg uses random port numbers)
-      privateKeyFile = config.clanCore.facts.services.wireguard.secret."wireguard.wg0.key".path;
+      privateKeyFile = config.clan.core.facts.services.wireguard.secret."wireguard.wg0.key".path;
       mtu = 1280;
 
       postUp = ''
diff --git a/machines/orbi/service-photoprism.nix b/machines/orbi/service-photoprism.nix
index 0a028bd..40a76b0 100644
--- a/machines/orbi/service-photoprism.nix
+++ b/machines/orbi/service-photoprism.nix
@@ -23,6 +23,7 @@ in
       services.photoprism = {
         enable = true;
         port = photoprismPort;
+        package = pkgs.unstable-small.photoprism;
         originalsPath = "/var/lib/private/photoprism/originals";
         address = "0.0.0.0";
         settings = {
diff --git a/machines/orbi/social-matrix-terranix.nix b/machines/orbi/social-matrix-terranix.nix
index a74abd4..94e409b 100644
--- a/machines/orbi/social-matrix-terranix.nix
+++ b/machines/orbi/social-matrix-terranix.nix
@@ -11,7 +11,7 @@ let
   synapse_port = 8008;
   federation_port = 8448;
 
-  shared_secret = config.clanCore.facts.services.matrix_terranix.secret."matrix-synapse.terranix.registration_shared_secret.yml";
+  shared_secret = config.clan.core.facts.services.matrix_terranix.secret."matrix-synapse.terranix.registration_shared_secret.yml";
 
   matrix_create_user = pkgs.writers.writeBashBin "matrix-create-user-${name}" ''
     ${pkgs.matrix-synapse}/bin/register_new_matrix_user \
@@ -48,7 +48,7 @@ in
   networking.firewall.allowedTCPPorts = [ 80 443 federation_port ];
   networking.firewall.allowedUDPPorts = [ 80 443 federation_port ];
 
-  clanCore.facts.services.matrix_terranix = factsGenerator.matrix-synapse { name = "terranix"; };
+  clan.core.facts.services.matrix_terranix = factsGenerator.matrix-synapse { name = "terranix"; };
 
   environment.systemPackages = [ matrix_create_user ];