From cf5d401099c52372c95fa63f1ac6986b66b038df Mon Sep 17 00:00:00 2001 From: Superredstone Date: Mon, 21 Jul 2025 10:25:14 +0200 Subject: [PATCH] Added Docker on workstation and android-studio --- machines/workstation/virtualisation.nix | 5 +++-- modules/nix-config/default.nix | 2 +- modules/packages.nix | 3 +++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/machines/workstation/virtualisation.nix b/machines/workstation/virtualisation.nix index 892aa0f..ca24259 100644 --- a/machines/workstation/virtualisation.nix +++ b/machines/workstation/virtualisation.nix @@ -1,7 +1,8 @@ { currentSystemUser, ... }: { - virtualisation.podman.enable = true; - virtualisation.podman.dockerCompat = true; + # virtualisation.podman.enable = true; + # virtualisation.podman.dockerCompat = true; + virtualisation.docker.enable = true; programs.virt-manager.enable = true; users.groups.libvirtd.members = ["${currentSystemUser}"]; diff --git a/modules/nix-config/default.nix b/modules/nix-config/default.nix index 9c12d16..86449ce 100644 --- a/modules/nix-config/default.nix +++ b/modules/nix-config/default.nix @@ -34,7 +34,7 @@ users.users.${currentSystemUser} = { isNormalUser = true; description = "Patrick Canal"; - extraGroups = [ "networkmanager" "wheel" ]; + extraGroups = [ "networkmanager" "wheel" "docker" ]; shell = pkgs.fish; }; diff --git a/modules/packages.nix b/modules/packages.nix index 5f98a0e..0579aa6 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -15,9 +15,11 @@ jq killall krabby + libreoffice md2pdf nmap nodejs + openvpn podman-compose python3 ripgrep @@ -42,6 +44,7 @@ vulkan-tools # GUI applications + android-studio baobab firefox gnome-boxes