From 071126e9c31ccbce63afb42d52c568db38622734 Mon Sep 17 00:00:00 2001
From: Emelie Graven <emelie@graven.dev>
Date: Tue, 23 Aug 2022 20:31:09 +0200
Subject: [PATCH] fuck

---
 config/hosts/wind/data/secrets/secrets.nix    | Bin 866 -> 963 bytes
 .../wind/data/secrets/synapse_extra_config    | Bin 0 -> 683 bytes
 config/hosts/wind/services/synapse.nix        |  23 +-----------------
 config/sources/nix/sources.json               |  18 +++++++-------
 4 files changed, 10 insertions(+), 31 deletions(-)
 create mode 100644 config/hosts/wind/data/secrets/synapse_extra_config

diff --git a/config/hosts/wind/data/secrets/secrets.nix b/config/hosts/wind/data/secrets/secrets.nix
index 815cba8d9dc5b16e1144e704fa5104a41c342684..063fd3a8371eadd236eca8f600bca97aa6f28686 100644
GIT binary patch
literal 963
zcmZQ@_Y83kiVO&0keKr4t>xP9t+CAl&3Ecv=Na2eemYtk^>ae3mgQV`!^G0spzU8Y
zwm2>nt}2#(Y_~y9YRat>@og8{yT2y|9Ok<{=huynuI!yVZ*SDAdH8yxl*s(EE?2ZP
zvez(3x}3@QXKtu|-8!?wUDYFK^^?bkZfWUlKmWN{C19`1(QNUf>=8Ll0bAo=t&p4H
z?fg@GiuLY|`Pu&S7qbe!&bxA0bymij-Cfi7-W6ioQ+D|7>5l)M&ObMCe~B$WWI6A4
z+4_&u{~eq=#c^j~is;F(6aVHa{4`56a@Zkcyz;iHj_rzfb@~T3d*&-KeV(z(uSS~b
z-n%u90u_wg9?Lkz7;zYR$Tpmdh<W$vo{)gdx?nB83rATqyv>T%n$`%i{W|rC*|6&7
zbz!yacdwsFhkuZl=X}jo@~L9#yoc;6Dlrq*&YinFBgd=ue&afsnO;gyYegsc+MUQx
zi*9e>dbGl4;)WXn*~XeBS`S{zvQ)BP=Pq0=<y~9xKyC5n<n0xqb8Gay6Sur$dGsS%
z(eL4^$yF~adMA2I<T$$?y}hgW;WYPO?hmx4UoXhz<#plX7k~Qp@XF7Yil+~JFEu(^
z?m5Hg$=2MmvTGZ)%opvnDb8Rka_^kM>%sOQ@~4UagH2xrtoJnTG;ZS)NSb`uu;#;A
zwMo}(e(yDzzvpG-3tqLeY;m$l7cQUVzkkZNpQB1^>FTt?>B=4c<=cD}*2Xpz>tB)O
zV3#aScgZu{x&Ld@`(vkOi7pQ1k1ey>Vt2^?W0SPUXU9vubq*gVN-&)~S0W_C`)>Bn
zZtX*sPW#u*oitHZB~kr8Z>w{3YUkpri{EGb{`^<8P;7E*XXp&BM>b)K`8!LNF6GO(
z<}P5*)1cJ*vBpPpamw=~F{fE~<vxU2`z~k6Y%>*CO)Ohl5F2ag!M2!3kWnmSr_u*&
z6~QvM)1Kx`M?@l96;ijDHb4IpvuN@R&VQ<VwfbK@yO8C$`D}=TNadEZftT61syFXv
ze3ySEsY-L1P2>J83%4JfWL>}8@%_?|71b<9AA2S+P4(T>(?50P=8LNhtwk#SFWK;j
zW5G7gQirfoYmJf@|JJH2JlgcHLNx8S=7;c?1{)gdIV(F4z01=6`7}{QYK_AagLro5
zX0y5mg&BYT-t@>VKA#`Cr#a4h+Oq{0{s^(&7xiD-vE*z6zsWq|3(I~t_Wvr)+NDr!
z$YH(huFLz)F(MXcW8Am$-fjBk@adE4^8kmBZY~WRHrmYUe^;(Gc;D;7{QTe1?n};#
f-mE*RZ6;;4u2^A3lIhi)i3d&Mezv<zO??OeX4cNj

literal 866
zcmZQ@_Y83kiVO&0n9U@5Qe%>EbDHaJMaf_LxA{1_PuP9wYT7J$v9PUT{E26$ocD=P
z<!Q}Vt16rqD#5g2%hDrLrWri<d>5#?{GiK8!_4{0Pg!=hRL(mZ)b3xV^7GBFwZ7BY
zE?Bk8?RfD(Nb*u}ugBMlB-43C>ix$VxFxt99xw51sry!CCMWFUa#&tEAddakDxWrE
z-=rm9x9xtMB`>k+<?Hq9MZGR1sGNwf_uA!FcxPF0#jev`J@zUgZx>&7`~ByM^i|#!
zFSPB&3xzLS{8pOz<=2f~3Bl_1J3GH8UHdA_wrcOI=+5JZ`*y5uW1g^{IZ-!Cv0M4n
zHIFkJ_(jBni+;!Mls=Yt?9^$Csgld(IP1A3?oMF)dvd9SmzH-^=%Y5P$k6SJq}KYc
zJCVclUYdE<6}I}I{Vz{H?d-XJPVH;Ra?Qi-&p(Ly%jq0#;L(dn(5h5?^7|r#=9?L+
z+bZW&`7`C)v%9;0y;7|3yvugU@tA|=QT#6wG}fHDdpD}9vd@NZOR26|Rk-Q9CwgX5
zF<aN{o#)qj)##_rQKQlc#y6$7_QX^f9bKQRCSd>k_dDIG^Db8{J02s#a>ar_?8MaV
z5iG*%rioYk?Ny2uf6o{pB{%uTB?Y%cvBv>k<tdZI7;bSc3G2_4JM5%2p|?~=_^wc+
z>s}|z14fFwocrqKju|K<t@gjxu)p*f&+e(e1e&fru~&ImcQka4&lCSSTBqvn@h_Cj
z>NRv+71(*$P<#6?_8BZEwuEy2Y1V$hnVpkdbVYJg?PuR}XFQaY1=p+>En!RgvGm&A
z<2LRK&hFHHwX>%y<g<m;x(}Mle{~KuueqPpwI%Ayr`Wlv$w@1>81TDKUN6btZg%Wv
z(u!F9o94S;&tl|Pi83*?+bUiW7Oyn(f0sbm;X5UM=M0@+mPZE*L@Fy4@a#Pu-P0@o
zcI(^g0$c6l3O=j|5&x#wAAH8yocUdUfu^?G%0GsZ1y#mtu9#KU?@|crSu4yCQSj&N
z*16v%7nzmpi2n5A_Vj~3J_Q|e3$i|Mo?se&@qajT*uoD*vpYUV39mSMLt?taef^JK
z5vzmlu3wXRYxNC%5vR3$=>k_m`Z$Vy@p=muC!LEGWn;ZmdcXccTK<BL`X37QlQ*97
gSL2?r`*^k^Pptj7bZ7VY-OQ^jKF#ep^840t00<?T00000

diff --git a/config/hosts/wind/data/secrets/synapse_extra_config b/config/hosts/wind/data/secrets/synapse_extra_config
new file mode 100644
index 0000000000000000000000000000000000000000..2b6eb7afca09f78437ed30d99c076e2d4022988d
GIT binary patch
literal 683
zcmZQ@_Y83kiVO&0xNt%I|Bn+jlf4&eZDMh~X?^0)(*3$G<LayKns-mwa&9tPXkpzX
zH$nNXDB+kyL8t!Mv#pWaReo=q`?3C*``)Wh1h&o>{rSbGznnwq0O$QliHYa`Ex2)1
zd5=2(v-=&tj(#w$vYG7U+pw+u@dx#{g<8ovQ*3sxZ>V{Bm+^#=;ajPoCr?kTXNcM;
zD!YC6DTR!$965jQ#l>`AStx(Xvp@Q}Q>^LQiiUXAw{Ax+$ynBTGZc7CKl%AXM8_d5
z*`51;YUrKHj@+-zmC>7e;Ap|Iw8nWEPr5t`bUS*V>g?S5>@<URNsL%P|H-_FCw&6x
zrU!DKD6-Wu{P<C#AaG?tseI9%zrk_~l!C<<E<1Dc&zrr1-G?5S8E)`otgMec#~}WC
z^@Dv=gm-RxmAte4X<$GNgUm(wzm1^=S-v|i1luTZ@qfzm-WGnW;aT6t32Xdz2AH0V
zmA>LNTW|V|NgRvb3ZFKT(3{ek$$Mncxt$GG?Vs|Od}!at=P715A^cI=x^-ry=VzFx
zG~1{Pmu^fE@3_J5x2wVaIxFkth>wSbHg-N|3oz5Y)w0^I$z)|)a$@NM9>E8TdrHD>
zw1ZA0oaAm2?vpIFDVdai=IzboKP%3<C5wHUp13jk-+?!J5=Y*2sOL}J!YVNFn4y&o
z$Ly^dk=ys)xH$FHNp9(Db3gdVWM@uY{`{V!vUBPEe&PGaLae%yD-t#YxNlMH^I7R`
zUUtxV)`k_qyQfXNV0Gmq*B*to(`Nz<dnI32`~Lo4<aA-~SC;EMnI`G+#{a7H<s;8G
z@%ptCI;?X1Slp~sEblCr$Tf>$>B?Xi$Np}vL@}KMzUPDL()M=grCPVSp6$7QJ@rf*
wZ^1Tm#plj!>E$o4?UAc+{af($pYnlSE6ZM{{WtBO-7?uWn%UyZe1q9V0M>p?&;S4c

literal 0
HcmV?d00001

diff --git a/config/hosts/wind/services/synapse.nix b/config/hosts/wind/services/synapse.nix
index 7d9feb2..c5899eb 100644
--- a/config/hosts/wind/services/synapse.nix
+++ b/config/hosts/wind/services/synapse.nix
@@ -4,6 +4,7 @@
   services.matrix-synapse = {
     enable = true;
     withJemalloc = true;
+    extraConfigFiles = [ config.secrets.files.synapse_extra_config.file ];
     settings = {
       server_name = "graven.dev";
       enable_registration = false;
@@ -24,28 +25,6 @@
         "turns:turn.graven.dev:5350?transport=tcp"
       ];
       report_stats = true;
-
-      extraConfig = ''
-  password_config:
-    enabled: false
-  oidc_providers:
-    - idp_id: authentik
-      idp_name: authentik
-      discover: true
-      issuer: "https://auth.graven.dev/application/o/synapse/"
-      client_id: "7a77036d3b360265895f2ab5a51264ba586c93d5"
-      client_secret: "a9f9146fd13338230481a71c824d122bfb5e8a2118f2cdaf882746ad6726aeecd50ef522338acec89d3f8ccb8014124e022a6af6769807ea4271931f219a3f55"
-      allow_existing_users: true
-      scopes:
-        - "openid"
-        - "profile"
-        - "email"
-      user_mapping_provider:
-        config:
-          localpart_template: "{{ user.name }}"
-          display_name_template: "{{ user.name|capitalize }}"
-      '';
-
       logConfig = ''
   version: 1
 
diff --git a/config/sources/nix/sources.json b/config/sources/nix/sources.json
index b49671b..a544f32 100644
--- a/config/sources/nix/sources.json
+++ b/config/sources/nix/sources.json
@@ -17,10 +17,10 @@
         "homepage": "",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "ea3efc80f8ab83cb73aec39f4e76fe87afb15a08",
-        "sha256": "0h87y6z42ch128j6yslydvdzajqcrqzhihi4nrpwida4js2pl1ak",
+        "rev": "12620020f76b1b5d2b0e6fbbda831ed4f5fe56e1",
+        "sha256": "061bvqikx69rz6kz4ya8ksnk226gfdjvzy6j2lbi0vj398xmd2fk",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixos-hardware/archive/ea3efc80f8ab83cb73aec39f4e76fe87afb15a08.tar.gz",
+        "url": "https://github.com/NixOS/nixos-hardware/archive/12620020f76b1b5d2b0e6fbbda831ed4f5fe56e1.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs": {
@@ -29,10 +29,10 @@
         "homepage": "",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c55096e021c6ab0be3945be2535b3b4324e4f571",
-        "sha256": "0smvw72cv80zq1y1y5vjfjbz0bv6mg8iznhv779s2vn5dz1s3kwx",
+        "rev": "22b6dc7dbd0fed58f41c117123494c6ed691fdb8",
+        "sha256": "1p88904pshasnivgw44m3vv14gwrq6cf25301spx3vpw89f48d2a",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/c55096e021c6ab0be3945be2535b3b4324e4f571.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/22b6dc7dbd0fed58f41c117123494c6ed691fdb8.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixus": {
@@ -41,10 +41,10 @@
         "homepage": "",
         "owner": "Infinisil",
         "repo": "nixus",
-        "rev": "a7b742f2f4c9d37cd84b8f0ab7ee57c4b3d9f393",
-        "sha256": "0pyplivs96vxnnnj3w8drd806xxzhrxcn969hh1bhbds4h4s5k16",
+        "rev": "bc40879a51c0739b83e3a0bd6381fe0bf51b0649",
+        "sha256": "0ky0dgrfpsgcgzk1jfzqzfa7f4pjrpqijjqbg97mpibwmxzj5qr4",
         "type": "tarball",
-        "url": "https://github.com/Infinisil/nixus/archive/a7b742f2f4c9d37cd84b8f0ab7ee57c4b3d9f393.tar.gz",
+        "url": "https://github.com/Infinisil/nixus/archive/bc40879a51c0739b83e3a0bd6381fe0bf51b0649.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }