Remove custom from modules

lib/mk_computer.nix

@@ -36,7 +36,7 @@ custom.inputs.nixpkgs.lib.nixosSystem
     [
       # System configuration for this host
       (import "${custom.inputs.self}/systems/${hostname}" {
-        inherit custom hostname;
+        inherit hostname;
       })
 
       # Common configuration

lib/mk_raspi.nix

@@ -32,10 +32,10 @@ custom.inputs.nixpkgs.lib.nixosSystem {
     [
       # System configuration for this host
       (import "${custom.inputs.self}/systems/${hostname}"
-        { inherit custom hostname; })
+        { inherit hostname; })
 
       # Common configuration
-      (import "${custom.inputs.self}/modules/default.nix" { inherit custom; })
+      "${custom.inputs.self}/modules/default.nix"
       "${custom.inputs.self}/hardware/default.nix"
 
       custom.inputs.agenix.nixosModules.age

modules/default.nix

@@ -1,4 +1,4 @@
-{ custom }: { ... }:
+{ ... }:
 {
   imports = [
     ./common

modules/docker-mailserver/default.nix

@@ -1,4 +1,4 @@
-{ custom }: { config, pkgs, ... }:
+{ config, inputs, pkgs, ... }:
 let
   version = "12.1.0";
   mailserver-setup = (pkgs.writeScriptBin "mailserver-setup"
@@ -12,17 +12,17 @@ let
 in
 {
   imports = [
-    (import "${custom.inputs.self}/modules/telegram-notifications" { inherit custom; })
+    "${inputs.self}/modules/telegram-notifications"
   ];
 
   age.secrets.dkim2liCh = {
-    file = "${custom.inputs.self}/scrts/dkim_2li.ch.age";
+    file = "${inputs.self}/scrts/dkim_2li.ch.age";
     mode = "600";
     owner = "113";
     group = "115";
   };
   age.secrets.dkimZweiliCh = {
-    file = "${custom.inputs.self}/scrts/dkim_zweili.ch.age";
+    file = "${inputs.self}/scrts/dkim_zweili.ch.age";
     mode = "600";
     owner = "113";
     group = "115";

modules/gitea/default.nix

@@ -1,6 +1,6 @@
-{ custom, domain }: { config, ... }:
+{ domain }: { config, inputs, ... }:
 {
-  age.secrets.giteaEnv.file = "${custom.inputs.self}/scrts/gitea_env.age";
+  age.secrets.giteaEnv.file = "${inputs.self}/scrts/gitea_env.age";
 
   virtualisation.oci-containers = {
     backend = "docker";

modules/nextcloud/default.nix

@@ -1,4 +1,4 @@
-{ custom, domain }: { config, pkgs, ... }:
+{ domain }: { config, inputs, pkgs, ... }:
 let
   nextcloudEnvironment = {
     MYSQL_DATABASE = "nextcloud";
@@ -17,7 +17,7 @@ let
   cronService = "${config.virtualisation.oci-containers.backend}-cron";
 in
 {
-  age.secrets.nextcloudEnv.file = "${custom.inputs.self}/scrts/nextcloud_env.age";
+  age.secrets.nextcloudEnv.file = "${inputs.self}/scrts/nextcloud_env.age";
 
   services.mysql.settings = {
     mysqld = {
@@ -36,7 +36,7 @@ in
       environment = nextcloudEnvironment;
       environmentFiles = [ config.age.secrets.nextcloudEnv.path ];
       volumes = [
-        "${custom.inputs.self}/modules/nextcloud/custom-php.ini:/usr/local/etc/php/conf.d/zzz-custom.ini"
+        "${inputs.self}/modules/nextcloud/custom-php.ini:/usr/local/etc/php/conf.d/zzz-custom.ini"
         "/etc/localtime:/etc/localtime:ro"
       ];
       dependsOn = [ "redis" ];
@@ -54,7 +54,7 @@ in
         "8080:80"
       ];
       volumes = [
-        "${custom.inputs.self}/modules/nextcloud/nginx.conf:/etc/nginx/nginx.conf:ro"
+        "${inputs.self}/modules/nextcloud/nginx.conf:/etc/nginx/nginx.conf:ro"
         "/etc/localtime:/etc/localtime:ro"
       ];
       extraOptions = [

modules/nginx-fpm/default.nix

@@ -1,8 +1,8 @@
-{ custom, dataDir, documentRoot ? "/var/www/html", domain, port ? "9000", }:
-{ pkgs, ... }:
+{ dataDir, documentRoot ? "/var/www/html", domain, port ? "9000", }:
+{ inputs, pkgs, ... }:
 {
   imports = [
-    "${custom.inputs.self}/modules/nginx-acme-base"
+    "${inputs.self}/modules/nginx-acme-base"
   ];
   services.nginx = {
     appendHttpConfig = ''

modules/nginx-proxy/default.nix

@@ -1,6 +1,6 @@
-{ custom, domain, port ? "8080" }: { ... }: {
+{ domain, port ? "8080" }: { inputs, ... }: {
   imports = [
-    "${custom.inputs.self}/modules/nginx-acme-base"
+    "${inputs.self}/modules/nginx-acme-base"
   ];
   services.nginx = {
     appendHttpConfig = ''

modules/plex/default.nix

@@ -1,6 +1,6 @@
-{ custom }: { config, ... }:
+{ config, inputs, ... }:
 {
-  age.secrets.plexClaim.file = "${custom.inputs.self}/scrts/plex_claim.age";
+  age.secrets.plexClaim.file = "${inputs.self}/scrts/plex_claim.age";
   networking = {
     firewall.allowedTCPPorts = [
       32400 # Web Interface/ Remote Access

modules/rclone-webdav/default.nix

@@ -1,4 +1,4 @@
-{ custom }: { config, pkgs, ... }:
+{ config, pkgs, inputs, ... }:
 let
   pathToMonitor = "/home/${config.az-username}/10_documents/";
   syncNotes = pkgs.writeShellScriptBin "monitor-notes" ''
@@ -7,13 +7,10 @@ let
 in
 {
   imports = [
-    (import "${custom.inputs.self}/modules/telegram-notifications"
-      {
-        inherit custom;
-      })
+    "${inputs.self}/modules/telegram-notifications"
   ];
   age.secrets.webdavSecrets = {
-    file = "${custom.inputs.self}/scrts/webdav_andreas.age";
+    file = "${inputs.self}/scrts/webdav_andreas.age";
     path = "/home/${config.az-username}/.config/rclone/rclone.conf";
     mode = "600";
     owner = "${config.az-username}";

modules/restic-client-desktop/default.nix

@@ -1,4 +1,4 @@
-{ custom }: { config, pkgs, ... }:
+{ config, inputs, pkgs, ... }:
 let
   password_file = config.age.secrets.resticKey.path;
   repository = "rest:http://10.7.89.30:8000";
@@ -44,18 +44,17 @@ let
 in
 {
   imports = [
-    (import "${custom.inputs.self}/modules/telegram-notifications"
-      { inherit custom; })
+    "${inputs.self}/modules/telegram-notifications"
   ];
 
   age.secrets.infomaniakEnv = {
-    file = "${custom.inputs.self}/scrts/infomaniak_env.age";
+    file = "${inputs.self}/scrts/infomaniak_env.age";
     mode = "600";
     owner = config.az-username;
     group = "users";
   };
   age.secrets.resticKey = {
-    file = "${custom.inputs.self}/scrts/restic.key.age";
+    file = "${inputs.self}/scrts/restic.key.age";
     mode = "600";
     owner = config.az-username;
     group = "users";
@@ -83,7 +82,7 @@ in
     onFailure = [ "unit-status-telegram@%n.service" ];
     script = ''
       ${pkgs.restic}/bin/restic \
-        --exclude-file=${custom.inputs.self}/modules/restic-client/excludes.txt \
+        --exclude-file=${inputs.self}/modules/restic-client/excludes.txt \
         --tag home-dir \
         backup /home/${config.az-username}
 

modules/restic-client-server-mysql/default.nix

@@ -1,14 +1,13 @@
-{ custom
-, path
+{ path
 , tag ? "home-dir"
 , time
-}: { config, pkgs, ... }:
+}: { config, inputs, pkgs, ... }:
 {
   imports = [
-    (import "${custom.inputs.self}/modules/telegram-notifications" { inherit custom; })
+    "${inputs.self}/modules/telegram-notifications"
   ];
 
-  age.secrets.resticKey.file = "${custom.inputs.self}/scrts/restic.key.age";
+  age.secrets.resticKey.file = "${inputs.self}/scrts/restic.key.age";
 
   systemd.timers."restic-backups" = {
     wantedBy = [ "timers.target" ];
@@ -30,7 +29,7 @@
     onFailure = [ "unit-status-telegram@%n.service" ];
     script = ''
       ${pkgs.restic}/bin/restic backup \
-        --exclude-file=${custom.inputs.self}/modules/restic-client/excludes.txt \
+        --exclude-file=${inputs.self}/modules/restic-client/excludes.txt \
         --tag ${tag} ${path}
 
       ${pkgs.mariadb}/bin/mariabackup --backup --user=root --stream=xbstream | \

modules/restic-client-server-postgres/default.nix

@@ -1,14 +1,13 @@
-{ custom
-, path
+{ path
 , tag ? "home-dir"
 , time
-}: { config, pkgs, ... }:
+}: { config, inputs, pkgs, ... }:
 {
   imports = [
-    (import "${custom.inputs.self}/modules/telegram-notifications" { inherit custom; })
+    "${inputs.self}/modules/telegram-notifications"
   ];
 
-  age.secrets.resticKey.file = "${custom.inputs.self}/scrts/restic.key.age";
+  age.secrets.resticKey.file = "${inputs.self}/scrts/restic.key.age";
 
   systemd.timers."restic-backups" = {
     wantedBy = [ "timers.target" ];
@@ -30,7 +29,7 @@
     onFailure = [ "unit-status-telegram@%n.service" ];
     script = ''
       ${pkgs.restic}/bin/restic backup \
-        --exclude-file=${custom.inputs.self}/modules/restic-client/excludes.txt \
+        --exclude-file=${inputs.self}/modules/restic-client/excludes.txt \
         --tag ${tag} ${path}
 
       ${pkgs.sudo}/bin/sudo -u postgres ${pkgs.postgresql}/bin/pg_dumpall | \

modules/restic-client-server/default.nix

@@ -1,14 +1,13 @@
-{ custom
-, path
+{ path
 , tag ? "home-dir"
 , time
-}: { config, pkgs, ... }:
+}: { config, inputs, pkgs, ... }:
 {
   imports = [
-    (import "${custom.inputs.self}/modules/telegram-notifications" { inherit custom; })
+    "${inputs.self}/modules/telegram-notifications"
   ];
 
-  age.secrets.resticKey.file = "${custom.inputs.self}/scrts/restic.key.age";
+  age.secrets.resticKey.file = "${inputs.self}/scrts/restic.key.age";
 
   systemd.timers."restic-backups" = {
     wantedBy = [ "timers.target" ];
@@ -30,7 +29,7 @@
     onFailure = [ "unit-status-telegram@%n.service" ];
     script = ''
       ${pkgs.restic}/bin/restic backup \
-        --exclude-file=${custom.inputs.self}/modules/restic-client/excludes.txt \
+        --exclude-file=${inputs.self}/modules/restic-client/excludes.txt \
         --tag ${tag} ${path}
 
       ${pkgs.restic}/bin/restic forget \

modules/restic-server/default.nix

@@ -1,13 +1,13 @@
-{ custom }: { config, pkgs, ... }:
+{ config, inputs, pkgs, ... }:
 let
   repository = "/var/lib/restic-server";
 in
 {
   imports = [
-    (import "${custom.inputs.self}/modules/telegram-notifications" { inherit custom; })
+    "${inputs.self}/modules/telegram-notifications"
   ];
   age.secrets.resticKey = {
-    file = "${custom.inputs.self}/scrts/restic.key.age";
+    file = "${inputs.self}/scrts/restic.key.age";
     mode = "440";
     owner = "restic";
     group = "restic";

modules/telegram-notifications/default.nix

@@ -1,4 +1,4 @@
-{ custom }: { config, pkgs, ... }:
+{ config, inputs, pkgs, ... }:
 let
   send-to-telegram = pkgs.writeShellScript "send-to-telegram" ''
     export $(${pkgs.gnugrep}/bin/grep -v '^#' ${config.age.secrets.telegramNotifyEnv.path} | ${pkgs.findutils}/bin/xargs)
@@ -16,7 +16,7 @@ let
     $UNITSTATUS"'';
 in
 {
-  age.secrets.telegramNotifyEnv.file = "${custom.inputs.self}/scrts/telegram_notify_env.age";
+  age.secrets.telegramNotifyEnv.file = "${inputs.self}/scrts/telegram_notify_env.age";
   systemd.services."unit-status-telegram@" = {
     description = "Unit Status Telegram Service";
     unitConfig = {

modules/ttrss-postgres/default.nix

@@ -1,4 +1,4 @@
-{ custom, domain }: { config, ... }:
+{ domain }: { config, inputs, ... }:
 let
   ttrssEnvironment = {
     TZ = "Europe/Zurich";
@@ -17,13 +17,13 @@ let
 in
 {
   imports = [
-    (import "${custom.inputs.self}/modules/nginx-fpm" {
+    (import "${inputs.self}/modules/nginx-fpm" {
       dataDir = "/var/lib/ttrss/html";
-      inherit custom domain;
+      inherit domain;
     })
-    "${custom.inputs.self}/modules/postgresql"
+    "${inputs.self}/modules/postgresql"
   ];
-  age.secrets.ttrssEnv.file = "${custom.inputs.self}/scrts/ttrss_env.age";
+  age.secrets.ttrssEnv.file = "${inputs.self}/scrts/ttrss_env.age";
 
   services.postgresql = {
     authentication = "host ttrssdb ttrss 172.16.0.0/12 scram-sha-256";

systems/desktop-vm/default.nix

@@ -1,8 +1,8 @@
-{ custom, hostname }: { config, ... }:
+{ hostname }: { config, inputs, ... }:
 {
   imports = [
-    "${custom.inputs.self}/modules/desktop"
-    "${custom.inputs.self}/modules/logs-share"
+    "${inputs.self}/modules/desktop"
+    "${inputs.self}/modules/logs-share"
   ];
   boot.initrd.availableKernelModules = [
     "ata_piix"

systems/git/default.nix

@@ -1,24 +1,24 @@
-{ custom, hostname }: { pkgs, ... }:
+{ hostname }: { inputs, pkgs, ... }:
 let
   domain = "git.2li.ch";
 in
 {
   imports = [
-    (import "${custom.inputs.self}/systems/raspi4" {
+    (import "${inputs.self}/systems/raspi4" {
       ip = "10.7.89.109";
-      inherit custom hostname;
+      inherit hostname;
     })
-    (import "${custom.inputs.self}/modules/restic-client-server-mysql" {
+    (import "${inputs.self}/modules/restic-client-server-mysql" {
       path = "/home/andreas";
-      time = "00:30"; inherit custom;
+      time = "00:30";
     })
-    (import "${custom.inputs.self}/modules/nginx-proxy" {
-      inherit custom domain;
+    (import "${inputs.self}/modules/nginx-proxy" {
+      inherit domain;
     })
-    (import "${custom.inputs.self}/modules/gitea" {
-      inherit custom domain;
+    (import "${inputs.self}/modules/gitea" {
+      inherit domain;
     })
-    "${custom.inputs.self}/modules/docker"
-    "${custom.inputs.self}/modules/mariadb"
+    "${inputs.self}/modules/docker"
+    "${inputs.self}/modules/mariadb"
   ];
 }

systems/gwyn/default.nix

@@ -1,13 +1,13 @@
-{ custom, hostname }: { lib, ... }:
+{ hostname }: { inputs, lib, ... }:
 {
   imports = [
-    custom.inputs.nixos-hardware.nixosModules.dell-precision-5530
-    custom.inputs.nixos-hardware.nixosModules.common-gpu-nvidia
-    custom.inputs.nixos-hardware.nixosModules.common-gpu-intel
-    "${custom.inputs.self}/modules/desktop"
-    "${custom.inputs.self}/modules/logs-share"
-    (import "${custom.inputs.self}/modules/restic-client-desktop" { inherit custom; })
-    "${custom.inputs.self}/modules/tlp"
+    inputs.nixos-hardware.nixosModules.dell-precision-5530
+    inputs.nixos-hardware.nixosModules.common-gpu-nvidia
+    inputs.nixos-hardware.nixosModules.common-gpu-intel
+    "${inputs.self}/modules/desktop"
+    "${inputs.self}/modules/logs-share"
+    "${inputs.self}/modules/restic-client-desktop"
+    "${inputs.self}/modules/tlp"
   ];
   boot.initrd.availableKernelModules = [
     "aesni_intel"

systems/loki-test/default.nix

@@ -1,11 +1,11 @@
-{ custom, hostname }: { pkgs, ... }:
+{ hostname }: { inputs, pkgs, ... }:
 {
   imports = [
-    (import "${custom.inputs.self}/systems/raspi4" {
+    (import "${inputs.self}/systems/raspi4" {
       ip = "10.7.89.10";
-      inherit hostname custom;
+      inherit hostname;
     })
-    "${custom.inputs.self}/modules/docker"
-    "${custom.inputs.self}/modules/tmux"
+    "${inputs.self}/modules/docker"
+    "${inputs.self}/modules/tmux"
   ];
 }

systems/mail/default.nix

@@ -1,20 +1,19 @@
-{ custom, hostname }: { pkgs, ... }:
+{ hostname }: { inputs, pkgs, ... }:
 {
   imports = [
-    (import "${custom.inputs.self}/systems/raspi4" {
+    (import "${inputs.self}/systems/raspi4" {
       ip = "10.7.89.123";
-      inherit hostname custom;
+      inherit hostname;
     })
-    (import "${custom.inputs.self}/modules/restic-client-server" {
+    (import "${inputs.self}/modules/restic-client-server" {
       path = "/home/andreas";
       time = "01:00";
-      inherit custom;
     })
-    (import "${custom.inputs.self}/modules/nginx-proxy" {
-      domain = "mail.zweili.org"; inherit custom;
+    (import "${inputs.self}/modules/nginx-proxy" {
+      domain = "mail.zweili.org";
     })
-    "${custom.inputs.self}/modules/docker"
-    (import "${custom.inputs.self}/modules/docker-mailserver" { inherit custom; })
+    "${inputs.self}/modules/docker"
+    "${inputs.self}/modules/docker-mailserver"
   ];
 }
 

systems/management/default.nix

@@ -1,21 +1,20 @@
-{ custom, hostname }: { ... }:
+{ hostname }: { inputs, ... }:
 {
   imports = [
-    (import "${custom.inputs.self}/systems/raspi4" {
+    (import "${inputs.self}/systems/raspi4" {
       ip = "10.7.89.150";
-      inherit custom hostname;
+      inherit hostname;
     })
-    "${custom.inputs.self}/modules/docker"
-    "${custom.inputs.self}/modules/logs-share"
-    "${custom.inputs.self}/modules/nix-direnv"
-    (import "${custom.inputs.self}/modules/rclone-webdav" { inherit custom; })
-    (import "${custom.inputs.self}/modules/restic-client-server" {
+    "${inputs.self}/modules/docker"
+    "${inputs.self}/modules/logs-share"
+    "${inputs.self}/modules/nix-direnv"
+    "${inputs.self}/modules/rclone-webdav"
+    (import "${inputs.self}/modules/restic-client-server" {
       path = "/home/andreas";
       tag = "management";
       time = "23:30";
-      inherit custom;
     })
-    "${custom.inputs.self}/modules/tmux"
+    "${inputs.self}/modules/tmux"
   ];
   fileSystems = {
     "/mnt/external" = {

systems/mobile/default.nix

@@ -1,14 +1,14 @@
-{ custom, hostname }: { lib, pkgs, ... }:
+{ hostname }: { inputs, lib, pkgs, ... }:
 let
   ip = "10.213.0.1";
 in
 {
   imports = [
-    custom.inputs.nixos-hardware.nixosModules.raspberry-pi-4
-    "${custom.inputs.self}/modules/log-to-ram"
-    "${custom.inputs.self}/modules/docker"
-    "${custom.inputs.self}/modules/nix-direnv"
-    "${custom.inputs.self}/modules/tmux"
+    inputs.nixos-hardware.nixosModules.raspberry-pi-4
+    "${inputs.self}/modules/log-to-ram"
+    "${inputs.self}/modules/docker"
+    "${inputs.self}/modules/nix-direnv"
+    "${inputs.self}/modules/tmux"
   ];
 
   boot = {

systems/nextcloud/default.nix

@@ -1,22 +1,22 @@
-{ custom, hostname }: { pkgs, ... }:
+{ hostname }: { inputs, pkgs, ... }:
 let
   domain = "nextcloud.2li.ch";
 in
 {
   imports = [
-    (import "${custom.inputs.self}/systems/raspi4" {
+    (import "${inputs.self}/systems/raspi4" {
       ip = "10.7.89.103";
-      inherit custom hostname;
+      inherit hostname;
     })
-    "${custom.inputs.self}/modules/docker"
-    "${custom.inputs.self}/modules/mariadb"
-    (import "${custom.inputs.self}/modules/nextcloud" {
-      inherit custom domain;
+    "${inputs.self}/modules/docker"
+    "${inputs.self}/modules/mariadb"
+    (import "${inputs.self}/modules/nextcloud" {
+      inherit domain;
     })
-    "${custom.inputs.self}/modules/nginx-acme-base"
-    (import "${custom.inputs.self}/modules/restic-client-server-mysql" {
+    "${inputs.self}/modules/nginx-acme-base"
+    (import "${inputs.self}/modules/restic-client-server-mysql" {
       path = "/home/andreas";
-      time = "01:30"; inherit custom;
+      time = "01:30";
     })
   ];
 

systems/plex/default.nix

@@ -1,18 +1,17 @@
-{ custom, hostname }: { pkgs, ... }:
+{ hostname }: { inputs, pkgs, ... }:
 {
   imports = [
-    (import "${custom.inputs.self}/systems/raspi4" {
+    (import "${inputs.self}/systems/raspi4" {
       ip = "10.7.89.112";
-      inherit custom hostname;
+      inherit hostname;
     })
-    (import "${custom.inputs.self}/modules/restic-client-server" {
+    (import "${inputs.self}/modules/restic-client-server" {
       path = "/var/lib/plex";
       tag = "plex";
       time = "02:30";
-      inherit custom;
     })
-    "${custom.inputs.self}/modules/docker"
-    "${custom.inputs.self}/modules/media-share"
-    (import "${custom.inputs.self}/modules/plex" { inherit custom; })
+    "${inputs.self}/modules/docker"
+    "${inputs.self}/modules/media-share"
+    "${inputs.self}/modules/plex"
   ];
 }

systems/proxy/default.nix

@@ -1,20 +1,19 @@
-{ custom, hostname }: { pkgs, ... }:
+{ hostname }: { inputs, pkgs, ... }:
 {
   imports = [
-    (import "${custom.inputs.self}/systems/raspi4" {
+    (import "${inputs.self}/systems/raspi4" {
       ip = "10.7.89.99";
-      inherit custom hostname;
+      inherit hostname;
     })
-    (import "${custom.inputs.self}/modules/restic-client-server" {
+    (import "${inputs.self}/modules/restic-client-server" {
       path = "/home/andreas";
       time = "00:00";
-      inherit custom;
     })
-    "${custom.inputs.self}/modules/nginx-acme-base"
-    "${custom.inputs.self}/modules/docker"
-    "${custom.inputs.self}/modules/grav"
-    "${custom.inputs.self}/modules/haproxy"
-    "${custom.inputs.self}/modules/heimdall"
+    "${inputs.self}/modules/nginx-acme-base"
+    "${inputs.self}/modules/docker"
+    "${inputs.self}/modules/grav"
+    "${inputs.self}/modules/haproxy"
+    "${inputs.self}/modules/heimdall"
   ];
 
   services.nginx = {

systems/raspi4/default.nix

@@ -1,9 +1,9 @@
-{ custom, hostname, ip }: { lib, pkgs, ... }:
+{ hostname, ip }: { inputs, lib, pkgs, ... }:
 {
   imports = [
-    custom.inputs.nixos-hardware.nixosModules.raspberry-pi-4
-    "${custom.inputs.self}/modules/log-to-ram"
-    "${custom.inputs.self}/modules/syslog"
+    inputs.nixos-hardware.nixosModules.raspberry-pi-4
+    "${inputs.self}/modules/log-to-ram"
+    "${inputs.self}/modules/syslog"
   ];
 
   boot = {

systems/restic-server/default.nix

@@ -1,10 +1,10 @@
-{ custom, hostname }: { pkgs, ... }:
+{ hostname }: { inputs, pkgs, ... }:
 {
   imports = [
-    (import "${custom.inputs.self}/systems/raspi4" {
+    (import "${inputs.self}/systems/raspi4" {
       ip = "10.7.89.30";
-      inherit custom hostname;
+      inherit hostname;
     })
-    (import "${custom.inputs.self}/modules/restic-server" { inherit custom; })
+    "${inputs.self}/modules/restic-server"
   ];
 }

systems/staubfinger/default.nix

@@ -1,14 +1,14 @@
-{ custom, hostname }: { ... }:
+{ hostname }: { inputs, ... }:
 {
   imports = [
-    custom.inputs.nixos-hardware.nixosModules.common-gpu-intel
-    custom.inputs.nixos-hardware.nixosModules.common-pc-laptop
-    custom.inputs.nixos-hardware.nixosModules.common-pc-laptop-ssd
-    "${custom.inputs.self}/modules/desktop"
-    "${custom.inputs.self}/modules/docker"
-    (import "${custom.inputs.self}/modules/restic-client-desktop" { inherit custom; })
-    "${custom.inputs.self}/modules/tlp"
-    "${custom.inputs.self}/modules/tmux"
+    inputs.nixos-hardware.nixosModules.common-gpu-intel
+    inputs.nixos-hardware.nixosModules.common-pc-laptop
+    inputs.nixos-hardware.nixosModules.common-pc-laptop-ssd
+    "${inputs.self}/modules/desktop"
+    "${inputs.self}/modules/docker"
+    "${inputs.self}/modules/restic-client-desktop"
+    "${inputs.self}/modules/tlp"
+    "${inputs.self}/modules/tmux"
   ];
   boot.initrd.availableKernelModules = [
     "aesni_intel"

systems/test-raspi/default.nix

@@ -1,12 +1,12 @@
-{ custom, hostname }: { pkgs, ... }:
+{ hostname }: { inputs, pkgs, ... }:
 {
   imports = [
-    (import "${custom.inputs.self}/systems/raspi4" {
+    (import "${inputs.self}/systems/raspi4" {
       ip = "10.7.89.40";
-      inherit hostname custom;
+      inherit hostname;
     })
-    "${custom.inputs.self}/modules/docker"
-    "${custom.inputs.self}/modules/nix-direnv"
-    "${custom.inputs.self}/modules/tmux"
+    "${inputs.self}/modules/docker"
+    "${inputs.self}/modules/nix-direnv"
+    "${inputs.self}/modules/tmux"
   ];
 }

systems/ttrss/default.nix

@@ -1,26 +1,24 @@
-{ custom, hostname }: { pkgs, ... }:
+{ hostname }: { inputs, pkgs, ... }:
 let
   domain = "ttrss.2li.ch";
 in
 {
   imports = [
-    (import "${custom.inputs.self}/systems/raspi4" {
+    (import "${inputs.self}/systems/raspi4" {
       ip = "10.7.89.115";
-      inherit custom hostname;
+      inherit hostname;
     })
-    "${custom.inputs.self}/modules/docker"
-    (import "${custom.inputs.self}/modules/nginx-proxy" {
+    "${inputs.self}/modules/docker"
+    (import "${inputs.self}/modules/nginx-proxy" {
       domain = "rss-bridge.2li.ch";
       port = "8082";
-      inherit custom;
     })
-    (import "${custom.inputs.self}/modules/restic-client-server-postgres" {
+    (import "${inputs.self}/modules/restic-client-server-postgres" {
       path = "/var/lib/ttrss";
       tag = "tt-rss";
       time = "23:00";
-      inherit custom;
     })
-    "${custom.inputs.self}/modules/rss-bridge"
-    (import "${custom.inputs.self}/modules/ttrss-postgres" { inherit custom domain; })
+    "${inputs.self}/modules/rss-bridge"
+    (import "${inputs.self}/modules/ttrss-postgres" { inherit domain; })
   ];
 }