diff --git a/hosts/common/configs/system/podman/default.nix b/hosts/common/configs/system/podman/default.nix new file mode 100644 index 0000000..3a34ec1 --- /dev/null +++ b/hosts/common/configs/system/podman/default.nix @@ -0,0 +1,17 @@ +{ pkgs, ... }: +{ + virtualisation = { + containers.enable = true; + oci-containers.backend = "podman"; + podman.enable = true; + }; + + environment = { + persistence."/persist"."/var/lib/containers" = { }; + + systemPackages = with pkgs; [ + podman-compose + dive + ]; + }; +} diff --git a/hosts/common/configs/user/console/podman/default.nix b/hosts/common/configs/user/console/podman/default.nix new file mode 100644 index 0000000..3e90625 --- /dev/null +++ b/hosts/common/configs/user/console/podman/default.nix @@ -0,0 +1,19 @@ +{ + user ? throw "user argument is required", + home ? throw "home argument is required", +}: +{ lib, pkgs, ... }: +{ + home-manager.users.${user} = { + services.podman.enable = true; + + home = { + packages = with pkgs; [ + podman-compose + dive + ]; + + sessionVariables.REGISTRY_AUTH_FILE = "${home}/.config/containers/auth.json"; + }; + }; +} diff --git a/hosts/eirene/default.nix b/hosts/eirene/default.nix index a5fc5ca..58b9ab1 100644 --- a/hosts/eirene/default.nix +++ b/hosts/eirene/default.nix @@ -15,7 +15,6 @@ ../common/configs/system/cpu ../common/configs/system/dnsmasq ../common/configs/system/documentation - ../common/configs/system/docker ../common/configs/system/getty ../common/configs/system/git ../common/configs/system/gpg-agent @@ -30,6 +29,7 @@ ../common/configs/system/nixpkgs ../common/configs/system/ntp ../common/configs/system/pipewire + ../common/configs/system/podman ../common/configs/system/powertop ../common/configs/system/printing ../common/configs/system/sops diff --git a/hosts/eirene/users/nick/default.nix b/hosts/eirene/users/nick/default.nix index 425eac3..f3ee9a8 100644 --- a/hosts/eirene/users/nick/default.nix +++ b/hosts/eirene/users/nick/default.nix @@ -15,7 +15,6 @@ in (import ../../../common/configs/user/console/bashmount { inherit user home; }) (import ../../../common/configs/user/console/brightnessctl { inherit user home; }) (import ../../../common/configs/user/console/btop { inherit user home; }) - (import ../../../common/configs/user/console/docker { inherit user home; }) (import ../../../common/configs/user/console/fastfetch { inherit user home; }) (import ../../../common/configs/user/console/ffmpeg { inherit user home; }) (import ../../../common/configs/user/console/git { inherit user home; }) @@ -34,6 +33,7 @@ in (import ../../../common/configs/user/console/nix-direnv { inherit user home; }) (import ../../../common/configs/user/console/nixpkgs { inherit user home; }) (import ../../../common/configs/user/console/pipewire { inherit user home; }) + (import ../../../common/configs/user/console/podman { inherit user home; }) (import ../../../common/configs/user/console/ranger { inherit user home; }) (import ../../../common/configs/user/console/sops { inherit user home; }) (import ../../../common/configs/user/console/ssh { inherit user home; }) diff --git a/hosts/elara/default.nix b/hosts/elara/default.nix index 83cfad9..a2e4d6d 100644 --- a/hosts/elara/default.nix +++ b/hosts/elara/default.nix @@ -18,7 +18,6 @@ ../common/configs/system/cpu ../common/configs/system/dnsmasq ../common/configs/system/documentation - ../common/configs/system/docker ../common/configs/system/getty ../common/configs/system/git ../common/configs/system/gpg-agent @@ -32,6 +31,7 @@ ../common/configs/system/nixpkgs ../common/configs/system/ntp ../common/configs/system/pipewire + ../common/configs/system/podman ../common/configs/system/powertop ../common/configs/system/printing ../common/configs/system/sops diff --git a/hosts/elara/users/nikara/configs/console/docker/default.nix b/hosts/elara/users/nikara/configs/console/podman/default.nix similarity index 76% rename from hosts/elara/users/nikara/configs/console/docker/default.nix rename to hosts/elara/users/nikara/configs/console/podman/default.nix index e20e881..8f57138 100644 --- a/hosts/elara/users/nikara/configs/console/docker/default.nix +++ b/hosts/elara/users/nikara/configs/console/podman/default.nix @@ -5,9 +5,9 @@ { lib, ... }: { home-manager.users.${user}.sops.secrets = { - "docker" = { + "registry" = { sopsFile = ../../../../../../../secrets/sas/secrets.yaml; - path = "${home}/.config/docker/config.json"; + path = "${home}/.config/containers/auth.json"; }; }; } diff --git a/hosts/elara/users/nikara/default.nix b/hosts/elara/users/nikara/default.nix index a16702b..7c1efeb 100644 --- a/hosts/elara/users/nikara/default.nix +++ b/hosts/elara/users/nikara/default.nix @@ -13,7 +13,6 @@ in (import ../../../common/configs/user/console/bashmount { inherit user home; }) (import ../../../common/configs/user/console/brightnessctl { inherit user home; }) (import ../../../common/configs/user/console/btop { inherit user home; }) - (import ../../../common/configs/user/console/docker { inherit user home; }) (import ../../../common/configs/user/console/fastfetch { inherit user home; }) (import ../../../common/configs/user/console/git { inherit user home; }) (import ../../../common/configs/user/console/gpg-agent { inherit user home; }) @@ -32,6 +31,7 @@ in (import ../../../common/configs/user/console/nix-direnv { inherit user home; }) (import ../../../common/configs/user/console/nixpkgs { inherit user home; }) (import ../../../common/configs/user/console/pipewire { inherit user home; }) + (import ../../../common/configs/user/console/podman { inherit user home; }) (import ../../../common/configs/user/console/ranger { inherit user home; }) (import ../../../common/configs/user/console/sops { inherit user home; }) (import ../../../common/configs/user/console/ssh { inherit user home; }) @@ -73,12 +73,12 @@ in (import ../../../common/configs/user/gui/xdg { inherit user home; }) (import ./configs/console/c { inherit user home; }) - (import ./configs/console/docker { inherit user home; }) (import ./configs/console/git { inherit user home; }) (import ./configs/console/go { inherit user home; }) (import ./configs/console/gradle { inherit user home; }) (import ./configs/console/java { inherit user home; }) (import ./configs/console/kubernetes { inherit user home; }) + (import ./configs/console/podman { inherit user home; }) (import ./configs/console/ssh { inherit user home; }) (import ./configs/gui/obsidian { inherit user home; })