diff --git a/nixos/lavender/configuration.nix b/nixos/lavender/configuration.nix index eb45851..8014c6f 100644 --- a/nixos/lavender/configuration.nix +++ b/nixos/lavender/configuration.nix @@ -148,7 +148,7 @@ # Define a user account. Don't forget to set a password with ‘passwd’. users.users.admin = { isNormalUser = true; - extraGroups = [ "networkmanager" "wheel" "podman" ]; + extraGroups = [ "networkmanager" "wheel" "docker" ]; shell = pkgs.zsh; openssh.authorizedKeys.keyFiles = [ ../fuchsia/id_ed25519_sk.pub ]; }; diff --git a/nixos/lavender/containers/default.nix b/nixos/lavender/containers/default.nix index fab2b18..06578d0 100644 --- a/nixos/lavender/containers/default.nix +++ b/nixos/lavender/containers/default.nix @@ -1,6 +1,7 @@ { ... }: { + # Import our containers. imports = [ ./homepage ./pihole @@ -13,4 +14,7 @@ ./minecraft ./traefik ]; + + # Set docker as container implementation. + virtualisation.oci-containers.backend = "docker"; } diff --git a/nixos/lavender/containers/homepage/default.nix b/nixos/lavender/containers/homepage/default.nix index bb9861e..3ffa867 100644 --- a/nixos/lavender/containers/homepage/default.nix +++ b/nixos/lavender/containers/homepage/default.nix @@ -10,6 +10,5 @@ "/srv/data:/srv/data:ro" ]; ports = [ "3000:3000" ]; - extraOptions = [ "--pull=newer" ]; }; } diff --git a/nixos/lavender/containers/minecraft/default.nix b/nixos/lavender/containers/minecraft/default.nix index 71788d4..e1732f2 100644 --- a/nixos/lavender/containers/minecraft/default.nix +++ b/nixos/lavender/containers/minecraft/default.nix @@ -12,6 +12,5 @@ environment = { MEMORYSIZE = "1G"; }; - extraOptions = [ "--pull=newer" ]; }; } diff --git a/nixos/lavender/containers/pihole/default.nix b/nixos/lavender/containers/pihole/default.nix index dfedb57..72385e5 100644 --- a/nixos/lavender/containers/pihole/default.nix +++ b/nixos/lavender/containers/pihole/default.nix @@ -19,7 +19,6 @@ WEBPASSWORD_FILE = "/secrets/admin-password"; DNSMASQ_LISTENING = "all"; }; - extraOptions = [ "--pull=newer" ]; }; } diff --git a/nixos/lavender/containers/plex/default.nix b/nixos/lavender/containers/plex/default.nix index 4b6bb3a..1ed5981 100644 --- a/nixos/lavender/containers/plex/default.nix +++ b/nixos/lavender/containers/plex/default.nix @@ -10,6 +10,5 @@ "/srv/data/media:/data/media:ro" ]; ports = [ "32400:32400" ]; - extraOptions = [ "--pull=newer" ]; }; } diff --git a/nixos/lavender/containers/prowlarr/default.nix b/nixos/lavender/containers/prowlarr/default.nix index 6cd284c..7312592 100644 --- a/nixos/lavender/containers/prowlarr/default.nix +++ b/nixos/lavender/containers/prowlarr/default.nix @@ -10,6 +10,5 @@ "/srv/data:/data" ]; ports = [ "9696:9696" ]; - extraOptions = [ "--pull=newer" ]; }; } diff --git a/nixos/lavender/containers/qbittorrent/default.nix b/nixos/lavender/containers/qbittorrent/default.nix index 405e27f..5e75745 100644 --- a/nixos/lavender/containers/qbittorrent/default.nix +++ b/nixos/lavender/containers/qbittorrent/default.nix @@ -13,6 +13,5 @@ "8383:8080" "32372:32372" ]; - extraOptions = [ "--pull=newer" ]; }; } diff --git a/nixos/lavender/containers/radarr/default.nix b/nixos/lavender/containers/radarr/default.nix index 0f3957f..de59203 100644 --- a/nixos/lavender/containers/radarr/default.nix +++ b/nixos/lavender/containers/radarr/default.nix @@ -10,6 +10,5 @@ "/srv/data:/data" ]; ports = [ "7878:7878" ]; - extraOptions = [ "--pull=newer" ]; }; } diff --git a/nixos/lavender/containers/recyclarr/default.nix b/nixos/lavender/containers/recyclarr/default.nix index 4311c70..a12dcf5 100644 --- a/nixos/lavender/containers/recyclarr/default.nix +++ b/nixos/lavender/containers/recyclarr/default.nix @@ -8,6 +8,5 @@ volumes = [ "/srv/containers/recyclarr:/config" ]; - extraOptions = [ "--pull=newer" ]; }; } diff --git a/nixos/lavender/containers/sonarr/default.nix b/nixos/lavender/containers/sonarr/default.nix index 4cfcd90..3465164 100644 --- a/nixos/lavender/containers/sonarr/default.nix +++ b/nixos/lavender/containers/sonarr/default.nix @@ -10,6 +10,5 @@ "/srv/data:/data" ]; ports = [ "8989:8989" ]; - extraOptions = [ "--pull=newer" ]; }; } diff --git a/nixos/lavender/containers/traefik/default.nix b/nixos/lavender/containers/traefik/default.nix index 98f2814..32cd770 100644 --- a/nixos/lavender/containers/traefik/default.nix +++ b/nixos/lavender/containers/traefik/default.nix @@ -20,6 +20,5 @@ CF_API_EMAIL_FILE = "/secrets/cf-api-email"; CF_API_KEY_FILE = "/secrets/cf-api-key"; }; - extraOptions = [ "--pull=newer" ]; }; }