From 995e9617d80afca6575c4802811bd9e1f6ac3227 Mon Sep 17 00:00:00 2001
From: Philipp Hochkamp <git@phochkamp.de>
Date: Sat, 13 Aug 2022 07:03:33 +0200
Subject: [PATCH] update

---
 darwin-common.nix                  |   2 ++
 hosts/daedalus/default.nix         |   2 +-
 nixos-modules/services/synapse.nix |   2 ++
 secrets/matrixSecrets.age          | Bin 0 -> 743 bytes
 secrets/secrets.nix                |   1 +
 5 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 secrets/matrixSecrets.age

diff --git a/darwin-common.nix b/darwin-common.nix
index ab8729fc..7547af6f 100644
--- a/darwin-common.nix
+++ b/darwin-common.nix
@@ -1,5 +1,7 @@
 { config, pkgs, ... }: {
   programs.gnupg.agent.enable = true;
+  programs.zsh.enable = true;
+  environment.pathsToLink = [ "/share/zsh" ];
   services.nix-daemon.enable = true;
   nix.package = pkgs.nixFlakes;
   nix.buildCores = 0; # use all cores
diff --git a/hosts/daedalus/default.nix b/hosts/daedalus/default.nix
index 71bb4401..f3376435 100644
--- a/hosts/daedalus/default.nix
+++ b/hosts/daedalus/default.nix
@@ -52,7 +52,7 @@ with lib.my;
     home.sessionVariables = {
       EDITOR = "nvim";
       VISUAL = "nvim";
-      PATH = "$PATH:$HOME/go/bin:/etc/profiles/per-user/ragon/bin/:$HOME/development/flutter/bin:/Applications/Android Studio.app/Contents/bin/:/Applications/Docker.app/Contents/Resources/bin:/Applications/Android Studio.app/Contents/jre/Contents/Home/bin:$HOME/.nix-profile/bin:/nix/var/nix/profiles/system/sw/bin:/nix/var/nix/profiles/per-user/ragon/home-manager/home-path/bin/";
+      PATH = "$PATH:$HOME/go/bin:$HOME/development/flutter/bin:/Applications/Android Studio.app/Contents/bin/:/Applications/Docker.app/Contents/Resources/bin:/Applications/Android Studio.app/Contents/jre/Contents/Home/bin";
       JAVA_HOME = "/Applications/Android Studio.app/Contents/jre/Contents/Home/";
     };
     home.packages = with pkgs; [
diff --git a/nixos-modules/services/synapse.nix b/nixos-modules/services/synapse.nix
index e654e64b..302960e4 100644
--- a/nixos-modules/services/synapse.nix
+++ b/nixos-modules/services/synapse.nix
@@ -28,6 +28,7 @@ in
   config = lib.mkIf cfg.enable {
     services.matrix-synapse = {
       enable = true;
+      extraConfigFiles = [ config.age.secrets.matrixSecrets.path ];
       settings.server_name = serverName;
       settings.listeners = [
         {
@@ -47,6 +48,7 @@ in
 
 
     };
+    ragon.agenix.secrets."matrixSecrets" = { owner = "matrix-synapse"; };
     services.postgresql = {
       enable = true;
     };
diff --git a/secrets/matrixSecrets.age b/secrets/matrixSecrets.age
new file mode 100644
index 0000000000000000000000000000000000000000..ea08d948e3989e02ed9922582368b664f0a92f03
GIT binary patch
literal 743
zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Pfqpr4^)UuF9@+r
zF7wDw^e-{UaxXI}(XVohEUPGSb@TCbF3$-xa7&I1)6UL{Nape|kE$vPsBm=+N{=*5
z&j?BN@lJR4DkyR>*Y`6`Nh>Wc^{_BEP0A=w@<g|-G~FXSyj-EI#M_{tsK~@QHOIxt
z%{VJEC_hKL#L2A4yErMu)5RsN$Ra)1FEAq`#FZ<v&^tfN&(Al_#H*;X$}6cjFId~m
z%%s@0Dl{joG%Zr!sVJksH!~o@IUC)!&``^uU`K^QkBCTvqKpi`0;7ro-%Q`6@^Tk1
zlN9apBKN|ytjegWaHHS?^W;hc$8@ehC)dQBk^p~`Am>OoeJ9U+FIP)*3-7#SOJ|qV
z!mv`;%>06=s)~rr;z)GcDhqRsO&t|13%#>FGb1cZLL*Ea9Sh8|DgxX>BJ#b$O(Wb3
z)6I(Yo%1t;Q(b&Qf(^L5^bLz0jl3gsd~^K6%RL<<O4F<SN}`;Slg%TmOiR3q+|#29
zor7{c%#uO2nRw=z>ZTW^CKjhEq`B$%N4hCgnW-n{7HBJ^a2c6qhxrwSmSlx`8>i)E
zMELrKm>ZRa=UbGPRD~24>SqO)n3{T~ri5mAml@<aruZ1<C8Z>qhLjY!7;1Y*IdM4^
zxdsK4Cx^LdM-=A=I962#ghjZP<rd|*dgQxQlxnB>`jtB;`Q=6idYOj?L~`ls>MEp!
zSmsrDWb3<_I)}LUhFBC?MCON^WVuwDYFAje`MYOCnglz#85!r9rE~rCRt<46jg0$a
zsu$y2Eu3L-?azGIQ}SP9%C5$rcA4e9I?jyY$YIs32Ur7+gmOfftmAwgRc&p*d9QB!
j<yn@e*f!WPM*M%K`+aKu^3~U7XD;1d{I=hcVM77{-SGVI

literal 0
HcmV?d00001

diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index 88738dba..9882c3ba 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -13,6 +13,7 @@ in
   "photoprismEnv.age".publicKeys = pubkeys.ragon.host "ds9";
   "ds9OffsiteBackupSSH.age".publicKeys = pubkeys.ragon.host "ds9";
   "hedgedocSecret.age".publicKeys = pubkeys.ragon.host "picard";
+  "matrixSecrets.age".publicKeys = pubkeys.ragon.host "picard";
   "gitlabInitialRootPassword.age".publicKeys = pubkeys.ragon.host "picard";
   "gitlabSecretFile.age".publicKeys = pubkeys.ragon.host "picard";
   "gitlabDBFile.age".publicKeys = pubkeys.ragon.host "picard";