From 4187687b3fdf75e54e7e2282a81a7b4c458b705a Mon Sep 17 00:00:00 2001
From: Tine <tine@tjo.space>
Date: Sat, 9 Mar 2024 18:47:56 +0100
Subject: [PATCH] feat: install docker

---
 install.sh   | 31 ++++++++++++++++++++++++++-----
 nix/home.nix |  3 ---
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/install.sh b/install.sh
index b538489..8aace6f 100755
--- a/install.sh
+++ b/install.sh
@@ -25,10 +25,27 @@ if [ "$OS_RELEASE" = "fedora" ]; then
   rpm-ostree install --idempotent --apply-live --allow-inactive -y \
     git git-lfs \
     kitty zsh \
-    podman-docker \
     gphoto2 v4l2loopback ffmpeg \
     ddcutil
 
+  echo_header "==[host] Installing docker"
+  # Add Docker CE repository
+  cat <<EOF | sudo tee /etc/yum.repos.d/docker.repo
+[docker-ce-stable]
+name=Docker CE Stable - \$basearch
+baseurl=https://download.docker.com/linux/fedora/\$releasever/\$basearch/stable
+enabled=1
+gpgcheck=1
+gpgkey=https://download.docker.com/linux/fedora/gpg
+EOF
+  rpm-ostree install --idempotent --apply-live --allow-inactive -y \
+    docker-ce docker-ce-cli \
+    containerd.io \
+    docker-buildx-plugin \
+    docker-compose-plugin
+  sudo usermod -aG docker $USER
+  echo "== Docker installed, restart will be needed to take effect."
+
   echo_header "==[host] Installing flatpaks"
   flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
   flatpak install -y --user \
@@ -54,10 +71,14 @@ elif [ "$OS_RELEASE" = "ubuntu" ]; then
 fi
 
 echo_header "==[host] Installing Nix"
-curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix | sh -s -- install
-. /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
-nix-channel --add https://nixos.org/channels/nixpkgs-unstable
-nix-channel --update
+if ! nix --version; then
+  curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix | sh -s -- install
+  . /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
+  nix-channel --add https://nixos.org/channels/nixpkgs-unstable
+  nix-channel --update
+else
+  echo "Already installed, skipping"
+fi
 
 echo_header "==[host] Installing Home Manager"
 nix-channel --add https://github.com/nix-community/home-manager/archive/master.tar.gz home-manager
diff --git a/nix/home.nix b/nix/home.nix
index d6e9f98..2478883 100644
--- a/nix/home.nix
+++ b/nix/home.nix
@@ -41,9 +41,6 @@
     direnv
     sqlfluff
 
-    # Docker
-    docker-compose
-
     # Nodejs
     nodejs_20