diff --git a/modules/system/common/user.nix b/modules/system/common/user.nix index 2c2fa4d..236ef68 100644 --- a/modules/system/common/user.nix +++ b/modules/system/common/user.nix @@ -1,9 +1,7 @@ { isLinux }: { config, lib, ... }: let - sharedConfig = { - settei.programs.podman.enable = true; - }; + sharedConfig = { }; linuxConfig = lib.optionalAttrs isLinux { boot.kernel.sysctl."kernel.yama.ptrace_scope" = 0; }; diff --git a/modules/system/settei/programs/default.nix b/modules/system/settei/programs/default.nix index e31ccc3..8c61f51 100644 --- a/modules/system/settei/programs/default.nix +++ b/modules/system/settei/programs/default.nix @@ -2,5 +2,5 @@ { _file = ./default.nix; - imports = [ (import ./podman.nix { inherit isLinux; }) ]; + imports = [ ]; } diff --git a/modules/system/settei/programs/podman.nix b/modules/system/settei/programs/podman.nix deleted file mode 100644 index 6068879..0000000 --- a/modules/system/settei/programs/podman.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ isLinux }: -{ - config, - lib, - pkgs, - ... -}: -let - sharedConfig = { - environment.systemPackages = [ pkgs.podman-compose ]; - }; - - linuxConfig = lib.optionalAttrs isLinux { - virtualisation.podman = { - enable = true; - dockerCompat = lib.mkDefault true; - defaultNetwork.settings.dns_enabled = lib.mkDefault true; - }; - }; - - darwinConfig = lib.optionalAttrs (!isLinux) { environment.systemPackages = [ pkgs.podman ]; }; - - finalConfig = lib.mkMerge [ - sharedConfig - linuxConfig - darwinConfig - ]; -in -{ - _file = ./podman.nix; - - options.settei.programs.podman.enable = lib.mkEnableOption "Podman"; - - config = lib.mkIf config.settei.programs.podman.enable finalConfig; -}