Hevana: auto-detect subdomains; General: break out util functions into separate file

hosts/Hevana/default.nix

@@ -1,4 +1,9 @@
-{ config, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 
 let
   # Do not change this value! This tracks when NixOS was installed on your system.
@@ -18,17 +23,20 @@ let
     ''}";
   };
 
-  # List of subdomains to add to the TLS certificate
+  /*
-  subdomains = with config.secrets.services; [
+    Add subdomains from enabled services to TLS certificate.
-    binary-cache.url
+
-    forgejo.url
+    This doesn't _exactly_ check for enabled services, only:
-    gremlin-lab.url
+      1. Services that aren't ACME
-    jellyfin.url
+      2. Services with an "enable" attribute.
-    languagetool.url
+
-    netdata.url
+    It still works though, so ¯\_(ツ)_/¯
-    qbittorrent.url
+  */
-    rss.url
+  serviceList = lib.attrsets.collect (
-  ];
+    x: x != "acme" && builtins.hasAttr "enable" x
+  ) config.aux.system.services;
+  subdomains = builtins.catAttrs "url" serviceList;
+
 in
 {
   imports = [ ./hardware-configuration.nix ];

modules/common.nix

@@ -1,62 +1,45 @@
 # Modules common to all systems
 {
   inputs,
-  lib,
   pkgs,
   ...
 }:
 
 {
-  config = {
+  # Install base packages
-    # Install base packages
+  aux.system.packages = with pkgs; [
-    aux.system.packages = with pkgs; [
+    fastfetch # Show a neat system statistics screen when opening a terminal
-      fastfetch # Show a neat system statistics screen when opening a terminal
+    htop # System monitor
-      htop # System monitor
+    lm_sensors # System temperature monitoring
-      lm_sensors # System temperature monitoring
+    zellij # Terminal multiplexer
-      zellij # Terminal multiplexer
+  ];
-    ];
 
-    # Install the nos helper script
+  # Install the nos helper script
-    aux.system.nixos-operations-script.enable = true;
+  aux.system.nixos-operations-script.enable = true;
 
-    nixpkgs.overlays = [
+  # Allow packages from the unstable repo by using 'pkgs.unstable'
-      (final: _prev: {
+  nixpkgs.overlays = [
-        # Allow packages from the unstable repo by using 'pkgs.unstable'
+    (final: _prev: {
-        unstable = import inputs.nixpkgs-unstable {
+      unstable = import inputs.nixpkgs-unstable {
-          system = final.system;
+        system = final.system;
-          config.allowUnfree = true;
+        config.allowUnfree = true;
-        };
+      };
+    })
+  ];
 
-        # Define custom functions using 'pkgs.util'
+  programs = {
-        util = {
+    # Install ZSH for all users
-          # Parses the domain from a URL
+    zsh.enable = true;
-          getDomainFromURL =
-            url:
-            let
-              parsedURL = (lib.strings.splitString "." url);
-            in
-            builtins.concatStringsSep "." [
-              (builtins.elemAt parsedURL 1)
-              (builtins.elemAt parsedURL 2)
-            ];
-        };
-      })
-    ];
 
-    programs = {
+    # Configure nano
-      # Install ZSH for all users
+    nano.nanorc = ''
-      zsh.enable = true;
+      set tabsize 4
-
+      set softwrap
-      # Configure nano
+      set autoindent
-      nano.nanorc = ''
+      set indicator
-        set tabsize 4
+    '';
-        set softwrap
-        set autoindent
-        set indicator
-      '';
-    };
-
-    # Set ZSH as the default shell
-    users.defaultUserShell = pkgs.zsh;
   };
+
+  # Set ZSH as the default shell
+  users.defaultUserShell = pkgs.zsh;
 }

modules/services/binary-cache.nix

@@ -49,7 +49,7 @@ in
       };
 
       nginx.virtualHosts."${cfg.url}" = {
-        useACMEHost = pkgs.util.getDomainFromURL cfg.url;
+        useACMEHost = pkgs.util.getDomainFromURI cfg.url;
         forceSSL = true;
         basicAuth = {
           "${cfg.auth.user}" = cfg.auth.password;

modules/services/forgejo.nix

@@ -32,7 +32,7 @@ in
         enable = true;
         settings = {
           server = {
-            DOMAIN = pkgs.util.getDomainFromURL cfg.url;
+            DOMAIN = pkgs.util.getDomainFromURI cfg.url;
             ROOT_URL = cfg.url;
             HTTP_PORT = 3000;
           };
@@ -42,7 +42,7 @@ in
       } // lib.optionalAttrs (cfg.home != null) { stateDir = cfg.home; };
 
       nginx.virtualHosts."${cfg.url}" = {
-        useACMEHost = pkgs.util.getDomainFromURL cfg.url;
+        useACMEHost = pkgs.util.getDomainFromURI cfg.url;
         forceSSL = true;
         locations."/" = {
           proxyPass = "http://127.0.0.1:3000";

modules/services/jellyfin.nix

@@ -34,7 +34,7 @@ in
 
     services = {
       nginx.virtualHosts."${cfg.url}" = {
-        useACMEHost = pkgs.util.getDomainFromURL cfg.url;
+        useACMEHost = pkgs.util.getDomainFromURI cfg.url;
         forceSSL = true;
         locations."/" = {
           proxyPass = "http://127.0.0.1:8096";

modules/services/languagetool.nix

@@ -56,7 +56,7 @@ in
       };
       # Create Nginx virtualhost
       nginx.virtualHosts."${cfg.url}" = {
-        useACMEHost = pkgs.util.getDomainFromURL cfg.url;
+        useACMEHost = pkgs.util.getDomainFromURI cfg.url;
         forceSSL = true;
         basicAuth = {
           "${cfg.auth.user}" = cfg.auth.password;

modules/services/netdata.nix

@@ -50,7 +50,7 @@ in
     (lib.mkIf (cfg.enable && cfg.type == "parent") {
       services = {
         nginx.virtualHosts."${cfg.url}" = {
-          useACMEHost = pkgs.util.getDomainFromURL cfg.url;
+          useACMEHost = pkgs.util.getDomainFromURI cfg.url;
           forceSSL = true;
           basicAuth = {
             "${cfg.auth.user}" = cfg.auth.password;

modules/services/qbittorrent.nix

@@ -58,7 +58,7 @@ in
   config = lib.mkIf cfg.enable {
     services = {
       nginx.virtualHosts."${cfg.url}" = {
-        useACMEHost = pkgs.util.getDomainFromURL cfg.url;
+        useACMEHost = pkgs.util.getDomainFromURI cfg.url;
         forceSSL = true;
         locations."/" = {
           proxyPass = "http://127.0.0.1:${cfg.port}";

modules/services/rss.nix

@@ -56,7 +56,7 @@ in
       };
 
       nginx.virtualHosts."${cfg.url}" = {
-        useACMEHost = pkgs.util.getDomainFromURL cfg.url;
+        useACMEHost = pkgs.util.getDomainFromURI cfg.url;
         forceSSL = true;
       };
     };

modules/util.nix

@@ -0,0 +1,25 @@
+# Utility and helper functions
+{
+  lib,
+  ...
+}:
+
+{
+  nixpkgs.overlays = [
+    (final: _prev: {
+      # Define custom functions using 'pkgs.util'
+      util = {
+        # Parses the domain from a URI
+        getDomainFromURI =
+          url:
+          let
+            parsedURL = (lib.strings.splitString "." url);
+          in
+          builtins.concatStringsSep "." [
+            (builtins.elemAt parsedURL 1)
+            (builtins.elemAt parsedURL 2)
+          ];
+      };
+    })
+  ];
+}