From 51fdc827f15c0bf711e0f8cdcdf9acc1f4a8f09c Mon Sep 17 00:00:00 2001
From: Maxiem Geldhof <author@maxiemgeldhof.com>
Date: Mon, 3 Nov 2025 20:01:39 +0100
Subject: [PATCH] Add smb mount instead

---
 keys/mullvad               | Bin 723 -> 731 bytes
 keys/secrets.nix           |   1 +
 keys/smbshare              |  13 +++++++++++++
 systems/ren/volumes.nix    |  26 ++++++++++++++++----------
 systems/selene/volumes.nix |  37 ++++++++++++++++++++-----------------
 5 files changed, 50 insertions(+), 27 deletions(-)
 create mode 100644 keys/smbshare

diff --git a/keys/mullvad b/keys/mullvad
index da57b94226774909629747eb6daa280d68968ce4..ad9d62922760f168d35f792ad3b34435bdd7198d 100644
GIT binary patch
delta 678
zcmcc2dYg5EZoPj<L|&LvU{0BTNo0P6cA<GjR+eRnzHykgQAnj{WxiXGaaCAWNP%N0
zmz%Fgeo?4lfv>NhmrI&)esD@ra%r%Cu0f_pV!oMcM0r7IhId6qkx7Otm#&>cadC!j
zYKoDmsiCDpsb5s2MWBL(Plm5yQC_BTR6%92TTxc2p{r$qv5AwRMUF*kpmw&CzDtp#
zw}nBHp`!^`VPd&ag}GNyrKf?TVTxyAp{s|sxtEDsgsX93sDF93VMJM;uVq?BRi44b
zkK*;&?&;3n{@x*lra?hjuKuP@?xxwsr3G1K>1M&&g`Pn{d1<D8mMM-YnZ8^(QNG2A
zIb}ZOUZvUo5vIl=MTH^xo*ro~rWLN{VTIWi;pxc%&Z)+wS=n5=y1EKwsm^BEUY;cp
zA<pR*=Gl1xuI3)$rG=(}PHuUgj*(eDkrwrl8F`f+6$Or5Y6h=w?qb{4XYJ?5QniJP
zS;21e0w1e;X_exOJ0*IKJ};FBT*GcLMR00!KgWZ6?E6YI`age_`nL0ZLDIUHjMHw2
z9C^WPx1@B*mr7gLbxY;M8@|k2z`1gg8^6}^-Q{{8&h;-*_RR5f`Vyl$W0QfCOWXh7
z%$f(5*2jL<xZxXfR!&Jo;+@#+{QUDP?lHKm^bF2YS2<&2oO)~Cty_-lrYnwGrLD2*
zzbyFjbAEo-zVH)G4!cj53G=_w5;eVVdHCktb8A;Vx7#~Q&F;si{inmkE5FvY^k=GZ
zOkW{&=ZSK$p=?vPZ}rZUkMh9}b<>o%+ar_@IutbCn&BFztH;~ueRuiaB)3^oksG+2
zXFPxP>CIf8w3l*43eJ0{$^W$XK7IbO+<WeaJickmqxf~Y=0=ouS6o#8`H9UtG{9@q
a>^<qV@j=PoGMQPpo}@gQ#<?_j2Oj|L5)Li^

delta 670
zcmcc3dYN^CZhe}MM~ZoBM3hB_QE^swR+?!^Vt%2YzEf3(QA%)TL6T8Pg}aMUQE){$
zSEgZssiV1bQkhdqT2e^9cTkR7h<-&zc7a)md9g{lzrMSnQ+7sWRk)8Qm#&>cadC!j
zYKoDmsiCDpsb5s2MWBMVrDtYDVP;0KpNFx2Nr`^2scX7XL{)H-VO3;MP*qTBnnj6Q
zNu^sxSfB})K}BL-rf0CeWmrJExu1J-c9BbddYVOedbw$cS&D0jQ&mwwic3_gesTK5
zkK*-4kp)?~S?Li@CgA~L<sl{|A-VoZUhXb#mPthw1))W5Zf@qKPCjXFZs}acRj%R5
z-i8%9Rl%m|sfkg+A%>wwp{b6ZAqByPX}%F@r9M7+&OZ5hL6Ka#y1ELP#;!(%jt2fl
z$$8#IhQ@||;g;!ML0O?0g%!?z!Iu7M=1%pl*(okTsd@Qa_cl#t-o)`W^<t#ey4jzV
zEiar26pWkxVO^iS=j(2UrGM@pm3I5kwvRO~{(P<eG>)4e%bYD%BtMLw=zCewsc^6S
z4QFSKi@LddaUa<;ZcMnL$2#@IeEn$;60fZ~bNTG2w-f8um1q9QSheMy=+=Wv)UyqK
zHm~0?cTK$+yJE+r#Hm{IbM^N*S%uydTb;5%$yVy6;N{)rf5Klfw(ET~^2$rOyg1*m
zF{|u;&c!okU0tn=0f&S%?nunoS1oh*((I$*dzls|?mulF_H2jbZ7G)S*T0U}GyiZ=
zJ<~pE&&*?8Of|L5FTPFK`psFLfBKs(#;XspSL|^;^YG!>Tt9m;uJT#A6}K)JI`(Sb
zj{ouFi*UKjzOS{+vlRAtEIuVWGe+XW^7F3ek9Hka`}Mu?$HUO?Kbc&Q?s@4`VYO(}
VqmTPE;&#}&oVoMoLgG<AH2}fH92o!r

diff --git a/keys/secrets.nix b/keys/secrets.nix
index 48e931b..631260a 100644
--- a/keys/secrets.nix
+++ b/keys/secrets.nix
@@ -15,4 +15,5 @@ in
   "wg-ren.priv".publicKeys = macbook++master++ren;
   "ren.priv".publicKeys = master ++ ren;
   "mullvad".publicKeys = master ++ ren ++ macbook;
+  "smbshare".publicKeys = master ++ macbook ++ ren ++ selene;
 }
\ No newline at end of file
diff --git a/keys/smbshare b/keys/smbshare
new file mode 100644
index 0000000..7e69903
--- /dev/null
+++ b/keys/smbshare
@@ -0,0 +1,13 @@
+age-encryption.org/v1
+-> ssh-ed25519 CJLJQg iKSC2yZMoiMcQ/uphfV9KSPaMZDujTJ8RF9iNj2cwl0
+naZwmb0c73GsZmLnoOLFjPFLahIvJ9uNPm9eKn9wuk4
+-> ssh-ed25519 M7OTMg OzqVt888r84ORO8K+sGPUktLe0Hlex5mH6tveRE+Nmo
+hB69RP7R9mAPOtnYF27c+vs3lJfmo2HLygpUPCdg4o4
+-> ssh-ed25519 uNZY8Q rSg+s2zyvi+pc8f+2+jpoV2d4QnSK6bc5FlUJYUvKn0
+vQ4DrQjuU+6SMF74qYIljm47DiwgFRTe0jOHgRhZhP8
+-> ssh-ed25519 gSqcWw tb4ZOplFZCXerynrFIRjTJ6s/itwRmsVeJSxDpf7NmE
+n8dmh88E/gSr8TGUxNGEYz5JoAczN/PeCXEEAPzATh0
+-> ssh-ed25519 lFtjmQ hILkY+TxULWVfFsm7iF+W5lARxBl3MdWEerO6JHYIhQ
+Q7xEwwZ3RM73a0lLs63TKKfHKrK7+YWKYpW27brwlOQ
+--- fjttmh2HNROYUIMYVu1Yxft9diCU4tx+DIFYBeEUelc
+ൊ0�̚�H����Xg�lgIѭ��n��^]��Gx�B�p1�K*��(�mC�u^V�_h"K���i)�����}�7�Û���]��ϩЉ��j���R��� xݿ=�
��Ɍ�q�����׳
\ No newline at end of file
diff --git a/systems/ren/volumes.nix b/systems/ren/volumes.nix
index 4c3cb3d..d6ab044 100644
--- a/systems/ren/volumes.nix
+++ b/systems/ren/volumes.nix
@@ -3,6 +3,7 @@
   environment.systemPackages = [
     pkgs.rclone
     pkgs.samba
+    pkgs.cifs-utils
   ];
   environment.etc."rclone-mnt.conf".text = ''
     [myremote]
@@ -12,16 +13,21 @@
     key_file = ${config.age.secrets.hetzner-key.path}
   '';
 
-  fileSystems."/mnt/sbox" = {
-    device = "myremote:/";
-    fsType = "rclone";
-    options = [
-      "nodev"
-      "nofail"
-      "allow_other"
-      "args2env"
-      "config=/etc/rclone-mnt.conf"
-    ];
+  age.secrets.smbsecret = {
+    file = ../../keys/smbshare;
+    owner = "ren";
+  };
+
+  fileSystems."/mnt/sbox2" = {
+    device = "//u504615.your-storagebox.de/backup";
+    fsType = "cifs";
+    options =
+      let
+        # this line prevents hanging on network split
+        automount_opts = "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s";
+
+      in
+      [ "${automount_opts},credentials=${config.age.secrets.smbsecret.path}" ];
   };
 
   fileSystems."/mnt/scratch" = {
diff --git a/systems/selene/volumes.nix b/systems/selene/volumes.nix
index b3180e4..97645d3 100644
--- a/systems/selene/volumes.nix
+++ b/systems/selene/volumes.nix
@@ -20,24 +20,27 @@
     ];
   };
 
-  environment.systemPackages = [ pkgs.rclone ];
-  environment.etc."rclone-mnt.conf".text = ''
-    [myremote]
-    type = sftp
-    host = u504615.your-storagebox.de
-    user = u504615
-    key_file = ${config.age.secrets.hetzner-key.path}
-  '';
+
+  environment.systemPackages = [
+    pkgs.rclone
+    pkgs.samba
+    pkgs.cifs-utils
+  ];
+
+  age.secrets.smbsecret = {
+    file = ../../keys/smbshare;
+    owner = "selene";
+  };
 
   fileSystems."/mnt/sbox" = {
-    device = "myremote:/";
-    fsType = "rclone";
-    options = [
-      "nodev"
-      "nofail"
-      "allow_other"
-      "args2env"
-      "config=/etc/rclone-mnt.conf"
-    ];
+    device = "//u504615.your-storagebox.de/backup";
+    fsType = "cifs";
+    options =
+      let
+        # this line prevents hanging on network split
+        automount_opts = "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s";
+
+      in
+      [ "${automount_opts},credentials=${config.age.secrets.smbsecret.path}" ];
   };
 }