remove nftables (linux uses this by default now anyways i think?)

add busybox since its basically expected by some programs (comes with xz)
make virtualisation a proper module so i can flip between docker and podman (i will make podman work one day i swear)
add waydroid back in
electrum is busted for now
make resharper a bit more modular
add new firefox bs

configuration/base/networking.nix

@@ -5,9 +5,6 @@
   # Pick only one of the below networking options.
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
   networking = {
-    nftables = {
-      enable = true;
-    };
     networkmanager = {
       # Easiest to use and most distros use this by default.
       enable = true;

configuration/base/programs.nix

@@ -19,8 +19,8 @@
 
     rar
     zstd
-    xz
     p7zip
+    busybox
 
     libva-utils
     smartmontools

configuration/modules/virtualisation.nix

@@ -1,39 +1,55 @@
-{ pkgs, ... }:
+{ pkgs, lib, config, inputs, ... }:
 
+with lib;
 {
-  virtualisation = {
-    containers = {
-      # Enable common container config files in /etc/containers
-      enable = true;
-    };
-    libvirtd = {
-      enable = true;
-      qemu = {
-        vhostUserPackages = [ pkgs.virtiofsd ];
-        ovmf.enable = true;
+  options.virtualisation.containerManagement = mkOption {
+    type = types.enum [ "docker" "podman" ];
+    default = "docker";
+  };
+
+  config = {
+    virtualisation = {
+      containers = {
+        # Enable common container config files in /etc/containers
+        enable = true;
+      };
+      libvirtd = {
+        enable = true;
+        qemu = {
+          vhostUserPackages = [ pkgs.virtiofsd ];
+          ovmf.enable = true;
+        };
+      };
+      # remember to add the necessary users to the podman group
+      podman = {
+        enable = if (config.virtualisation.containerManagement == "podman") then true else false;
+        dockerSocket.enable = true;
+        dockerCompat = true;
+        defaultNetwork.settings.dns_enabled = true;
+      };
+      # remember to add the necessary users to the docker group
+      docker = {
+        enable = if (config.virtualisation.containerManagement == "docker") then true else false;
+        storageDriver = "btrfs";
+      };
+      waydroid = {
+        enable = true;
+        # TODO: update when this is in stable
+        package = inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".waydroid-nftables;
       };
     };
-    # podman = {
-    #   enable = true;
-    #   dockerSocket.enable = true;
-    #   dockerCompat = true;
-    #   defaultNetwork.settings.dns_enabled = true;
-    # };
-    # remember to add the necessary users to the docker group
-    docker = {
-      enable = true;
-      storageDriver = "btrfs";
-    };
-    # waydroid = {
-    #   enable = true;
-    # };
+    programs.virt-manager.enable = true;
+
+    environment.systemPackages = with pkgs;[
+      inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".waydroid-helper
+    ] ++ optionals (config.virtualisation.containerManagement == "podman") [
+      docker-compose
+      # podman-compose
+      podman-tui
+      podman-desktop
+    ] ++ optionals (config.virtualisation.containerManagement == "docker") [
+      lazydocker
+    ];
   };
-  programs.virt-manager.enable = true;
-  # environment.systemPackages = with pkgs;[
-  #   docker-compose
-  #   # podman-compose
-  #   podman-tui
-  #   podman-desktop
-  # ];
 }