From 6594dc781affe316a5640cc51f5f0e89a2604c01 Mon Sep 17 00:00:00 2001
From: Dave Gallant <davegallant@gmail.com>
Date: Wed, 8 Dec 2021 11:36:15 -0500
Subject: [PATCH] Add back docker for work

---
 common/linux.nix    | 3 ++-
 common/packages.nix | 6 +++++-
 home/default.nix    | 1 -
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/common/linux.nix b/common/linux.nix
index 9dc6968..6ad081f 100644
--- a/common/linux.nix
+++ b/common/linux.nix
@@ -20,7 +20,7 @@
 
   users.users.dave = {
     isNormalUser = true;
-    extraGroups = [ "wheel" "libvirtd" ];
+    extraGroups = [ "docker" "wheel" "libvirtd" ];
     shell = pkgs.zsh;
   };
 
@@ -40,6 +40,7 @@
   hardware.opengl.extraPackages32 = with pkgs.pkgsi686Linux; [ libva ];
   hardware.pulseaudio.support32Bit = true;
 
+  virtualisation.docker.enable = true;
   virtualisation.podman.enable = true;
 
   programs.gnupg.agent = {
diff --git a/common/packages.nix b/common/packages.nix
index 763fc74..3b3753b 100644
--- a/common/packages.nix
+++ b/common/packages.nix
@@ -37,6 +37,11 @@ in
         starship
         tokei
 
+        # containers
+        docker
+        docker-compose
+        podman
+
         # language servers
         nodePackages.bash-language-server
         nodePackages.yaml-language-server
@@ -182,7 +187,6 @@ in
         opensnitch
         opensnitch-ui
         pinentry-curses
-        podman
         pulseeffects-pw
         qemu
         rtorrent
diff --git a/home/default.nix b/home/default.nix
index 1692f53..37e6127 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -147,7 +147,6 @@ in
 
       shellAliases = {
         ".." = "cd ..";
-        docker = "podman";
         grep = "rg --smart-case";
         k = "kubectl";
         ls = "exa -la --git";