Fix various imports

modules/desktop/default.nix

@@ -3,7 +3,7 @@
   imports = [
     "${inputs.self}/modules/hunspell"
     "${inputs.self}/modules/nix-alien"
-    "${inputs.self}/modules/libimobiledevice"
+    (import "${inputs.self}/modules/libimobiledevice" { inherit custom; })
   ];
   networking = {
     networkmanager.enable = true;

modules/nix-alien/default.nix

@@ -1,4 +1,4 @@
-{ inputs }: { pkgs, ... }:
+{ pkgs, ... }:
 {
   programs.nix-ld.enable = true;
   environment.systemPackages = with pkgs; [

systems/desktop-vm/default.nix

@@ -1,11 +1,11 @@
 { hostname, inputs }: { ... }:
 {
   imports = [
-    "${inputs.self}/modules/desktop"
-    "${inputs.self}/modules/docker"
-    "${inputs.self}/modules/espanso"
+    (import "${inputs.self}/modules/desktop" { inherit custom inputs; })
+    (import "${inputs.self}/modules/docker" { inherit custom; })
+    (import "${inputs.self}/modules/espanso" { inherit custom; })
     "${inputs.self}/modules/logs-share"
-    "${inputs.self}/modules/nix-direnv"
+    (import "${inputs.self}/modules/nix-direnv" { inherit custom; })
     "${inputs.self}/modules/tmux"
   ];
   boot.initrd.availableKernelModules = [

systems/git/default.nix

@@ -17,7 +17,7 @@ in
     (import "${inputs.self}/modules/gitea" {
       inherit domain inputs;
     })
-    "${inputs.self}/modules/docker"
+    (import "${inputs.self}/modules/docker" { inherit custom; })
     "${inputs.self}/modules/mariadb"
   ];
 }

systems/gwyn/default.nix

@@ -9,14 +9,14 @@
     "${inputs.self}/hardware/dvd"
     "${inputs.self}/modules/data-share"
     (import "${inputs.self}/modules/desktop" { inherit custom inputs; })
-    "${inputs.self}/modules/docker"
-    "${inputs.self}/modules/droidcam"
-    "${inputs.self}/modules/eog"
-    "${inputs.self}/modules/espanso"
+    (import "${inputs.self}/modules/docker" { inherit custom; })
+    (import "${inputs.self}/modules/droidcam" { inherit custom; })
+    (import "${inputs.self}/modules/eog" { inherit custom; })
+    (import "${inputs.self}/modules/espanso" { inherit custom; })
     "${inputs.self}/modules/lockscreen"
     "${inputs.self}/modules/logs-share"
-    "${inputs.self}/modules/nix-direnv"
-    "${inputs.self}/modules/pipewire"
+    (import "${inputs.self}/modules/nix-direnv" { inherit custom; })
+    (import "${inputs.self}/modules/pipewire" { inherit custom; })
     "${inputs.self}/modules/scripts"
     "${inputs.self}/modules/tlp"
     "${inputs.self}/modules/tmux"

systems/loki-test/default.nix

@@ -5,7 +5,7 @@
       ip = "10.7.89.10";
       inherit hostname inputs;
     })
-    "${inputs.self}/modules/docker"
+    (import "${inputs.self}/modules/docker" { inherit custom; })
     "${inputs.self}/modules/pihole" # needs to be limited to lan interface
     "${inputs.self}/modules/router"
     "${inputs.self}/modules/tmux"

systems/mail/default.nix

@@ -11,7 +11,7 @@
     (import "${inputs.self}/modules/nginx-proxy" {
       domain = "mail.zweili.org"; inherit inputs;
     })
-    "${inputs.self}/modules/docker"
+    (import "${inputs.self}/modules/docker" { inherit custom; })
     "${inputs.self}/modules/docker-mailserver"
     "${inputs.self}/modules/mariadb"
   ];

systems/management/default.nix

@@ -8,7 +8,7 @@ in
       ip = "10.7.89.150";
       inherit hostname inputs;
     })
-    "${inputs.self}/modules/docker"
+    (import "${inputs.self}/modules/docker" { inherit custom; })
     # "${inputs.self}/modules/logs-share"
     # I currently can't install lnav because it is not building on aarch64
     # https://github.com/NixOS/nixpkgs/issues/197512

systems/nextcloud/default.nix

@@ -8,7 +8,7 @@
     (import "${inputs.self}/modules/restic-server-mysql-client" {
       time = "04:00"; inherit custom hostname inputs;
     })
-    "${inputs.self}/modules/docker"
+    (import "${inputs.self}/modules/docker" { inherit custom; })
     "${inputs.self}/modules/mariadb"
     "${inputs.self}/modules/nginx-acme-base"
   ];

systems/pihole/default.nix

@@ -10,7 +10,7 @@
       tag = "pihole";
       time = "05:00"; inherit custom hostname inputs;
     })
-    "${inputs.self}/modules/docker"
+    (import "${inputs.self}/modules/docker" { inherit custom; })
     "${inputs.self}/modules/pihole"
     "${inputs.self}/modules/unbound"
   ];

systems/plex/default.nix

@@ -10,7 +10,7 @@
       tag = "plex";
       time = "03:30"; inherit custom hostname inputs;
     })
-    "${inputs.self}/modules/docker"
+    (import "${inputs.self}/modules/docker" { inherit custom; })
     "${inputs.self}/modules/media-share"
     "${inputs.self}/modules/plex"
   ];

systems/proxy/default.nix

@@ -9,7 +9,7 @@
       time = "00:00"; inherit custom hostname inputs;
     })
     "${inputs.self}/modules/nginx-acme-base"
-    "${inputs.self}/modules/docker"
+    (import "${inputs.self}/modules/docker" { inherit custom; })
     "${inputs.self}/modules/grav"
     "${inputs.self}/modules/haproxy"
     "${inputs.self}/modules/heimdall"

systems/staubfinger/default.nix

@@ -5,10 +5,10 @@
     inputs.nixos-hardware.nixosModules.common-pc-laptop
     inputs.nixos-hardware.nixosModules.common-pc-laptop-ssd
     "${inputs.self}/hardware/bluetooth"
-    "${inputs.self}/modules/desktop"
-    "${inputs.self}/modules/docker"
-    "${inputs.self}/modules/droidcam"
-    "${inputs.self}/modules/espanso"
+    (import "${inputs.self}/modules/desktop" { inherit custom inputs; })
+    (import "${inputs.self}/modules/docker" { inherit custom; })
+    (import "${inputs.self}/modules/droidcam" { inherit custom; })
+    (import "${inputs.self}/modules/espanso" { inherit custom; })
     "${inputs.self}/modules/lockscreen"
     "${inputs.self}/modules/restic"
     "${inputs.self}/modules/tlp"

systems/ttrss/default.nix

@@ -19,7 +19,7 @@ in
     (import "${inputs.self}/modules/ttrss" {
       inherit domain inputs;
     })
-    "${inputs.self}/modules/docker"
+    (import "${inputs.self}/modules/docker" { inherit custom; })
     "${inputs.self}/modules/mariadb"
   ];
 }