Home: Fix nginx.

config/AutoUpdateSigned.nix

@@ -4,7 +4,6 @@
 # to prevent unathorized changes to hosts.
 {
   config,
-  const,
   lib,
   pkgs,
   secret,
@@ -40,7 +39,7 @@ in
       script = ''
         pushd /tmp
         rm -rf ./nixos
-        git clone --depth=1 --single-branch --branch=main ${const.url} ./nixos
+        git clone --depth=1 --single-branch --branch=main ${config.const.url} ./nixos
         pushd ./nixos
         git verify-commit HEAD && git fsck || {
           echo "Verification failed."

flake.nix

@@ -122,13 +122,6 @@
     let
       lib = nixpkgs.lib;
 
-      const = {
-        droidStateVersion = "24.05";
-        stateVersion = "24.11";
-        timeZone = "Europe/Moscow";
-        url = "https://git.voronind.com/voronind/nix.git";
-      };
-
       __findFile = _: p: ./${p};
 
       ls =
@@ -175,9 +168,6 @@
                   # Make a device hostname match the one from this config.
                   { networking.hostName = hostname; }
 
-                  # Specify current release version.
-                  { system.stateVersion = const.stateVersion; }
-
                   # Add Home Manager module.
                   home-manager.nixosModules.home-manager
 
@@ -203,7 +193,6 @@
                 {
                   inherit
                     __findFile
-                    const
                     inputs
                     pkgsJobber
                     pkgsMaster
@@ -258,7 +247,6 @@
           extraSpecialArgs = {
             inherit
               __findFile
-              const
               inputs
               pkgsMaster
               pkgsUnstable

home/Android.nix

@@ -2,7 +2,6 @@
 {
   __findFile,
   config,
-  const,
   inputs,
   lib,
   pkgs,
@@ -28,8 +27,8 @@ in
   config = lib.mkIf cfg.enable {
     environment.packages = package.core;
     nix.extraOptions = "experimental-features = nix-command flakes pipe-operators";
-    system.stateVersion = const.droidStateVersion;
+    system.stateVersion = config.const.droidStateVersion;
-    time.timeZone = const.timeZone;
+    time.timeZone = config.const.timeZone;
     terminal = { inherit (android) font colors; };
     home-manager.config = stylix // {
       programs = with programs; core;
@@ -37,7 +36,7 @@ in
       home = {
         inherit (env) sessionVariables;
         inherit file;
-        stateVersion = const.droidStateVersion;
+        stateVersion = config.const.droidStateVersion;
       };
     };
   };

home/NixOs.nix

@@ -2,7 +2,6 @@
 {
   __findFile,
   config,
-  const,
   lib,
   pkgs,
   util,
@@ -36,7 +35,7 @@ in
         // {
           ${user.username} = {
             home = {
-              inherit (const) stateVersion;
+              inherit (config.const) stateVersion;
               inherit (env) sessionVariables;
               inherit (user) username homeDirectory;
               inherit file;

host/x86_64-linux/home/Const.nix

@@ -0,0 +1,7 @@
+{ ... }: {
+  config.const.host = {
+    domain = "voronind.com";
+    sslCertificate = "/etc/letsencrypt/live/voronind.com/fullchain.pem";
+    sslCertificateKey = "/etc/letsencrypt/live/voronind.com/privkey.pem";
+  };
+}

host/x86_64-linux/home/Davis.nix

@@ -8,10 +8,7 @@ in
     adminPasswordFile = "${storage}/Password";
     appSecretFile = "${storage}/Secret";
     hostname = "dav.voronind.com";
-    nginx = {
+    nginx = { };
-      sslCertificate = "/etc/letsencrypt/live/voronind.com/fullchain.pem";
-      sslCertificateKey = "/etc/letsencrypt/live/voronind.com/privkey.pem";
-    };
     mail = {
       dsnFile = "${storage}/Dsn";
       inviteFromAddress = "noreply@voronind.com";

host/x86_64-linux/home/Jobber.nix

@@ -1,7 +1,6 @@
 # Use `nixos-container login jobber` as root and empty pw.
 {
   __findFile,
-  const,
   lib,
   pkgsJobber,
   poetry2nixJobber,
@@ -48,7 +47,7 @@ in
       in
       {
         boot.isContainer = true;
-        system.stateVersion = const.stateVersion;
+        system.stateVersion = "24.11";
         users = {
           users.root.password = "";
           mutableUsers = false;

host/x86_64-linux/home/Network.nix

@@ -3,7 +3,6 @@
 # fd09:8d46:b26::/48 - ULA.
 {
   config,
-  const,
   lib,
   util,
   ...
@@ -120,7 +119,7 @@ in
           PoolOffset = 100;
           PoolSize = 150;
           ServerAddress = "${internal}/24";
-          Timezone = const.timeZone;
+          Timezone = config.const.timeZone;
           UplinkInterface = wan;
         };
       };

host/x86_64-linux/home/nginx/Davis.nix

@@ -1,15 +1,14 @@
-{ lib, ... }:
+{ config, ... }:
 {
-  "dav.voronind.com" = {
+  "dav.${config.const.host.domain}" = {
-    sslCertificate = "/etc/letsencrypt/live/voronind.com/fullchain.pem";
+    inherit (config.const.host) sslCertificate sslCertificateKey;
-    sslCertificateKey = "/etc/letsencrypt/live/voronind.com/privkey.pem";
-    onlySSL = lib.mkForce true;
     locations."/".extraConfig = ''
       allow 10.0.0.0/8;
       allow fd09:8d46:b26::/48;
       deny all;
     '';
     extraConfig = ''
+      listen 443 ssl;
       include /etc/letsencrypt/conf/options-ssl-nginx.conf;
       ssl_dhparam /etc/letsencrypt/conf/ssl-dhparams.pem;
     '';

host/x86_64-linux/home/nginx/Deluge.nix

@@ -1,6 +1,6 @@
-{ ... }:
+{ config, ... }:
 {
-  "download.voronind.com".extraConfig = ''
+  "download.${config.const.host.domain}".extraConfig = ''
     listen 443 ssl;
 
     location / {

option/Const.nix

@@ -0,0 +1,26 @@
+{ lib, ... }:
+{
+  options.const = {
+    droidStateVersion = lib.mkOption {
+      default = "24.05";
+      type = lib.types.str;
+    };
+    stateVersion = lib.mkOption {
+      default = "24.11";
+      type = lib.types.str;
+    };
+    timeZone = lib.mkOption {
+      default = "Europe/Moscow";
+      type = lib.types.str;
+    };
+    url = lib.mkOption {
+      default = "https://git.voronind.com/voronind/nix.git";
+      type = lib.types.str;
+    };
+    host = lib.mkOption {
+      default = { };
+      type = lib.types.attrs;
+    };
+  };
+}
+

system/Locale.nix

@@ -1,6 +1,6 @@
-{ const, ... }:
+{ config, ... }:
 {
-  time.timeZone = const.timeZone;
+  time.timeZone = config.const.timeZone;
   i18n = {
     defaultLocale = "en_US.UTF-8";
     extraLocaleSettings = {

system/State.nix

@@ -0,0 +1,5 @@
+{ config, ... }: {
+  # Specify current release version.
+  system.stateVersion = config.const.stateVersion;
+}
+