From c3883abef98163d82521f9cc1bf2a490e737434d Mon Sep 17 00:00:00 2001 From: Nathan Date: Wed, 31 Dec 2025 18:37:46 -0600 Subject: [PATCH] no inputs toplevel --- system/services/containers/authentik/default.nix | 4 ++-- system/services/containers/gitea/default.nix | 2 +- system/services/containers/gitlab/default.nix | 2 +- system/services/containers/keycloak/default.nix | 4 ++-- system/services/containers/minecraft/default.nix | 4 ++-- system/services/containers/netbird/default.nix | 4 ++-- system/services/containers/ollama/default.nix | 4 ++-- system/services/containers/pihole/default.nix | 8 ++++---- system/services/containers/sandbox/default.nix | 8 ++++---- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/system/services/containers/authentik/default.nix b/system/services/containers/authentik/default.nix index 719548d..e8ccacf 100644 --- a/system/services/containers/authentik/default.nix +++ b/system/services/containers/authentik/default.nix @@ -1,4 +1,4 @@ -{ config, lib, inputs, ... }: { +{ config, lib, sops-nix, ... }: { options.sysconfig.virtualization.authentik.enable = lib.options.mkOption { type = lib.types.bool; @@ -6,7 +6,7 @@ }; imports = [ - inputs.sops-nix.nixosModules.sops + sops-nix.nixosModules.sops ]; config = lib.mkIf config.sysconfig.virtualization.authentik.enable { diff --git a/system/services/containers/gitea/default.nix b/system/services/containers/gitea/default.nix index 129aec9..d0946a9 100644 --- a/system/services/containers/gitea/default.nix +++ b/system/services/containers/gitea/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: { +{ config, lib, ... }: { options.sysconfig.virtualization.gitea.enable = lib.options.mkOption { type = lib.types.bool; diff --git a/system/services/containers/gitlab/default.nix b/system/services/containers/gitlab/default.nix index 006e8a3..7f67df8 100644 --- a/system/services/containers/gitlab/default.nix +++ b/system/services/containers/gitlab/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: { +{ config, lib, ... }: { options.sysconfig.virtualization.gitlab.enable = lib.options.mkOption { type = lib.types.bool; diff --git a/system/services/containers/keycloak/default.nix b/system/services/containers/keycloak/default.nix index b32a358..6c53690 100644 --- a/system/services/containers/keycloak/default.nix +++ b/system/services/containers/keycloak/default.nix @@ -1,4 +1,4 @@ -{ config, lib, inputs, ... }: { +{ config, lib, sops-nix, ... }: { options.sysconfig.virtualization.keycloak.enable = lib.options.mkOption { type = lib.types.bool; @@ -6,7 +6,7 @@ }; imports = [ - inputs.sops-nix.nixosModules.sops + sops-nix.nixosModules.sops ]; config = lib.mkIf config.sysconfig.virtualization.keycloak.enable { diff --git a/system/services/containers/minecraft/default.nix b/system/services/containers/minecraft/default.nix index 4d132c7..eeceb29 100644 --- a/system/services/containers/minecraft/default.nix +++ b/system/services/containers/minecraft/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, inputs, ... }: { +{ config, lib, pkgs, nix-minecraft, ... }: { options.sysconfig.virtualization.minecraft.enable = lib.options.mkOption { type = lib.types.bool; @@ -17,7 +17,7 @@ nat.internalInterfaces = [ "ve-minecraft" ]; }; - nixpkgs.overlays = [ inputs.nix-minecraft.overlay ]; + nixpkgs.overlays = [ nix-minecraft.overlay ]; containers.minecraft = { diff --git a/system/services/containers/netbird/default.nix b/system/services/containers/netbird/default.nix index bda718b..5879728 100644 --- a/system/services/containers/netbird/default.nix +++ b/system/services/containers/netbird/default.nix @@ -1,4 +1,4 @@ -{ config, lib, inputs, ... }: { +{ config, lib, nixpkgs-us, ... }: { options.sysconfig = { @@ -16,7 +16,7 @@ }; config = let - pkgs-com = import inputs.nixpkgs-us { + pkgs-com = import nixpkgs-us { system = "x86_64-linux"; config.allowUnfree = true; }; diff --git a/system/services/containers/ollama/default.nix b/system/services/containers/ollama/default.nix index f035e14..7755097 100644 --- a/system/services/containers/ollama/default.nix +++ b/system/services/containers/ollama/default.nix @@ -1,4 +1,4 @@ -{ config, lib, inputs, ... }: { +{ config, lib, nixpkgs-us, ... }: { options = { sysconfig.virtualization.ollama.enable = lib.options.mkOption { @@ -68,7 +68,7 @@ enable = true; acceleration = "cuda"; package = let - pkgs-us = import inputs.nixpkgs-us { + pkgs-us = import nixpkgs-us { system = "x86_64-linux"; config.allowUnfree = true; }; diff --git a/system/services/containers/pihole/default.nix b/system/services/containers/pihole/default.nix index ad74b1f..60d2a84 100644 --- a/system/services/containers/pihole/default.nix +++ b/system/services/containers/pihole/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, inputs, ... }: { +{ config, lib, nixpkgs-us, ... }: { options.sysconfig.virtualization.pihole.enable = lib.options.mkOption { type = lib.types.bool; @@ -34,12 +34,12 @@ timeoutStartSec = "infinity"; config = let - pkgs-us = import inputs.nixpkgs-us { system = "x86_64-linux"; }; + pkgs-us = import nixpkgs-us { system = "x86_64-linux"; }; in { /*imports = [ - (import "${inputs.nixpkgs-us}/nixos/modules/services/networking/pihole-ftl.nix" { config = config.containers.pihole.config; inherit lib; pkgs = pkgs-us;}) - (import "${inputs.nixpkgs-us}/nixos/modules/services/web-apps/pihole-web.nix" { config = config.containers.pihole.config; inherit lib; pkgs = pkgs-us;}) + (import "${nixpkgs-us}/nixos/modules/services/networking/pihole-ftl.nix" { config = config.containers.pihole.config; inherit lib; pkgs = pkgs-us;}) + (import "${nixpkgs-us}/nixos/modules/services/web-apps/pihole-web.nix" { config = config.containers.pihole.config; inherit lib; pkgs = pkgs-us;}) ];*/ services = { diff --git a/system/services/containers/sandbox/default.nix b/system/services/containers/sandbox/default.nix index 1b596a3..6232a3f 100644 --- a/system/services/containers/sandbox/default.nix +++ b/system/services/containers/sandbox/default.nix @@ -1,4 +1,4 @@ -{ config, lib, inputs, ... }: { +{ config, lib, nixpkgs-us, self, ... }: { options.sysconfig.virtualization.sandbox.enable = lib.mkOption { type = lib.types.bool; @@ -10,9 +10,9 @@ ]; imports = [ - (import "${inputs.nixpkgs-us}/nixos/modules/virtualisation/nixos-containers.nix" { + (import "${nixpkgs-us}/nixos/modules/virtualisation/nixos-containers.nix" { inherit config lib; - pkgs = (import inputs.nixpkgs-us { + pkgs = (import nixpkgs-us { system = "x86_64-linux"; }); }) @@ -35,7 +35,7 @@ timeoutStartSec = "3min"; - flake = "${inputs.self}"; + flake = "${self}"; bindMounts = { "/dev/nvidia0" = {