From 1d0188e19908b440fe3e20c64f874374be49c56b Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Sun, 18 Aug 2024 21:27:16 -0400 Subject: [PATCH] Moved over containers --- modules/main.nix | 1 + modules/nixos/common/containers/default.nix | 4 ++-- modules/nixos/common/containers/docker.nix | 2 +- modules/nixos/common/containers/podman.nix | 2 +- modules/os/default.nix | 7 +------ 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/modules/main.nix b/modules/main.nix index eb62ea9..2045f22 100644 --- a/modules/main.nix +++ b/modules/main.nix @@ -36,6 +36,7 @@ skyg.home-manager.version = homeManagerVersion; skyg.core.substituters = localNixCaches; skyg.networkDrives.enabled = enableNetworkDrives; + skyg.common.containers = (if os.enable then os.containers else { }); system.stateVersion = systemStateVersion; nixpkgs.config.allowUnfree = true; nix = { diff --git a/modules/nixos/common/containers/default.nix b/modules/nixos/common/containers/default.nix index 2b61e9c..07bc870 100644 --- a/modules/nixos/common/containers/default.nix +++ b/modules/nixos/common/containers/default.nix @@ -10,12 +10,12 @@ with lib; options = { skyg.common.containers = { runtime = mkOption { - description = "DOcker vs podman"; + description = "Docker vs podman"; type = types.str; default = "docker"; }; enableOnBoot = mkOption { - type = types.boolean; + type = types.bool; default = false; }; localDockerRegistries = mkOption { diff --git a/modules/nixos/common/containers/docker.nix b/modules/nixos/common/containers/docker.nix index 8bcca9a..ee8d8bc 100644 --- a/modules/nixos/common/containers/docker.nix +++ b/modules/nixos/common/containers/docker.nix @@ -4,7 +4,7 @@ let cfg = config.skyg.common.containers; in { - config = lib.mkIf cfg.runtime == "docker" { + config = lib.mkIf (cfg.runtime == "docker") { virtualisation.docker = { enable = true; autoPrune.enable = true; diff --git a/modules/nixos/common/containers/podman.nix b/modules/nixos/common/containers/podman.nix index b21b924..f3b7f01 100644 --- a/modules/nixos/common/containers/podman.nix +++ b/modules/nixos/common/containers/podman.nix @@ -3,7 +3,7 @@ let cfg = config.skyg.common.containers; in { - config = lib.mkIf cfg.runtime == "podman" { + config = lib.mkIf (cfg.runtime == "podman") { virtualisation.oci-containers.backend = "podman"; virtualisation = { podman = { diff --git a/modules/os/default.nix b/modules/os/default.nix index 0c82e7a..82c9432 100644 --- a/modules/os/default.nix +++ b/modules/os/default.nix @@ -10,12 +10,7 @@ , ... }: { pkgs, ... }: { - imports = [ - (import ./containers/default.nix ({ - user = user; - } // containers)) - ] - ++ (if enableSSH then + imports = (if enableSSH then [ (import ./ssh.nix { enableSSHServer = true;