From 523864e984612ca62868142d79f6a55c9684bb6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20B=C3=B6hme?= <mail@moritzboeh.me>
Date: Wed, 23 Mar 2022 12:49:55 +0100
Subject: [PATCH] :broom: move age secrets to usage

---
 modules/cli/spotify.nix      |   4 ++++
 modules/services/agenix.nix  |  19 -------------------
 modules/services/openvpn.nix |  10 ++++++++++
 secrets/davfs.age            | Bin 754 -> 0 bytes
 secrets/secrets.nix          |   3 ---
 secrets/smbMedia.age         |  12 ------------
 secrets/smbMoritz.age        | Bin 660 -> 0 bytes
 7 files changed, 14 insertions(+), 34 deletions(-)
 delete mode 100644 secrets/davfs.age
 delete mode 100644 secrets/smbMedia.age
 delete mode 100644 secrets/smbMoritz.age

diff --git a/modules/cli/spotify.nix b/modules/cli/spotify.nix
index 524e2b3..ba68eb7 100644
--- a/modules/cli/spotify.nix
+++ b/modules/cli/spotify.nix
@@ -1,6 +1,10 @@
 { config, lib, pkgs, ... }:
 
 {
+  age.secrets.spotifyd = {
+    file = ../../secrets/spotifyd.age;
+    owner = "1000";
+  };
   home-manager.users.moritz = {
     home.packages = with pkgs; [ spotify-tui sptlrx ];
     services.spotifyd = {
diff --git a/modules/services/agenix.nix b/modules/services/agenix.nix
index d86ebc8..88da66a 100644
--- a/modules/services/agenix.nix
+++ b/modules/services/agenix.nix
@@ -7,24 +7,5 @@
       file = ../../secrets/nordvpn.age;
       owner = "1000";
     };
-    davfs = {
-      file = ../../secrets/davfs.age;
-      mode = "600";
-      path = "/etc/davfs2/secrets";
-    };
-    smbMoritz.file = ../../secrets/smbMoritz.age;
-    smbMedia.file = ../../secrets/smbMedia.age;
-    spotifyd = {
-      file = ../../secrets/spotifyd.age;
-      owner = "1000";
-    };
-    homeVPN = {
-      file = ../../secrets/home-vpn.age;
-      owner = "1000";
-    };
-    homeVPNPassword = {
-      file = ../../secrets/home-vpn-password.age;
-      owner = "1000";
-    };
   };
 }
