From 966b7f2ef7ce110831e6c2b9bf6c199d5de6a558 Mon Sep 17 00:00:00 2001
From: Gene Liverman <gene@technicalissues.us>
Date: Tue, 3 Sep 2024 08:27:05 -0400
Subject: [PATCH 1/2] Fix things up related to booting and network settings

---
 .../hosts/nixos/rainbow-planet/default.nix    | 25 ++++++++++++++++---
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/modules/hosts/nixos/rainbow-planet/default.nix b/modules/hosts/nixos/rainbow-planet/default.nix
index 1a81ec6..1cb1037 100644
--- a/modules/hosts/nixos/rainbow-planet/default.nix
+++ b/modules/hosts/nixos/rainbow-planet/default.nix
@@ -6,11 +6,17 @@
 
   system.stateVersion = "23.05";
 
-  boot.loader = {
-    efi.canTouchEfiVariables = true;
-    systemd-boot= {
+  boot = {
+    initrd.systemd = {
       enable = true;
-      consoleMode = "1";
+      network.wait-online.enable = false; # Handled by NetworkManager
+    };
+    loader = {
+      efi.canTouchEfiVariables = true;
+      systemd-boot= {
+        enable = true;
+        consoleMode = "1";
+      };
     };
   };
 
@@ -89,16 +95,20 @@
 
   services = {
     boinc.enable = true;
+    dbus.implementation = "broker";
     desktopManager.cosmic.enable = true;
     desktopManager.plasma6.enable = true;
     displayManager.sddm = {
       enable = true;
       wayland.enable = true;
     };
+    fstrim.enable = true;
     fwupd.enable = true;
     gnome.gnome-keyring.enable = true; # Provides secret storage
     gvfs.enable = true; # Used by Nautilus
+    irqbalance.enable = true;
     printing.enable = true; # Enable CUPS
+    resolved.enable = true;
     tailscale = {
       enable = true;
       authKeyFile = config.sops.secrets.tailscale_key.path;
@@ -159,6 +169,13 @@
     };
   };
 
+  system.switch = {
+    enable = false;
+    enableNg = true;
+  };
+
+  systemd.network.wait-online.enable = false; # Handled by NetworkManager
+
   users.extraGroups.vboxusers.members = [ "${username}" ];
 
   # Define a user account. Don't forget to set a password with ‘passwd’.

From 5c81ab594f97ff19b1f159008723130a7898f625 Mon Sep 17 00:00:00 2001
From: Gene Liverman <gene@technicalissues.us>
Date: Tue, 3 Sep 2024 08:27:25 -0400
Subject: [PATCH 2/2] Container setup

---
 modules/hosts/nixos/rainbow-planet/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/modules/hosts/nixos/rainbow-planet/default.nix b/modules/hosts/nixos/rainbow-planet/default.nix
index 1cb1037..6cd32f2 100644
--- a/modules/hosts/nixos/rainbow-planet/default.nix
+++ b/modules/hosts/nixos/rainbow-planet/default.nix
@@ -48,6 +48,8 @@
     pavucontrol
     polkit-kde-agent
     ulauncher
+    podman-compose
+    podman-tui # status of containers in the terminal
     pop-gtk-theme
     pop-icon-theme
     pop-launcher
@@ -182,7 +184,7 @@
   users.users.${username} = {
     isNormalUser = true;
     description = "Gene Liverman";
-    extraGroups = [ "networkmanager" "wheel" "dialout" "input" ];
+    extraGroups = [ "dialout" "docker" "input" "networkmanager" "podman" "wheel" ];
     packages = with pkgs; [
       tailscale-systray
     ];
@@ -190,13 +192,19 @@
 
   virtualisation = {
     containers.enable = true;
+    docker = {
+      enable = true;
+      package = pkgs.docker_26;
+    };
     libvirtd = {
       enable = true;
       qemu.package = pkgs.qemu_kvm;
     };
     podman = {
       enable = true;
+      autoPrune.enable = true;
       defaultNetwork.settings.dns_enabled = true;
+      # dockerCompat = true;
     };
     virtualbox.host.enable = true;
   };