motiejus/config
1
Fork 0
Code Packages Releases Activity

all: remove podman

Browse Source 
docker seems to work
This commit is contained in:
Motiejus Jakštys 2024-07-29 15:55:55 +03:00
parent 9ea80639a3
commit 43697386b8
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/profiles/desktop/default.nix
View File

@ -31,7 +31,6 @@ in
"adbusers" "adbusers"
"networkmanager" "networkmanager"
"wireshark" "wireshark"
"podman"
"docker" "docker"
]; ];
@ -107,11 +106,6 @@ in
command-not-found.enable = false; command-not-found.enable = false;
}; };
virtualisation.podman = {
enable = lib.mkDefault true;
extraPackages = [ pkgs.zfs ];
};
security.rtkit.enable = true; security.rtkit.enable = true;
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
@ -123,6 +117,8 @@ in
#}; #};
#location.provider = "geoclue2"; #location.provider = "geoclue2";
virtualisation.docker.enable = true;
documentation = { documentation = {
dev.enable = true; dev.enable = true;
doc.enable = true; doc.enable = true;

5
shared/work/default.nix
View File

@ -1,7 +1,6 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
mj.base.users.email = null; mj.base.users.email = null;
mj.base.users.user.extraGroups = [ "docker" ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
#swc #swc
@ -52,14 +51,10 @@
Group = "clamav"; Group = "clamav";
}; };
virtualisation.podman.enable = false;
virtualisation.docker.enable = true;
home-manager.users.${config.mj.username} = { home-manager.users.${config.mj.username} = {
home.sessionVariables = { home.sessionVariables = {
GOFLAGS = "-tags=integration,cluster_integration"; GOFLAGS = "-tags=integration,cluster_integration";
GOPRIVATE = "github.com/chronosphereio"; GOPRIVATE = "github.com/chronosphereio";
CONTAINER_HOST = "unix://run/podman/podman.sock";
BUILDKIT_COLORS = "run=123,20,245:error=yellow:cancel=blue:warning=white"; BUILDKIT_COLORS = "run=123,20,245:error=yellow:cancel=blue:warning=white";
}; };
programs = { programs = {