From 638ce5fb4a3ecc26f5cf5d70cd7f8cbdc255f795 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikodem=20Rabuli=C5=84ski?= Date: Wed, 31 Jan 2024 21:02:25 +0100 Subject: [PATCH] modules/system/common: enable podman for interactive machines --- hosts/hijiri/default.nix | 2 -- hosts/ude/default.nix | 6 ------ modules/system/common/user.nix | 4 +++- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/hosts/hijiri/default.nix b/hosts/hijiri/default.nix index 8fd2062..8782413 100644 --- a/hosts/hijiri/default.nix +++ b/hosts/hijiri/default.nix @@ -11,8 +11,6 @@ common.desktop.enable = true; home.packages = with pkgs; [ utm - podman - podman-compose qemu anki-bin ]; diff --git a/hosts/ude/default.nix b/hosts/ude/default.nix index d38ba25..03be8af 100644 --- a/hosts/ude/default.nix +++ b/hosts/ude/default.nix @@ -21,12 +21,6 @@ common.hercules.enable = true; services.hercules-ci-agent.settings.concurrentTasks = 6; - virtualisation.podman = { - enable = true; - dockerCompat = true; - defaultNetwork.settings.dns_enabled = true; - }; - services.nginx = { enable = true; appendHttpConfig = '' diff --git a/modules/system/common/user.nix b/modules/system/common/user.nix index 9e01c93..700cd1d 100644 --- a/modules/system/common/user.nix +++ b/modules/system/common/user.nix @@ -3,7 +3,9 @@ lib, ... }: let - sharedConfig = {}; + sharedConfig = { + settei.programs.podman.enable = true; + }; linuxConfig = lib.optionalAttrs isLinux { boot.kernel.sysctl."kernel.yama.ptrace_scope" = 0;