From 95dd547326c2e7dd2d01a8c0e0663f2a5e4673e6 Mon Sep 17 00:00:00 2001
From: Alexander Szczepanski <alexander@szczepan.ski>
Date: Sat, 16 Oct 2021 16:18:00 +0200
Subject: [PATCH] updated the local machines

---
 configs/secrets.nix.secret | Bin 1074 -> 1070 bytes
 machine/desktop.nix        |  38 ++++++++++++++++++-------------------
 machine/thinkpad.nix       |  12 ++++++++----
 3 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/configs/secrets.nix.secret b/configs/secrets.nix.secret
index 2decefa5887549cbb5f934bef26fac78173dc7ce..93dd4b78016f5e3fe2ec41f946ee00911b68cf71 100644
GIT binary patch
literal 1070
zcmZo=;$b$E7Pz~&A*Y*BfMIqFWBIJUn`hVPpUyb#>hb&Ht2bwLcEoP@zQ<&uxwz6(
z-uuFz=1Vpjmv`hQ7W&NFo_$;Ai|NGlD_tjlyRp74wKvuI>$Ooub?&`~KU;kaH}-Q(
zs@Lym35dN=vEp!9ajy5lIU4V!r>FgXdO3Q{$*3vrEte0r772a6B&oD@uC=v<f7H~F
z&j)v}3Ds~F*VFCgv*ht!rQzlFDJv>G`jWu@8n5?Etuf}ayqDE*Yx+;J)0CJ0R_Iis
zS*U8w+7Z6PL)A?6n!wg_(+oM5i}&@fvNxMuKN7reYFoGZ0wbgTIt#~xC(J+INV1s9
z%=_%@%UHQ(|6P;R$}j!>$K2}T@8&VZLinxxN(P^G+b_<sopnaX`2FJESzrD#DoMO#
zFZ*+2f>YpC4Zjb!w&xVTC`i#!Ub<#N{?<<QtLYz|jJxXuE?5>Ou>IAxT5y5Oc+bRy
z{`f_gzP<LTimgl4`u)P)vgPmXPj$|bepfVhnjVha)@393k9FqhP|Zfg2mdq#;&!Yw
z=z6A<7W=;|E#gqukMDbrzj<<W(>HA&%^gz?`UjrKjCQ#-{f(d6xu1I@H+*jE(9~%C
zGx7Ji=^X3+b-(z3g2Q?0-?J{y<n{FuPn|XAdsh3<R?JQBa^c-~jWOSNE=RU6%UXW(
zZA3()@*3l6w}Wn~m63neu!Kp(yY-3eSnyUbUhv?8Jo&&QmtHdNeEZ=B`%}%M_8zYv
zh;6lW<@{fmFyUk4?**I0Bqw`s=)CY=-s5!L%)M@tte$yAlmwnByKiQnQlGrAV-EAH
zpn`INzpBl_k<nA#9CPM4t^M*K#o(IAvBd_<O?ARzf-_c6&AuV{r}k3C*=2c=pMxg~
zuDmo;{-{~tZ#l_#diRb!{E~C>L}bI?{X34%{FA<jIYrQ}g;ViCOpB`Q(I88KxE<l1
z5x3qPGZCDBZsTSTnSB4+&p$0sHO$B}$onkOe`aRk^Uqo{4{h&};+pW(Rd{uVom1|c
zrJMGgNh~Uv@_pHAxyL_SPH3;uzGCus^@Q_N|F1mpg4Za&f5Tg?dXt>oqc8THnR9++
z|6Duyd3#si(0{F}siOWN_~K99fTaBs(@P$GylfsWT=eH&qQ>={viqs(64w`oFw6>K
z{;S{JA^&O0YAp-S57|i(FYo&4w|HM%-2QjM^Gj}luD?#a|J8qbVp8K|iN}*XD+P8)
zuUTJzH)rJsK{=IataBe6JE_<^Ddo*B1*Kh2md*(^$Z=s36Z+IOneD!*#0{ew_R7hL
zc08{|66SmJtzNV1vuwqkO-;6Zb2(QoxioJMhtB!JUu*a7dyui1(^cT`B_4iPUq7Aj
z8}GkgV)-6_JTUurr?JB^KiwHD%bi$l7pn9${aF-SwNZV3(6>EJTzh{#I{e$zK>c~x
rhjMEJ8@Zc`GG*s--OlB`;0WxQmvZhPm-Vv~&a-}oy;i?0ETsql+$I!+

literal 1074
zcmZo=;$b$E7Pz~&A*Y*BfT6oaUF!FxiR|725qhpB8Rje1*Z!7zBDDML<!|55pPJFZ
zCgi%R^SkZ(rbFcmVxDd;{=Qshzm3En!N?C$+ix)Q?hZd@aYpoIklt6fDwB3Lb^F`v
zUdUE#d{d(|y^`62;jL|{S+eZX<55>`9C(p_eS?n8|1;M&-@DJb>*~>Ybx%bW@r#rP
z|BBkM;?wUIp@KJF`&=KIFA?cmlV#3vqk@UGPILE?XE$num|yR|t(qm+;Q6z$>h_6k
zGqocY@%2=&sJb5C(%rr8Et84gjvb}p{~l|d@by~VylG#)y1t@Sv-p)N&qT$aC&~go
zdR-I^mDar)cshUGeAgvTpGp_=7aeri^_H=J*P1*0ynz}SZXNrT8P?4;w~e~Xx$FMB
zgk^8JpIOE2uJ^4t>nRc2r`uSu>(|6!t;q1d6B<%pSiE@A(0@^~?AU@6uh>;y-cJsi
z?mMsk$60Q#9VL$8Jp5G^mSRWrRS!*DFJ5c8(Qv{%&l7*0*-qc&4L6TJ?dJW>;zXqu
zOWC{=G2h$|e6Mgges8bJv_}HJw)3(CtGj=;@=RuHJia<KL_2=LU+<6$ho5}j@MiI}
z9=QaYCkMCOtGE32SpUhB1OJcZn%zGB^jB8ee#Trb{@^KPkG8XY%y^i_z#J2?V$w^_
zq=0*D>AcEi*`{tgLl(Yz`_fqH==ufwLjQd(<8EIVqjb;u$(Ktn8Q-L;KjCoCSj%;V
zG5e1pb5YUG9G<5M$F?!^^z<@Llu4aizsWH0l;jKcL;pRLd-U#pI`m_4c4q$nS{vKc
z+fvp6cPyPa{~wMk(U|UC>g3|7vFhT15UGG=PgoxpmF%1ET*CEKzdnZLk$lscz~0kU
z)t*yl@SB~SqTlx|&UCxuynk<QFEBNW>r0%}UVdqJj?KYuE)2_b61fY)H}%i;o*QcU
zG3c*SsGZo7Oty~9?N4kq!(9TNyw?(s`pNJt?A;0tPK!&5)~|cN#6A2n`PJOH#|`qW
zr0Q)M(w6Lf6gu_W)yJ=Dw)3qo_>}gh|H-B6OYOJZ*|GSD<SUU)k%w13SJ(Y~_5G}B
zZ<9Ov4zXvV7k^DVv(~m{X(exbRp+@|25)xunmljY(Y*BaGwoR|r8_6utIq2RDAB(0
z=-aUd)oX3t`{E{^m}o8^b#aSCjOMRacD|Pr{GN8?Ts+Y<FLmnQz1!}uyL)m$>o*nO
z8y{v$EWO!ZzlHnXr`Ow6GrzFxVJe8W)RH^;RgJ4-`ROHUZ`SeTsd%lvcxv~RzoMp(
z+k8zK_wUuY)oWK;vZZT<`o(oUyF%J#-oE&|@BVB<p137bpIe^~xRGk*zlr%>$_w?`
z+=0FEbDJlK_qrbH5R^D}>Z0tiTPM;!)jnK&we0-SXIoTMII{y)N+zdy{oxj`l5}8}
w722&mUua68lY-z{L#w2p`a7o7+O2&1;cnmKh3od4K2<y+xwi2O-<wh)02SyPp8x;=

diff --git a/machine/desktop.nix b/machine/desktop.nix
index 30ca2e5..234696b 100644
--- a/machine/desktop.nix
+++ b/machine/desktop.nix
@@ -2,6 +2,8 @@
 
 let
   secrets = import ../configs/secrets.nix;
+  secrets-wireguard = import ../configs/secrets-wireguard-publickeys.nix;
+  secrets-desktop = import ../configs/secrets-desktop.nix;
 in
 {
   imports =
@@ -50,12 +52,12 @@ in
     wireguard.interfaces = {
       wg0 = {
         ips = [ "10.100.0.2/24" ];
-        privateKey = secrets.wireguard-desktop-private;
+        privateKey = secrets-desktop.wireguard-desktop-private;
 
         peers = [
           {
-            publicKey = secrets.wireguard-vps-public;
-            presharedKey = secrets.wireguard-preshared;
+            publicKey = secrets-wireguard.wireguard-vps-public;
+            presharedKey = secrets-wireguard.wireguard-preshared;
             allowedIPs = [ "10.100.0.0/24" ];
             endpoint = "szczepan.ski:51820";
             persistentKeepalive = 25;
@@ -81,11 +83,11 @@ in
       extraPackages = with pkgs; [
         rocm-opencl-icd
         rocm-opencl-runtime
-        amdvlk
-      ];
-      extraPackages32 = with pkgs; [
-        driversi686Linux.amdvlk
+        # amdvlk
       ];
+      # extraPackages32 = with pkgs; [
+      #   driversi686Linux.amdvlk
+      # ];
     };
 
     fancontrol = {
@@ -111,14 +113,6 @@ in
     };
   };
 
-  environment.systemPackages = with pkgs; [
-    cpu-x
-    hwinfo
-    hardinfo
-    phoronix-test-suite
-    fswatch
-  ];
-
   sound.enable = true;
 
   services = {
@@ -129,12 +123,12 @@ in
       compression = "auto,zstd";
       encryption = {
         mode = "repokey-blake2" ;
-        passphrase = secrets.borg-desktop-key;
+        passphrase = secrets-desktop.borg-desktop-key;
       };
-      extraCreateArgs = "--list --stats --verbose --checkpoint-interval 600 --exclude-caches";
+      extraCreateArgs = "--checkpoint-interval 600 --exclude-caches";
       environment.BORG_RSH = "ssh -i ~/.ssh/id_borg_rsa";
       paths = "/home/alex";
-      repo = "ssh://szczepan.ski/~/borg-backup/desktop";
+      repo = "ssh://u278697-sub2@u278697.your-storagebox.de:23/./borg";
       startAt = "daily";
       user = "alex";
       prune.keep = {
@@ -144,14 +138,18 @@ in
       };
       extraPruneArgs = "--save-space --list --stats";
       exclude = map (x: paths + "/" + x) [
-        ".config/chromium/Default/Service Worker/CacheStorage"
         ".cache"
+        ".config/chromium/Default/Service Worker/CacheStorage"
+        ".config/discord/Cache"
         ".local/share/libvirt/images"
+        ".local/share/Steam/config/htmlcache/Cache"
         ".local/share/Steam/steamapps"
-        "Games/guild-wars/drive_c/Program Files/Guild Wars/Gw.dat"
+        ".local/share/Trash"
         "Games/guild-wars-second/drive_c/Program Files/Guild Wars/Gw.dat"
+        "Games/guild-wars/drive_c/Program Files/Guild Wars/Gw.dat"
         "Kamera"
         "Nextcloud"
+        "shared"
         "Sync"
         "Workspace"
       ];
diff --git a/machine/thinkpad.nix b/machine/thinkpad.nix
index 848266b..cfbc5ab 100644
--- a/machine/thinkpad.nix
+++ b/machine/thinkpad.nix
@@ -12,6 +12,7 @@ let
     exec -a "$0" "$@"
   '';
   secrets = import ../configs/secrets.nix;
+  secrets-thinkpad = import ../configs/secrets-thinkpad.nix;
 in
 {
   imports =
@@ -160,12 +161,12 @@ in
       compression = "auto,zstd";
       encryption = {
         mode = "repokey-blake2" ;
-        passphrase = secrets.borg-desktop-key;
+        passphrase = secrets-thinkpad.borg-thinkpad-key;
       };
       extraCreateArgs = "--list --stats --verbose --checkpoint-interval 600 --exclude-caches";
       environment.BORG_RSH = "ssh -i ~/.ssh/id_borg_rsa";
       paths = "/home/alex";
-      repo = "ssh://szczepan.ski/~/borg-backup/thinkpad";
+      repo = "ssh://u278697-sub1@u278697.your-storagebox.de:23/./borg";
       startAt = "daily";
       user = "alex";
       prune.keep = {
@@ -175,14 +176,17 @@ in
       };
       extraPruneArgs = "--save-space --list --stats";
       exclude = map (x: paths + "/" + x) [
-        ".config/chromium/Default/Service Worker/CacheStorage"
         ".cache"
+        ".config/chromium/Default/Service Worker/CacheStorage"
+        ".config/discord/Cache"
         ".local/share/libvirt/images"
         ".local/share/Steam/steamapps"
-        "Games/guild-wars/drive_c/Program Files/Guild Wars/Gw.dat"
+        ".local/share/Trash"
         "Games/guild-wars-second/drive_c/Program Files/Guild Wars/Gw.dat"
+        "Games/guild-wars/drive_c/Program Files/Guild Wars/Gw.dat"
         "Kamera"
         "Nextcloud"
+        "shared"
         "Sync"
         "Workspace"
       ];