home/default.nix

@@ -119,7 +119,7 @@ in
   '';
 
   home.file.".jjconfig.toml".source = ./jjconfig.toml;
-  #home.file.".config/halloy/config.toml".source = ./halloy.toml;
+  home.file.".config/halloy/config.toml".source = ./halloy.toml;
 
   systemd.user.timers."backup-keepassxc" = {
     Unit.Description = "Backup password DB";

home/halloy.toml

@@ -0,0 +1,10 @@
+# Halloy config.
+#
+# For a complete list of available options,
+# please visit https://halloy.squidowl.org/configuration/index.html
+
+[servers.liberachat]
+nickname = "dadada"
+server = "irc.libera.chat"
+channels = ["#stratum0"]
+sasl.external.cert = "/home/dadada/.config/halloy/libera.pem"

nixos/configurations.nix

@@ -21,8 +21,6 @@ let
         "brgenml1lpr"
         "saleae-logic-2"
         "spotify"
-        "steam"
-        "steam-unwrapped"
       ];
   };
   nixosSystem = nixpkgs.lib.nixosSystem;

nixos/modules/element.nix

@@ -13,7 +13,7 @@ in
   };
   config = lib.mkIf cfg.enable {
     services.nginx.virtualHosts."element.${config.networking.domain}" = {
-      useACMEHost = "dadada.li";
+      enableACME = true;
       forceSSL = true;
       serverAliases = [
         "element.${config.networking.domain}"

nixos/modules/gitea.nix

@@ -82,7 +82,7 @@ in
     };
 
     services.nginx.virtualHosts."git.${config.networking.domain}" = {
-      useACMEHost = "dadada.li";
+      enableACME = true;
       forceSSL = true;
 
       locations."/".extraConfig = ''

nixos/modules/homepage.nix

@@ -19,7 +19,7 @@ with lib;
     services.nginx.enable = true;
 
     services.nginx.virtualHosts."dadada.li" = {
-      useACMEHost = "dadada.li";
+      enableACME = true;
       forceSSL = true;
       root = "${cfg.package}";
     };

nixos/modules/miniflux.nix

@@ -21,7 +21,7 @@ in
     };
 
     services.nginx.virtualHosts.${domain} = {
-      useACMEHost = "dadada.li";
+      enableACME = true;
       forceSSL = true;
 
       locations."/".extraConfig = ''

nixos/modules/share.nix

@@ -16,7 +16,7 @@ in
     services.nginx.enable = true;
 
     services.nginx.virtualHosts."share.dadada.li" = {
-      useACMEHost = "dadada.li";
+      enableACME = true;
       forceSSL = true;
 
       root = "/var/lib/share";

nixos/modules/steam.nix

@@ -15,11 +15,11 @@ in
     };
   };
   config = mkIf cfg.enable {
-    programs.steam.enable = true;
     hardware.graphics = {
       enable = true;
       extraPackages32 = with pkgs.pkgsi686Linux; [ libva ];
     };
-    services.pulseaudio.support32Bit = true;
+
+    hardware.pulseaudio.support32Bit = true;
   };
 }

nixos/modules/weechat.nix

@@ -21,7 +21,7 @@ in
     services.nginx.enable = true;
 
     services.nginx.virtualHosts."webchat.dadada.li" = {
-      useACMEHost = "dadada.li";
+      enableACME = true;
       forceSSL = true;
 
       root = pkgs.glowing-bear;
@@ -36,7 +36,7 @@ in
       };
     };
     services.nginx.virtualHosts."weechat.dadada.li" = {
-      useACMEHost = "dadada.li";
+      enableACME = true;
       forceSSL = true;
 
       root = "${pkgs.nginx}/html";

nixos/stolas/default.nix

@@ -94,7 +94,6 @@
       enable = true;
       repo = "u355513-sub5@u355513-sub5.your-storagebox.de:/home/backup";
     };
-    steam.enable = true;
   };
 
   programs = {

nixos/surgat/configuration.nix

@@ -27,7 +27,7 @@ in
   };
 
   services.nginx.virtualHosts."hydra.${config.networking.domain}" = {
-    useACMEHost = "dadada.li";
+    enableACME = true;
     forceSSL = true;
 
     root = "${pkgs.nginx}/html";
@@ -135,7 +135,6 @@ in
       22 # SSH
       80
       443 # HTTPS
-      1667
     ];
     allowedUDPPorts = [
       51234 # Wireguard
@@ -174,49 +173,5 @@ in
     '';
   };
 
-  services.soju = {
-    enable = true;
-    listen = [ "unix:///run/soju/irc.sock" ];
-    acceptProxyIP = [ "localhost" ];
-  };
-
-  # For owning the socket the right group
-  systemd.services.soju.serviceConfig.Group = "nginx";
-
-  services.nginx.streamConfig = ''
-    server {
-      listen 1667 ssl;
-      proxy_pass unix:/run/soju/irc.sock;
-      proxy_protocol on;
-      proxy_connect_timeout 1s;
-      ssl_certificate /var/lib/acme/dadada.li/fullchain.pem;
-      ssl_certificate_key /var/lib/acme/dadada.li/key.pem;
-      ssl_trusted_certificate /var/lib/acme/dadada.li/chain.pem;
-    }
-  '';
-
-  services.nginx.virtualHosts."soju.dadada.li" = {
-    useACMEHost = "dadada.li";
-    forceSSL = true;
-  };
-
-  users.groups.acme.members = [
-    "nginx"
-  ];
-
-  security.acme.certs = {
-    "dadada.li" = {
-      webroot = "/var/lib/acme/acme-challenge";
-      extraDomainNames = [
-        "element.dadada.li"
-        "hydra.dadada.li"
-        "git.dadada.li"
-        "miniflux.dadada.li"
-        "share.dadada.li"
-        "soju.dadada.li"
-      ];
-    };
-  };
-
   system.stateVersion = "23.05";
 }