diff --git a/modules/services/openvpn.nix b/modules/services/openvpn.nix
index 50745df..a7090d5 100644
--- a/modules/services/openvpn.nix
+++ b/modules/services/openvpn.nix
@@ -1,6 +1,16 @@
 { config, lib, pkgs, ... }:
 
 {
+  age.secrets = {
+    homeVPN = {
+      file = ../../secrets/home-vpn.age;
+      owner = "1000";
+    };
+    homeVPNPassword = {
+      file = ../../secrets/home-vpn-password.age;
+      owner = "1000";
+    };
+  };
   services.openvpn.servers = {
     homeVPN = {
       config = "config /run/agenix/homeVPN ";
diff --git a/secrets/davfs.age b/secrets/davfs.age
deleted file mode 100644
index 7e4b937a748237617ea305eaab4b42c6557acb06..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 754
zcmZ9_OKZ~r003a!L9oK`pqq+^G9L_LP1CMTH}TQNB(7_hN86;yK<y(<n>3FmYuZi}
zs#A1&6BI<OirXAaP?QOiP4R)~#)dGJc@q^U!>K4!K|#Ix13tclC^!T)WmNR;oThHo
z3=y;-n`4LFG_wvN?ech_Ry)t7VP3Rz3f>+DX}W~y3{(uez>F6}lt4?wmr`&^!X>B&
zqhur<WMVeBGp804e9qSz(c3#{k_hG*J{8nB!)sU?<5s&X6c$7Moi6nMt%Q3+oM>nB
z0Eyx~VO%F%nLMlett4Uw-Dn&#3v@~*6JkQ(qcOTrHf@*>qm(=;k&vpimVs_u$}&I)
zl{92eCI=*vpi0IS4Tm$l^ZyNziiM2dz8ljJvBVH9Vk*J=;56mLG%)Osa$a|#R511g
zVIUM`^emBe+EB#HmC=B^9A?-`Krq#8tebZ$MGlW!h}@|oC0Z&%d5Cm||82Yc4$%-2
zreJR}leU(a?qmg1>#1l3%3`@tG~mwyWyl4<eoAEsU6N(sFZM-1!V1DHKzc|y>j5O(
zDT98Uwvmzr1u)8#i`is|RYH3LJg#uTFxx_UYz~LR&P$n$Cy^_`cn7{akBNaKRAlmn
zP{5U9;}$JOJV-Li={~m{w#hj6s7|Twm9&??*Cy9*Q#KP#ZExV&;XbX|b#ShC`^@<D
zrS$zJ;Ma;#9juK^nIjJtmL0F1oL{q3z4~V1#eVts`|*Rbwcvcy%@5vfkEhrT4PBZ3
z9dm~+#|NI)52C9Y#_NXAt(bg)ILBJkhp@=^kHEK$*BYM;-JW<jd~2d>;6T@vFNfWu
zZyS~7{`%>6;Ju5>HxadOx%27KO8s%)&YuI-OLzKyaA&G>uk3Bl`Zv8g+KdXv9AmzQ
zG3r;{<UX!)!@X{DG+&iJA9?<IX3L4%S#kB<?|r@7S1uZjEBa5LO3hDPgg>2ITrRHu
E1IK0^r~m)}

diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index 8b98914..70a7298 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -10,9 +10,6 @@ let
   hosts = [ nixos-laptop nixos-desktop ];
 in {
   "nordvpn.age".publicKeys = users ++ hosts;
-  "davfs.age".publicKeys = users ++ hosts;
-  "smbMoritz.age".publicKeys = users ++ hosts;
-  "smbMedia.age".publicKeys = users ++ hosts;
   "spotifyd.age".publicKeys = users ++ hosts;
   "email-desktop.age".publicKeys = users ++ hosts;
   "email-laptop.age".publicKeys = users ++ hosts;
diff --git a/secrets/smbMedia.age b/secrets/smbMedia.age
deleted file mode 100644
index 7e4624c..0000000
--- a/secrets/smbMedia.age
+++ /dev/null
@@ -1,12 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 ZYd7Zg ZSzrad3yohMhlM8+Tdr+LjTUqzxd7uXr6udffNjsYS4
-0WVNLdXmw0BX1L2Oa1f5h0/16KLZ9Tlw3XOj/50Jvrc
--> ssh-ed25519 wG6LYg T5TU592Q/oERkYzgj80V3DxU9E8LUIDVxJts09sBXwk
-ospPAH+10LCuhDDVk0d9m6ONwDRaQusv54P0DtRbzz8
--> ssh-ed25519 CjuqfA lOZt3LmXW0PKYELNl7WbUd3AoQte4YPnUvw6WEU9wW0
-X6q1zv9m9zCJWM6cYjagOOzA/ESVQRSEHvlnwRHJx7U
--> :>-grease
-ykOwD1jnYtkqqBx/YxyrUbr6AiQjzU7bug
---- FJNBXl9G9I7m9B1gBd56H6hGYTVmcxEnrNGRreU07OA
-�٧-�3���c=�P��UnS�E�
-��+��󴎄�Ůw=#��
��L?tŖ7�S�d��0�R���s�<����T���͘��i��Q��
\ No newline at end of file
diff --git a/secrets/smbMoritz.age b/secrets/smbMoritz.age
deleted file mode 100644
index efda958024f932e04a60a58e3733b2c5fadef20e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 660
zcmZ9_JB!l*003a;jG}{s7(^WG)jXO<tDvT7lO}DFwn^J0;E?9kBu&$#X_{2QMGzDY
z5#>OfbiBbu5OKOe5f>4J>*U>SZi0h1I4G|7{ejPL?Xo>HlVYBF(d=rJxKM@w<s0B)
zF)7;?isMKP)HRFLU9dfp8ib}0Fe8RyEaSw)svs?K6xmZ{-r*Z`C^tf@T3NCj!1!pz
z$6zg41<gW-Nr!}JAA;uW%!wf{X1O?tEXixZtHH@_#S$IO1!YpJyE^GM#`<7jA?>Qo
z4G}>f3mDaw;wV&t1s<ld3#l-mF;>)DnJOMN`Ke{Yr7qoTGEAr9ibPN|s5w+h>dl^u
znb^sV_Ls3kfopZbX}YCw0omszpXd)uxk-9yx-!=s=A}*^NKRBq&B*}pb3Af%llS2^
z<=K_-a)wGcvUJ#HXtF|=4x<7}j4o~m+W*b+ZwiW2b`#rJ*kBc1!C-L>glRM@U0i~B
zhvTx_G*D@D&=HlTnAAYoqF*SJun>_f;SHK-58J7cF_=@MpxQ8oq~VCCM}dOjh>YiH
z)XDHE5U8^zUso-ipU`wN*YP1T!&+uj>}!5rphVQisy(Nhi*w725oqGddS5J}deEa7
zbqWLJavAKZb2;R*^`bN&#~I^s{MzX*F>|c+*^!kQGTd^y)3rZ?1>ni0<AcrpuaAE`
zJ!9VKeS7x)&3SL@`u8iRKb?Jh?$L`2A5ZO&znJ7XwYQ14h2CBKr+@h1aJrx0+Wq@M
hIN00S9Q}T^zyIa<-u55i<<aGb>A~wQ<K5@Y?mrHK=$-%o