From e5bb75e0b67d01b8b617fd2a235322b19a3d9b1d Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Fri, 4 Nov 2022 13:01:07 +0100 Subject: [PATCH] Fix various imports --- modules/desktop/default.nix | 2 +- modules/nix-alien/default.nix | 2 +- systems/desktop-vm/default.nix | 8 ++++---- systems/git/default.nix | 2 +- systems/gwyn/default.nix | 12 ++++++------ systems/loki-test/default.nix | 2 +- systems/mail/default.nix | 2 +- systems/management/default.nix | 2 +- systems/nextcloud/default.nix | 2 +- systems/pihole/default.nix | 2 +- systems/plex/default.nix | 2 +- systems/proxy/default.nix | 2 +- systems/staubfinger/default.nix | 8 ++++---- systems/ttrss/default.nix | 2 +- 14 files changed, 25 insertions(+), 25 deletions(-) diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index 6c6e034..a6db78d 100644 --- a/modules/desktop/default.nix +++ b/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; diff --git a/modules/nix-alien/default.nix b/modules/nix-alien/default.nix index 279f39a..f6f3ff8 100644 --- a/modules/nix-alien/default.nix +++ b/modules/nix-alien/default.nix @@ -1,4 +1,4 @@ -{ inputs }: { pkgs, ... }: +{ pkgs, ... }: { programs.nix-ld.enable = true; environment.systemPackages = with pkgs; [ diff --git a/systems/desktop-vm/default.nix b/systems/desktop-vm/default.nix index 5995417..00927f2 100644 --- a/systems/desktop-vm/default.nix +++ b/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 = [ diff --git a/systems/git/default.nix b/systems/git/default.nix index ffe76b2..9a318d5 100644 --- a/systems/git/default.nix +++ b/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" ]; } diff --git a/systems/gwyn/default.nix b/systems/gwyn/default.nix index dbe6079..f99e4ac 100644 --- a/systems/gwyn/default.nix +++ b/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" diff --git a/systems/loki-test/default.nix b/systems/loki-test/default.nix index 1dfdec6..f9607d5 100644 --- a/systems/loki-test/default.nix +++ b/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" diff --git a/systems/mail/default.nix b/systems/mail/default.nix index c16bcea..bcf4c99 100644 --- a/systems/mail/default.nix +++ b/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" ]; diff --git a/systems/management/default.nix b/systems/management/default.nix index bb1c5f8..7778fa1 100644 --- a/systems/management/default.nix +++ b/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 diff --git a/systems/nextcloud/default.nix b/systems/nextcloud/default.nix index 0fe320b..e958c8d 100644 --- a/systems/nextcloud/default.nix +++ b/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" ]; diff --git a/systems/pihole/default.nix b/systems/pihole/default.nix index 0ae2818..28d14a8 100644 --- a/systems/pihole/default.nix +++ b/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" ]; diff --git a/systems/plex/default.nix b/systems/plex/default.nix index 336e82d..0d26804 100644 --- a/systems/plex/default.nix +++ b/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" ]; diff --git a/systems/proxy/default.nix b/systems/proxy/default.nix index 701e0f5..d4b0ab9 100644 --- a/systems/proxy/default.nix +++ b/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" diff --git a/systems/staubfinger/default.nix b/systems/staubfinger/default.nix index c4de560..e1921ea 100644 --- a/systems/staubfinger/default.nix +++ b/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" diff --git a/systems/ttrss/default.nix b/systems/ttrss/default.nix index 4302018..806070b 100644 --- a/systems/ttrss/default.nix +++ b/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" ]; }