From a86fd67f5a7f9e7e128c5b15f97ae6b22dc6d676 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Sun, 18 Aug 2024 21:19:08 -0400 Subject: [PATCH] Moved container config --- modules/nixos/common/containers/default.nix | 26 +++++++++++++++++++++ modules/nixos/common/containers/docker.nix | 21 +++++++++++++++++ modules/nixos/common/containers/podman.nix | 19 +++++++++++++++ modules/nixos/common/default.nix | 1 + modules/os/containers/default.nix | 17 -------------- modules/os/containers/docker.nix | 15 ------------ modules/os/containers/podman.nix | 14 ----------- 7 files changed, 67 insertions(+), 46 deletions(-) create mode 100644 modules/nixos/common/containers/default.nix create mode 100644 modules/nixos/common/containers/docker.nix create mode 100644 modules/nixos/common/containers/podman.nix delete mode 100644 modules/os/containers/default.nix delete mode 100644 modules/os/containers/docker.nix delete mode 100644 modules/os/containers/podman.nix diff --git a/modules/nixos/common/containers/default.nix b/modules/nixos/common/containers/default.nix new file mode 100644 index 0000000..2b61e9c --- /dev/null +++ b/modules/nixos/common/containers/default.nix @@ -0,0 +1,26 @@ +{ lib, ... }: + +with lib; + +{ + imports = [ + ./docker.nix + ./podman.nix + ]; + options = { + skyg.common.containers = { + runtime = mkOption { + description = "DOcker vs podman"; + type = types.str; + default = "docker"; + }; + enableOnBoot = mkOption { + type = types.boolean; + default = false; + }; + localDockerRegistries = mkOption { + type = types.listOf types.str; + }; + }; + }; +} diff --git a/modules/nixos/common/containers/docker.nix b/modules/nixos/common/containers/docker.nix new file mode 100644 index 0000000..8bcca9a --- /dev/null +++ b/modules/nixos/common/containers/docker.nix @@ -0,0 +1,21 @@ +{ config, pkgs, lib, ... }: + +let + cfg = config.skyg.common.containers; +in +{ + config = lib.mkIf cfg.runtime == "docker" { + virtualisation.docker = { + enable = true; + autoPrune.enable = true; + enableOnBoot = cfg.enableOnBoot; + liveRestore = false; + daemon.settings = { + insecure-registries = cfg.localDockerRegistries; + }; + }; + environment.systemPackages = with pkgs; [ docker-compose ]; + users.users.${config.skyg.user.name}.extraGroups = [ "docker" ]; + virtualisation.oci-containers.backend = "docker"; + }; +} diff --git a/modules/nixos/common/containers/podman.nix b/modules/nixos/common/containers/podman.nix new file mode 100644 index 0000000..b21b924 --- /dev/null +++ b/modules/nixos/common/containers/podman.nix @@ -0,0 +1,19 @@ +{ config, pkgs, lib, ... }: +let + cfg = config.skyg.common.containers; +in +{ + config = lib.mkIf cfg.runtime == "podman" { + virtualisation.oci-containers.backend = "podman"; + virtualisation = { + podman = { + enable = true; + dockerCompat = true; + defaultNetwork.settings.dns_enabled = true; + dockerSocket.enable = true; + autoPrune.enable = true; + }; + }; + environment.systemPackages = with pkgs; [ podman-compose podman-tui ]; + }; +} diff --git a/modules/nixos/common/default.nix b/modules/nixos/common/default.nix index 3101be2..e5e42a4 100644 --- a/modules/nixos/common/default.nix +++ b/modules/nixos/common/default.nix @@ -2,6 +2,7 @@ { imports = [ ./hardware + ./containers ./core.nix ./networking.nix ./user.nix diff --git a/modules/os/containers/default.nix b/modules/os/containers/default.nix deleted file mode 100644 index f6dc6c9..0000000 --- a/modules/os/containers/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ user, runtime ? null, enableOnBoot ? false, localDockerRegistries ? [ ] }: -{ pkgs, ... }: { - virtualisation.containers.enable = true; - environment.systemPackages = with pkgs; [ dive ]; - imports = (if runtime == "podman" then - [ (import ./podman.nix { user = user; localDockerRegistries = localDockerRegistries; }) ] - else if runtime == "docker" then - [ - (import ./docker.nix { - user = user; - enableOnBoot = enableOnBoot; - localDockerRegistries = localDockerRegistries; - }) - ] - else - [ ]); -} diff --git a/modules/os/containers/docker.nix b/modules/os/containers/docker.nix deleted file mode 100644 index cb730fb..0000000 --- a/modules/os/containers/docker.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ user, enableOnBoot ? false, localDockerRegistries ? [ ], ... }: -{ pkgs, ... }: { - virtualisation.docker = { - enable = true; - autoPrune.enable = true; - enableOnBoot = enableOnBoot; - liveRestore = false; - daemon.settings = { - insecure-registries = localDockerRegistries; - }; - }; - environment.systemPackages = with pkgs; [ docker-compose ]; - users.users.${user.name}.extraGroups = [ "docker" ]; - virtualisation.oci-containers.backend = "docker"; -} diff --git a/modules/os/containers/podman.nix b/modules/os/containers/podman.nix deleted file mode 100644 index 30f242d..0000000 --- a/modules/os/containers/podman.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ user, ... }: -{ pkgs, ... }: { - virtualisation.oci-containers.backend = "podman"; - virtualisation = { - podman = { - enable = true; - dockerCompat = true; - defaultNetwork.settings.dns_enabled = true; - dockerSocket.enable = true; - autoPrune.enable = true; - }; - }; - environment.systemPackages = with pkgs; [ podman-compose podman-tui ]; -}