From 45688b39804ec8c3482e6f378836b99e44a70847 Mon Sep 17 00:00:00 2001 From: Frantisek Bohacek Date: Sat, 30 Sep 2023 22:20:02 +0200 Subject: [PATCH] feat: add podman, remove docker --- modules/desktop/virtualisation/default.nix | 4 +--- modules/desktop/virtualisation/docker.nix | 23 ---------------------- modules/desktop/virtualisation/podman.nix | 17 ++++++++++++++++ 3 files changed, 18 insertions(+), 26 deletions(-) delete mode 100644 modules/desktop/virtualisation/docker.nix create mode 100644 modules/desktop/virtualisation/podman.nix diff --git a/modules/desktop/virtualisation/default.nix b/modules/desktop/virtualisation/default.nix index 6130553..125d3f4 100644 --- a/modules/desktop/virtualisation/default.nix +++ b/modules/desktop/virtualisation/default.nix @@ -12,7 +12,5 @@ # [ - ./docker.nix - ./qemu.nix - ./x11vnc.nix + ./podman.nix ] diff --git a/modules/desktop/virtualisation/docker.nix b/modules/desktop/virtualisation/docker.nix deleted file mode 100644 index f59c141..0000000 --- a/modules/desktop/virtualisation/docker.nix +++ /dev/null @@ -1,23 +0,0 @@ -# -# Docker -# - -{ config, pkgs, user, ... }: - -{ - virtualisation = { - docker.enable = true; - }; - - users.groups.docker.members = [ "${user}" ]; - - #environment = { - # interactiveShellInit = '' - # alias rtmp='docker start nginx-rtmp' - # ''; # Alias to easily start container - #}; - - environment.systemPackages = with pkgs; [ - docker-compose - ]; -} diff --git a/modules/desktop/virtualisation/podman.nix b/modules/desktop/virtualisation/podman.nix new file mode 100644 index 0000000..7283eec --- /dev/null +++ b/modules/desktop/virtualisation/podman.nix @@ -0,0 +1,17 @@ +# +# Docker +# + +{ config, pkgs, user, ... }: + +{ + virtualisation.podman = { + enable = true; + dockerCompat = true; + defaultNetwork.settings.dns_enabled = true; + }; + + environment.systemPackages = with pkgs; [ + podman-compose + ]; +} -- 2.48.1