From 779fb7e95e210b24af941b8665f9613bec778c96 Mon Sep 17 00:00:00 2001
From: Bryan Ramos <bryan@ramos.codes>
Date: Fri, 13 Mar 2026 09:32:19 -0400
Subject: [PATCH 1/2] fixed bindmounts

---
 .../bitcoin/modules/clightning/default.nix     | 12 ++++++++++--
 .../bitcoin/modules/electrum/default.nix       |  9 ++++++++-
 src/system/modules/forgejo/default.nix         | 15 +++++++++++----
 src/system/modules/immich/default.nix          | 18 ++++++++++++++++++
 4 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/src/system/modules/bitcoin/modules/clightning/default.nix b/src/system/modules/bitcoin/modules/clightning/default.nix
index f052e52..cc3a995 100644
--- a/src/system/modules/bitcoin/modules/clightning/default.nix
+++ b/src/system/modules/bitcoin/modules/clightning/default.nix
@@ -80,10 +80,18 @@ in
       };
     };
 
+    # Bind mount from /data
+    fileSystems.${home} = {
+      device = "/data/clightning";
+      fsType = "none";
+      options = [ "bind" ];
+    };
+
     # Ensure data directory exists with correct permissions
     systemd.tmpfiles.rules = mkAfter [
-      "d ${home} 0750 clightning bitcoin -"
-      "d ${home}/plugins 0750 clightning bitcoin -"
+      "d /data/clightning 0750 clightning bitcoin -"
+      "d /data/clightning/bitcoin 0750 clightning bitcoin -"
+      "d /data/clightning/plugins 0750 clightning bitcoin -"
       "L+ /home/${config.user.name}/.lightning - - - - ${home}"
       "L+ ${home}/plugins/clnrest - - - - ${clnrest}/libexec/c-lightning/plugins/clnrest"
     ];
diff --git a/src/system/modules/bitcoin/modules/electrum/default.nix b/src/system/modules/bitcoin/modules/electrum/default.nix
index 6673f4f..5a85770 100644
--- a/src/system/modules/bitcoin/modules/electrum/default.nix
+++ b/src/system/modules/bitcoin/modules/electrum/default.nix
@@ -88,9 +88,16 @@ in
       };
     };
 
+    # Bind mount from /data
+    fileSystems.${home} = {
+      device = "/data/electrs";
+      fsType = "none";
+      options = [ "bind" ];
+    };
+
     # Ensure db directory exists with correct permissions
     systemd.tmpfiles.rules = [
-      "d ${home} 0750 electrs bitcoin -"
+      "d /data/electrs 0750 electrs bitcoin -"
     ];
 
     # Nginx SSL proxy for Electrum protocol (TCP)
diff --git a/src/system/modules/forgejo/default.nix b/src/system/modules/forgejo/default.nix
index 7c04407..e68256c 100644
--- a/src/system/modules/forgejo/default.nix
+++ b/src/system/modules/forgejo/default.nix
@@ -26,11 +26,18 @@ in
       extraGroups = [ "git" ];
     };
 
+    # Bind mount from /data
+    fileSystems."/var/lib/forgejo" = {
+      device = "/data/forgejo";
+      fsType = "none";
+      options = [ "bind" ];
+    };
+
     systemd.tmpfiles.rules = [
-      "d /var/lib/forgejo 0750 git git -"
-      "d /var/lib/forgejo/.ssh 0700 git git -"
-      "d /var/lib/forgejo/custom 0750 git git -"
-      "d /var/lib/forgejo/data 0750 git git -"
+      "d /data/forgejo 0750 git git -"
+      "d /data/forgejo/.ssh 0700 git git -"
+      "d /data/forgejo/custom 0750 git git -"
+      "d /data/forgejo/data 0750 git git -"
     ];
 
     services.forgejo = {
diff --git a/src/system/modules/immich/default.nix b/src/system/modules/immich/default.nix
index 7ea2c54..c128479 100644
--- a/src/system/modules/immich/default.nix
+++ b/src/system/modules/immich/default.nix
@@ -14,6 +14,24 @@ in
   };
 
   config = mkIf cfg.enable {
+    # Bind mount from /data
+    systemd.tmpfiles.rules = [
+      "d /data/immich 0750 immich immich -"
+      "d /data/postgresql 0750 postgres postgres -"
+    ];
+
+    fileSystems."/var/lib/immich" = {
+      device = "/data/immich";
+      fsType = "none";
+      options = [ "bind" ];
+    };
+
+    fileSystems."/var/lib/postgresql" = {
+      device = "/data/postgresql";
+      fsType = "none";
+      options = [ "bind" ];
+    };
+
     services.immich = {
       enable = true;
       port = port;

From e011aa48d75eec676a26e55f3669ff16cc87f3e4 Mon Sep 17 00:00:00 2001
From: Bryan Ramos <bryan@ramos.codes>
Date: Fri, 13 Mar 2026 09:46:41 -0400
Subject: [PATCH 2/2] server done

---
 .../desktop/modules/home-manager/home.nix         | 15 +++++++++++++++
 .../bitcoin/modules/clightning/default.nix        |  1 +
 src/system/modules/immich/default.nix             |  1 +
 3 files changed, 17 insertions(+)

diff --git a/src/system/machines/desktop/modules/home-manager/home.nix b/src/system/machines/desktop/modules/home-manager/home.nix
index c4ff09d..10a5808 100644
--- a/src/system/machines/desktop/modules/home-manager/home.nix
+++ b/src/system/machines/desktop/modules/home-manager/home.nix
@@ -11,6 +11,21 @@
 
     programs.home-manager.enable = true;
 
+    programs.ssh = {
+      enable = true;
+      enableDefaultConfig = false;
+      matchBlocks = {
+        "*" = {
+          serverAliveInterval = 60;
+          serverAliveCountMax = 3;
+        };
+        "server" = {
+          hostname = "192.168.0.154";
+          user = "bryan";
+        };
+      };
+    };
+
     home.stateVersion = "23.11";
 
     home.username = "${config.user.name}";
diff --git a/src/system/modules/bitcoin/modules/clightning/default.nix b/src/system/modules/bitcoin/modules/clightning/default.nix
index cc3a995..7889819 100644
--- a/src/system/modules/bitcoin/modules/clightning/default.nix
+++ b/src/system/modules/bitcoin/modules/clightning/default.nix
@@ -98,6 +98,7 @@ in
 
     modules.system.backup.paths = [
       "${home}/bitcoin/hsm_secret"
+      "${home}/bitcoin/emergency.recover"
     ];
 
     services.nginx.virtualHosts."ln.${domain}" = mkIf nginx.enable {
diff --git a/src/system/modules/immich/default.nix b/src/system/modules/immich/default.nix
index c128479..031336d 100644
--- a/src/system/modules/immich/default.nix
+++ b/src/system/modules/immich/default.nix
@@ -42,6 +42,7 @@ in
 
     modules.system.backup.paths = [
       "/var/lib/immich"
+      "/var/lib/postgresql"
     ];
 
     services.nginx.virtualHosts."photos.${domain}" = mkIf nginx.enable {