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 00000000..ea08d948 Binary files /dev/null and b/secrets/matrixSecrets.age differ 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";