wireguard/ssh: add pub.solar wireguard config

modules/desktop-extended/default.nix

@@ -12,7 +12,7 @@ in {
 
   users.users."${psCfg.user.name}".packages = with pkgs; [
     wine
-    chromium
+    ungoogled-chromium
 
     gimp
     present-md
@@ -27,6 +27,8 @@ in {
     signal-desktop
     tdesktop
     element-desktop
+    element-b12f
+    element-mezza
 
     # Nix specific utilities
     alejandra

modules/wireguard/pub.solar.nix

@@ -25,8 +25,6 @@ in {
     networking.firewall.allowedUDPPorts = [51821];
 
     systemd.services.wireguard-wg-pub-solar = {
-      enable = false;
-
       after = [
         "network.target"
         "network-online.target"
@@ -51,15 +49,19 @@ in {
         ips = cfg.ownIPs;
         privateKeyFile = cfg.privateKeyFile;
         peers = [
-          { 
-            endpoint = "flora6.pub.solar:51820";
+          {
+            endpoint = "flora-6.pub.solar:51820";
             publicKey = "jtSR5G2P/nm9s8WrVc26Xc/SQLupRxyXE+5eIeqlsTU=";
             allowedIPs = [ "10.7.6.2/32" "fd00:fae:fae:fae:fae:2::/96" ];
+            persistentKeepalive = 15;
+            dynamicEndpointRefreshSeconds = 30;
           }
-          { 
+          {
             endpoint = "nachtigall.pub.solar:51820";
             publicKey = "qzNywKY9RvqTnDO8eLik75/SHveaSk9OObilDzv+xkk=";
             allowedIPs = [ "10.7.6.1/32" "fd00:fae:fae:fae:fae:1::/96" ];
+            persistentKeepalive = 15;
+            dynamicEndpointRefreshSeconds = 30;
           }
         ];
       };

pkgs/element-desktop.nix

@@ -0,0 +1,4 @@
+{ final, profile }:
+with final; ''
+${element-desktop}/bin/element-desktop --profile=${profile}
+''

users/b12f/ssh.nix

@@ -122,10 +122,12 @@ in {
 
         "nachtigall.pub.solar" = {
           user = "barkeeper";
+          hostname = "10.7.6.1";
         };
 
         "flora-6.pub.solar" = {
           user = "barkeeper";
+          hostname = "10.7.6.2";
         };
       };
     };