From 295f75dd5f5b1e9e36a2da77f7711d8f8cb29d7c Mon Sep 17 00:00:00 2001
From: Daniel Kempkens <daniel+git@kempkens.io>
Date: Tue, 12 Sep 2023 14:43:48 +0200
Subject: [PATCH] mediaserver: try mounting certain folders via SMB

---
 agenix/hosts/mediaserver/config.nix           |   4 ++++
 .../mediaserver/smb/havenCredentials.age      |  10 ++++++++++
 flake.lock                                    |   6 +++---
 hardware/hosts/mediaserver.nix                |   2 +-
 home/programs/nvim/plugins.nix                |  10 +++++-----
 secret/container/additional-media/default.nix | Bin 1982 -> 2062 bytes
 secrets.nix                                   |   2 ++
 system/nixos/mediaserver-setup.nix            |   2 +-
 8 files changed, 26 insertions(+), 10 deletions(-)
 create mode 100644 agenix/hosts/mediaserver/smb/havenCredentials.age

diff --git a/agenix/hosts/mediaserver/config.nix b/agenix/hosts/mediaserver/config.nix
index ea608f8..3799c39 100644
--- a/agenix/hosts/mediaserver/config.nix
+++ b/agenix/hosts/mediaserver/config.nix
@@ -4,6 +4,10 @@
       file = ./user/danielPassword.age;
     };
 
