From 2b0fdfa8545aa6be658a1d80a7b305765901afcd Mon Sep 17 00:00:00 2001 From: Philip Peterson <1326208+philip-peterson@users.noreply.github.com> Date: Sat, 7 Dec 2024 00:19:04 -0900 Subject: [PATCH] wip --- nixos/arion/arion-pkgs.nix | 12 ++++++------ nixos/linux.nix | 2 ++ nixos/podman.nix | 10 ++++++++++ 3 files changed, 18 insertions(+), 6 deletions(-) create mode 100644 nixos/podman.nix diff --git a/nixos/arion/arion-pkgs.nix b/nixos/arion/arion-pkgs.nix index 109fcb1..7359e68 100644 --- a/nixos/arion/arion-pkgs.nix +++ b/nixos/arion/arion-pkgs.nix @@ -1,10 +1,10 @@ -## This file is the default location for Arion to look for Nixpkgs when -## bootstrapping a deployment configuration. -#import ../ {} +{pkgs ? import {}, ...}: let +in { + ## This file is the default location for Arion to look for Nixpkgs when + ## bootstrapping a deployment configuration. + #import ../ {} -# Instead of pinning Nixpkgs, we can opt to use the one in NIX_PATH -import { # We specify the architecture explicitly. Use a Linux remote builder when # calling arion from other platforms. system = "x86_64-linux"; -} +} \ No newline at end of file diff --git a/nixos/linux.nix b/nixos/linux.nix index ab042cb..5a537a3 100644 --- a/nixos/linux.nix +++ b/nixos/linux.nix @@ -110,6 +110,8 @@ in { defaultNetwork.settings.dns_enabled = true; }; + virtualisation.arion.backend.type = "podman-socket"; + virtualisation.oci-containers = { backend = "docker"; diff --git a/nixos/podman.nix b/nixos/podman.nix new file mode 100644 index 0000000..2d7faf5 --- /dev/null +++ b/nixos/podman.nix @@ -0,0 +1,10 @@ +{ + lib, + pkgs, + config, + ... +}: { + services.podman = { + enable = true; + }; +}