From 0d8f1cc76cc11b37c9c6ae6bd3a8d8af6aa21303 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 -> 1197 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..5c9c76ee2da2cc58c97de4492f808feeeab09684 100644
GIT binary patch
delta 1148
zcmcc2x|VZ-PQ7bNKu)%~nQ4A$rEhXkiM~flpigm-v8i@QNL9M4TVZloPDn(#mq%`{
zCzn%Mm|>W!bGVO7c$iPRzGZn~dR|DjPpF$?RDnlsO14pQevVU^cYsNLF_*5LLUD11
zZfc5=si~o*LaAR=q(z{Dr&p0nn0K0|QGvFzk5Ni?rfa&kwwsf4fm@J^S!%9Zfrmk8
zaA1LRvQbzzmx-gdLB4l(RG^=GSfH1Yb9RYyR9Sj<k(YN$fn}zCxlgW(XMSdWcw*$l
z4-)l>DPG>Wk(Fgp5kZ!&S%m>X`XR1CX@QYN`A#LK=~e#4=6(hGdCn<e8J=8DsYc#;
zQATD-VFsD*CY~1lg^8YJhT4%4At_$TUfEGquEi0VImKRu0lr+iy1EJ;?jD|{$>xD+
zKB*Q(u89%GiD@O-*;zS}E-4wl6}j1-Ihpl7F3FZgiKXdWHxDOET3@&I+41XDo<5KH
zvFMYATRPt^PF=E|{R4;R{fRP@8}B}SV5g&%W2X8s{#U`dO1pXc?sI=$@o>u8OMCnZ
z?AlJI7V#}^^3divBanIeu0Z@b#;=zi+>QLxFSC6em%@_++rHdS4t!~_aLdao)x9+{
zell>>RMjsHJ#%{J$&ItmxVhfmZKEfxKf6imZ^M$y=lHmavRiVGYxmCG+sT&0=$qEE
zO5AFOt=GXrCgwfw4_#Wce0jzUcSr9>OU{+^pN))Lo8u&ut>f+I(Xzlj%l%jQt5C@a
z3fE^G+H;%zkZ8xUm33PZ>{Ko1va$$V+L_X8dt~>?W9f62)Nj>Hn#O3XaW`^tPuT3M
z=f3?Z-ktjJ_y&8XU^Uh?bsN2Sy{cLbMb&t{Gs~Ci?g-=NmE}M8w5hRf(sM1DZCf8J
z_*^~5ALFw<*-0R%b=8rY%MZ2co<5r!m9bl5qtl&@C$3IZ2rZBKyQQ`<eNvh2-UDjo
zDs9c>UrtQWlM3gJ4VqBTeD!&4t+ecRe%_qbU#2cIJN|va&9>g}=`~7C2Q8L1uxy*~
z*WpLvezR8d!oC=;T0!|c%Q*Jh?mhj%a;Ct%BPynHM{;z9R?XVVX;pjhf#-}H&Wq+P
zvwQH1lV3xVW!gu{S+#3-*>rtgaAOMB8L1r?&u2{t*8RF%;g;gr4vC)z1>5RZra9Qi
z9bfRl;{}6Ut<ud^4lj!%dGe<jZmmg(<$P?XcK%xSkM&C)?pUB3AH4PJMyC3daQn9S
z-w$d^j8o?uR5=7knI!yFJfHF8CF^gNtGsi*PSN<A*S%K3W`03^$upH^A*QUQuUzil
z{j_iKMJd0^nJvq_<R>Lvnmh4&=xm|sFYBL~RwxE8%Kvk3)tfIV&zQ?}`(t-+^w{(L
z|EZGjwtKshRL=d9Gn{Bp@8Kx!YRR}`qJzJJ?8DP9F1A^frqxWgcDSgfeay5&TSjA{
z=drqT_QiEq|4fcEwlb8u&NWx9=8<es(7AOrRc24+r)HI2T6|@ryM3QTpx?IldxA>e
zl^y=9lXE3eEJNzZW#<i2zkh7n@$`h|^k|vB-8(;cJ<EN}Fn6h7*K||4JFF~6RzCFr
E032xl*#H0l

delta 670
zcmZ3>d6{*BPJLyXk4K7mYDAPphEZ`=c2=5cNn(DXpT1L7hEYmzW<iosNrk(MQBiP3
zIaj7(fvKapb5fa8N?KA#zIRZLTZn!|Ms|T&iFvU}y1%}=p;LB7WmUM3Czr0BLUD11
zZfc5=si~o*LaAR=q(z{DwxwrgL}6w|u%Cyqeo2Xbu&ZghQAAa6l3`V3P*7D+YMMof
zTS=u`Mp&Q;mqA5hUZ!WTzGYZIy1Acwa(0nRetMckczU^Mh*^qjh*MQjK#EILs($gr
z4-)l8kp)?~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{u+8~^|S

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}" ];
   };
 }