+    smb-haven-credentials = {
+      file = ./smb/havenCredentials.age;
+    };
+
     acme-credentials = {
       file = ./acme/credentials.age;
       owner = "acme";
diff --git a/agenix/hosts/mediaserver/smb/havenCredentials.age b/agenix/hosts/mediaserver/smb/havenCredentials.age
new file mode 100644
index 0000000..85bbeb6
--- /dev/null
+++ b/agenix/hosts/mediaserver/smb/havenCredentials.age
@@ -0,0 +1,10 @@
+age-encryption.org/v1
+-> ssh-ed25519 MtGp6g JyVPhKnCixU8R0aldhBP8eVHzyxcG6Vjv9MOv2xdAGs
+PRc+76W57uYZSUguYrOjvjZrsFy56nbgEyoQ1ahihK0
+-> ssh-ed25519 Y94Yig v/9Ai3U8dxd2XP92gTMDHCeMoVTFhd9mrg95hpBjcR4
+8qu58IJSjpDeCoueo5REflCv3jYscmTFg0gJ9w2awJo
+-> _@pH\C-grease 2 VY p{rJ^5
+liHUI8M6Us9bJ5yF/hs57TZLArJIsKHZG+4azj4qiC47tCAH5RrbXzANrDk
+--- WgjYpyvLq2DF1fG+1MwTV+tGijYBiIiO8XeB1wsumh0
+n��/�PU�
+,�2S�(�u���!��$�
��D�X���H�[�!'H{|�+]5���:�4�z����:�,�1]E��!-uNV�=��?@`W3u1�\A
\ No newline at end of file
diff --git a/flake.lock b/flake.lock
index 23c6dd4..d95689d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -107,11 +107,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1694461360,
-        "narHash": "sha256-8pD4sER07KvFjaa+8Uh5zuUrWVmAtT2UocFMktq80SA=",
+        "lastModified": 1694508116,
+        "narHash": "sha256-T91VacKLq2m8+UD7FDGBkQapmV3aBftkP4LhZ0HAww8=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "fc6f863fe175a0e7e4ca39f44740627815f0da39",
+        "rev": "7304727801b07c59d343bc0915dc5f0226db146d",
         "type": "github"
       },
       "original": {
diff --git a/hardware/hosts/mediaserver.nix b/hardware/hosts/mediaserver.nix
index ae7e725..bde0760 100644
--- a/hardware/hosts/mediaserver.nix
+++ b/hardware/hosts/mediaserver.nix
@@ -14,7 +14,7 @@
       kernelModules = [ "tls" ];
     };
 
-    kernelPackages = pkgs.linuxPackages_latest;
+    kernelPackages = pkgs.linuxPackages;
     kernelModules = [ "kvm-intel" "tcp_bbr" ];
 
     kernel.sysctl = {
diff --git a/home/programs/nvim/plugins.nix b/home/programs/nvim/plugins.nix
index d1e0f5b..7689ac0 100644
--- a/home/programs/nvim/plugins.nix
+++ b/home/programs/nvim/plugins.nix
@@ -19,12 +19,12 @@ in
   };
   plenary-nvim = buildVimPluginFrom2Nix {
     pname = "plenary.nvim";
-    version = "2023-09-10";
+    version = "2023-09-12";
     src = fetchFromGitHub {
       owner = "nvim-lua";
       repo = "plenary.nvim";
-      rev = "0232372b906f275f76ac42029eba25eaf95e76b9";
-      sha256 = "0z7sag0jqskf7qcdnsczxa3y3rjlnx4k0an23p8zmv5dikbgqkx5";
+      rev = "4cd4c29e39dd02efd906f98c03d2879237f50956";
+      sha256 = "0g3higbx5v20bkn3h6gjxjgjj9yjwnvggmbbzs7k77i39993hgs5";
       fetchSubmodules = false;
     };
   };
@@ -246,8 +246,8 @@ in
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lspconfig";
-      rev = "5efcd06dc9c45c1654d3f84655fd4ee2f5328f3b";
-      sha256 = "1l00vf1pyb1942ycb0wv4jy9qkpjbrn48hwsr89g1p3zzw063zgq";
+      rev = "360a895125ac4f39df6aa8f763635eff07e69fff";
+      sha256 = "0sy9w8bl46i9krikxkbnsryrnnccji2hrw29k3ccihnn8nrxwvsl";
       fetchSubmodules = false;
     };
   };
diff --git a/secret/container/additional-media/default.nix b/secret/container/additional-media/default.nix
index e750e9a836b2769ca5451209923a7e4dbba2011f..4e509db52ac3f42887be123b2167660738db1a7d 100644
GIT binary patch
literal 2062
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

literal 1982
zcmV;v2SNA%M@dveQdv+`0N)@lC-+oYKV^b(yhazg63Fxzh(NEkpZh+Xx~{?su_^rt
zLv@D0uNO0@e`uuG27dwb|Cq2xwRVDaqanQP!pR9A{$wHS5aT=sVs_6}y8FlQPupR~
zcB&rPU%!m{)yz=T#qx-0?#eQRhwIt-jD4P=`g*?(2~0IzDwMTF684Qf!o9%lysZe+
z`&iCwxFC?>9wIG2HFjT@@P3UZX9&wIR6ApUZGh-2oh?8F7DN!JKxHvBN{u?#?QaVV
za_W=p((8pRjln&hc*yLKTYnPVpctTYPsDpAnS4z*Q?|)2dv(l`inlJtPRPU@EAqfh
z8u1up&$=2hNnD+}<pg0h{h01#_dkO<XB4aZMFnO&nB$IoSu7v=cVl#n<?iB*|4qx%
zy@6|*%o$e|GwqM_uHh;>-SmYTVJWKi&(<WrAj(RwazK20S@tV!ub#zbaFY2|lf)hT
z!Y#&7*z0=j#3{1|6&#xch}4bHk&@%`IuhrIG9L3`leVkP$;~S&kRCYSz#x3P&cuMm
z-W#G|R<f7Z&@d#7?X`*BSX$cFK;q$R7BVV=3WOq~?s>~69t(P8-F`?RIV`DL2bf+H
zsU}Qa3|FR(5S3RxlV7$wr};Cran{{yKw{n&mf=p<>F4-YWFqCtwQoVO$!q}I>3<ch
z72R{e4XcbDAJ-upSPrCe8+^yqZUM6_Tf*||J)VQ&ZrA`bDayD$u1!Q1t#M`K8Qf`F
z{>*_*<9EGEI@b9V5H%@zQx+?e_KNM>osdJ3Wik2k9fAO|I7V*GWob_0j5g|T0G7Wh
z>`z|G!kWqC#3UJ9qXt)CuXA#D)=yx6*O{znI@aT^Q&c?#oLs31-sqUn<L1CzTLWTY
z4npjw{}ikeu0Gm+S&IWXOdm999bEDdUm7JQ0lb6cG7}Z|$-FaF7$HYK?Pa3l(d5%X
zRoL?JOPDMTN}<jL9p9P{A$SOWFr90QnFBWfP?#FII~Z4+58A%N%pVlpk3uj3;^6AF
z-9y5&Pbw>*ndqy&dYFDD+L=wL$#sr-AiVa?Cq`W+-l_GZJ1mW-oO4y++GVCG>{Shg
z!y=yoYQ0fxOvHfzuimNMQ22<rwG!P?lg)wX(LoypCVZKKv|CW#x;qwffC1^HnQjl5
z7Yb#nr2<GAhn4QG@`g^(Xu#u^^swnu&ylMmKqXAWdz0G(ffQ-ao4p5E+^D}9656$u
zX`OA>PTI6?*G2dNCpY`hMBFZ1?*Vd^kKxdXnFQKx`6zgRu-#DYqFy1*V&pr-2<}s&
z#uuf{=qNGS1#8^3X(d2>%h@CiVlOL9=5*hG)NTkdawd-5k^`V=W*#nM#{YH#zzBSU
zQZAl}PQ^i-+-^L}Kh>U<!FMXE_J3jZU$aV0kwN1F#Wb4wm@m41jsF80)=wzBV~hQV
z2ElCjAkANlMu)_#x|E2TR!ZWbR{A=3BUEI%`7i5~@!wSd&jKNBRJwvn3x|S<b1|eB
zdHxA;ORl6!f8nTNQi*-_+cbQ4-Ma-hjm0GNZ-bTYS#WAiiwCWPj2+dyeu^<9mj`A#
z)ALq_vU+>9e38I>U8*JrIPfKD)e3=X=h8J@g;e4gAYUq}diETMP_mgGj5DRGJF<z!
zPgagWm|c7*!TiAsh-Ut<HlAR<HM5QT-s8Tv$;gmW?aPu1K~=5Sl*Xy;#QwfHr{dcR
z35;yUtt{BM$`8#5%^i)DXDzio0P~B^NGT*7ZC6rJX=5yYqcm5i2*K8b+){q%%8JG1
zdgFTBG*QSEJ~T%<QS9BZvU5LKisf`*6q>4ye;a^*9ALm)ls`ps4{yw0cq+jpzAKZ1
z1I6x<2-%$hbSAfL&+vbh@D8{AzczjfS$~j2K%{`#fuiRUgqE)^*_<cARkz<7Jj&6P
zZHG+mDEqVU19T;695i{&h>xWlXEI8J;1V&#=JN4Cx2N*!%?c&%I^XO{2x&NRNl{-h
zjI8Jbn#^|YHR5P#pMiIfr!*@w`k1v-HIY}Nx|d|gwC5`ziG@~2)HKoL><4|Ty=z&2
zLK&fhX$jSQSiV2iKoL)TAXM8rn9HDKQp(vdOD3fxo@3Zxv-+kiuvTx39SOQ>=8~QZ
zzIVkvu~20w9z_^~H!E~RlIM$qTSRL96i`T@4qIkEkKcLB<V+rg)M3&YCZ3y58n3sG
zd?i?Y7GS}4eE<1%Mj5^9;wZTT{ef(@g&YX!VBdYDnPc76@66)^G^a(=mU6Bmt44D5
zATS-l@;2TO^wOM}?V3tL{S(&9qzbB<HP+8mo6*3X(g(;-uMK1p-=hw0hMZnC1_>Jx
z7XU_>Lbhjudsj1a0qpqSUfWc7{BG-2pc+>do1gEB%-rBc#iDpH6V;D<AZ!~=iKFBu
ziwri~d#o{(*NnO(01liWJ+1Ne=aOjOE0$*+oT@vKAD>g3GE+{ROaM^!<|}Nrj@QUi
zrLL#*Db2Ak9?Z2k@wrXZ9i+=7l^-%Gsd6P`TKjm-g*}H1@DWa;WTfHjIU2~+N@z@r
z1CsemKc<XWBRpt=lf4p?eCoF}D(4$Gvfpc*2Mr-Oj|%1g!4;cPJ`)nf(HQfv1w<Z*
Q--J1QaR_O9Rgz)ERr1o*ivR!s

diff --git a/secrets.nix b/secrets.nix
index 0735791..ec8eb73 100644
--- a/secrets.nix
+++ b/secrets.nix
@@ -64,6 +64,8 @@ in
   # mediaserver
   "agenix/hosts/mediaserver/user/danielPassword.age".publicKeys = mediaserver;
 
+  "agenix/hosts/mediaserver/smb/havenCredentials.age".publicKeys = mediaserver;
+
   "agenix/hosts/mediaserver/acme/credentials.age".publicKeys = mediaserver;
 
   "agenix/hosts/mediaserver/tailscale/authkey.age".publicKeys = mediaserver;
diff --git a/system/nixos/mediaserver-setup.nix b/system/nixos/mediaserver-setup.nix
index df5f787..1bb9517 100644
--- a/system/nixos/mediaserver-setup.nix
+++ b/system/nixos/mediaserver-setup.nix
@@ -16,7 +16,7 @@
   };
 
   boot.supportedFilesystems = [ "nfs" ];
-  environment.systemPackages = [ pkgs.nfs-utils ];
+  environment.systemPackages = with pkgs; [ cifs-utils nfs-utils ];
   services.rpcbind.enable = true;
 
   systemd = {