From 0832307fc327cc0c5a7693cffd917ccef9151dd8 Mon Sep 17 00:00:00 2001
From: Gabriel Simmer <g@gmem.ca>
Date: Sat, 22 Jun 2024 22:56:41 +0100
Subject: [PATCH] Swap to Redict where possible, minor refactoring

---
 homelab/immich.nix     | 6 ++++++
 homelab/irc.nix        | 9 +++++++--
 homelab/nitter-bot.nix | 2 +-
 homelab/nitter.nix     | 5 +++++
 homelab/searxng.nix    | 7 ++++++-
 5 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/homelab/immich.nix b/homelab/immich.nix
index b31d56f..9f7f641 100644
--- a/homelab/immich.nix
+++ b/homelab/immich.nix
@@ -19,6 +19,7 @@
       immich.persistence.library.existingClaim = "immich";
       redis = {
         enabled = true;
+        
       };
       env = {
         PGSSLMODE = "no-verify";
@@ -58,4 +59,9 @@
       resources.requests.storage = "50Gi";
     };
   };
+
+  kubernetes.resources.statefulSets.immich-redis-master = {
+    metadata.namespace = "immich";
+    spec.template.spec.containers.redis.image = lib.mkForce "registry.redict.io/redict:7.3-compat";
+  };
 }
diff --git a/homelab/irc.nix b/homelab/irc.nix
index 53fccd7..32fc563 100644
--- a/homelab/irc.nix
+++ b/homelab/irc.nix
@@ -2,7 +2,12 @@ let
   appName = "soju";
   sojuImage = "git.gmem.ca/arch/soju:latest";
   gamjaImage = "git.gmem.ca/arch/gamja:latest";
-in {
+in   {
+  lib,
+  config,
+  kubenix,
+  ...
+}: {
   kubernetes.resources.services.soju = {
     metadata.namespace = "irc";
     spec = {
@@ -43,7 +48,7 @@ in {
         metadata.labels.app = appName;
         spec = {
           volumes = {
-            config.configMap.name = "soju";
+            config.configMap.name = config.kubernetes.resources.configMaps.soju.metadata.name;
             ssl.secret.secretName = "irc-gmem-ca";
           };
           containers = {
diff --git a/homelab/nitter-bot.nix b/homelab/nitter-bot.nix
index 7facf29..f4b2009 100644
--- a/homelab/nitter-bot.nix
+++ b/homelab/nitter-bot.nix
@@ -21,7 +21,7 @@ in
                 image = appImage;
                 envFrom = [
                   {secretRef.name = "nitter-bot";}
-                  {configMapRef.name = "nitter-bot";}
+                  {configMapRef.name = config.kubernetes.resources.configMaps.nitter-bot.metadata.name;}
                 ];
                 resources = {
                   requests = {
diff --git a/homelab/nitter.nix b/homelab/nitter.nix
index 6798735..5b74b33 100644
--- a/homelab/nitter.nix
+++ b/homelab/nitter.nix
@@ -84,6 +84,11 @@ in
       values = {
         auth.enabled = false;
         architecture = "standalone";
+        image = {
+          registry = "registry.redict.io";
+          repository = "redict";
+          tag = "7.3-compat";
+        };
       };
     };
     kubernetes.resources.ingresses.nitter = {
diff --git a/homelab/searxng.nix b/homelab/searxng.nix
index 1dd3baa..e16251d 100644
--- a/homelab/searxng.nix
+++ b/homelab/searxng.nix
@@ -27,7 +27,7 @@ in
           metadata.labels.app = appName;
           spec = {
             volumes = {
-              config.configMap.name = "searxng";
+              config.configMap.name = config.kubernetes.resources.configMaps.searxng.metadata.name;
             };
             containers = {
               searxng = {
@@ -104,6 +104,11 @@ in
       values = {
         auth.enabled = false;
         architecture = "standalone";
+        image = {
+          registry = "registry.redict.io";
+          repository = "redict";
+          tag = "7.3-compat";
+        };
       };
     };