nix-configs

commit e1cacc6a8a48a1e5c465b0cf46228beffad27328
parent e5321487a0f985f53e9fc398c4ea9176222ca716
Author: breadcat <breadcat@users.noreply.github.com>
Date:   Tue,  5 Aug 2025 18:06:44 +0100

Add htpasswd variable

Diffstat:
M
common/docker.nix
 | 
2
+-
M
entrypoint.nix
 | 
4
++--
M
machines/artemis.nix
 | 
3
++-

3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/common/docker.nix b/common/docker.nix
@@ -1,4 +1,4 @@
-{ pkgs, username, domain, timezone, todosecret, vpnusername, vpnpassword, ... }: {
+{ pkgs, username, domain, timezone, todosecret, htpasswd, vpnusername, vpnpassword, ... }: {
 
   # Runtime
   virtualisation.docker.enable = true;
diff --git a/entrypoint.nix b/entrypoint.nix
@@ -5,7 +5,7 @@
   ...
 }: let
   vars = import ./variables.nix { inherit lib; };
-  inherit (vars) fullname username domain email sshkey sshport timezone vpnusername vpnpassword todosecret;
+  inherit (vars) fullname username domain email sshkey sshport timezone htpasswd vpnusername vpnpassword todosecret;
 
   hostname =
     if builtins.pathExists "/etc/hostname"
@@ -16,6 +16,6 @@
   osConfigPath = ./machines + "/${machine}.nix";
 in {
   imports = [
-    (import osConfigPath { inherit config pkgs lib fullname username domain email sshkey sshport timezone vpnusername vpnpassword todosecret machine ; })
+    (import osConfigPath { inherit config pkgs lib fullname username domain email sshkey sshport timezone htpasswd vpnusername vpnpassword todosecret machine ; })
   ];
 }
 \ No newline at end of file
diff --git a/machines/artemis.nix b/machines/artemis.nix
@@ -10,6 +10,7 @@
   sshkey,
   sshport,
   timezone,
+  htpasswd,
   todosecret,
   vpnusername,
   vpnpassword,
@@ -23,7 +24,7 @@ in {
     [
     ./${machine}-hardware.nix # Include the results of the hardware scan.
     (import "${home-manager}/nixos") # Home-Manager
-    (import ../common/docker.nix {inherit config pkgs username domain timezone todosecret vpnusername vpnpassword;})
+    (import ../common/docker.nix {inherit config pkgs username domain timezone htpasswd todosecret vpnusername vpnpassword;})
     (import ../common/blog-duolingo.nix {inherit pkgs domain username;})
     ../common/flakes.nix
     ../common/garbage.nix