summary refs log tree commit diff
path: root/hosts
diff options
context:
space:
mode:
authortzlil <tzlils@protonmail.com>2023-05-14 00:25:03 +0300
committertzlil <tzlils@protonmail.com>2023-05-14 00:25:03 +0300
commit8c6a913ca8b4f810c4a59ecc63da96e35b38418f (patch)
treed1de94a48ffee91938c077802484b451c855d182 /hosts
parent3f671fc05742109633339de45e86819e13b88c7f (diff)
persist schildi on laptop, recommit i3status config
Diffstat (limited to 'hosts')
-rw-r--r--hosts/laptop/cfg.nix9
-rw-r--r--hosts/vps/matrix.nix27
2 files changed, 21 insertions, 15 deletions
diff --git a/hosts/laptop/cfg.nix b/hosts/laptop/cfg.nix
index e7042df..21a27fe 100644
--- a/hosts/laptop/cfg.nix
+++ b/hosts/laptop/cfg.nix
@@ -88,7 +88,14 @@
 
     networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true;
     networking.networkmanager.enable = true;
-    environment.persistence."/nix/persist".directories = ["/etc/NetworkManager/system-connections"];
+    environment.persistence."/nix/persist".directories = [
+      "/etc/NetworkManager/system-connections"
+      {
+        directory = "/home/tzlil/.config/SchildiChat";
+        user = "tzlil";
+        group = "users";
+      }
+    ];
 
     nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
     powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
diff --git a/hosts/vps/matrix.nix b/hosts/vps/matrix.nix
index f47f149..335d304 100644
--- a/hosts/vps/matrix.nix
+++ b/hosts/vps/matrix.nix
@@ -27,11 +27,11 @@
     # networking.firewall.allowedTCPPorts = [80 443];
 
     age.secrets.matrix = {
-        file = ../../secrets/matrix.age;
-        mode = "600";
-        owner = "root";
-        group = "root";
-      };
+      file = ../../secrets/matrix.age;
+      mode = "600";
+      owner = "root";
+      group = "root";
+    };
 
     services.dendrite = let
       database_config = {
@@ -44,7 +44,6 @@
 
       loadCredential = ["private_key:${config.age.secrets.matrix.path}" "tlsCert:/var/lib/caddy/.local/share/caddy/certificates/acme-v02.api.letsencrypt.org-directory/tzlil.net/tzlil.net.crt" "tlsKey:/var/lib/caddy/.local/share/caddy/certificates/acme-v02.api.letsencrypt.org-directory/tzlil.net/tzlil.net.key"];
 
-
       # tlsCert = "$CREDENTIALS_DIRECTORY/tlsCert";
       # tlsKey = "$CREDENTIALS_DIRECTORY/tlsKey";
 
@@ -100,13 +99,14 @@
       };
     };
 
-    systemd.services.dendrite.serviceConfig.ExecStart = lib.mkForce (lib.strings.concatStringsSep " " ([
-          "${pkgs.dendrite}/bin/dendrite-monolith-server"
-          "--config /run/dendrite/dendrite.yaml"
-          "--http-bind-address :8008"
-          "--https-bind-address :8448"
-          "--tls-cert $CREDENTIALS_DIRECTORY/tlsCert"
-          "--tls-key $CREDENTIALS_DIRECTORY/tlsKey"]));
+    systemd.services.dendrite.serviceConfig.ExecStart = lib.mkForce (lib.strings.concatStringsSep " " [
+      "${pkgs.dendrite}/bin/dendrite-monolith-server"
+      "--config /run/dendrite/dendrite.yaml"
+      "--http-bind-address :8008"
+      "--https-bind-address :8448"
+      "--tls-cert $CREDENTIALS_DIRECTORY/tlsCert"
+      "--tls-key $CREDENTIALS_DIRECTORY/tlsKey"
+    ]);
 
     services.postgresql = {
       enable = true;
@@ -141,7 +141,6 @@
 
     systemd.services.dendrite.after = ["postgresql.service"];
 
-
     services.caddy = {
       # for federation
       virtualHosts."tzlil.net:8448".extraConfig = ''