diff --git a/application-configuration.nix b/application-configuration.nix
index 9ae8223..d54f431 100644
--- a/application-configuration.nix
+++ b/application-configuration.nix
@@ -17,13 +17,15 @@
         tor-browser-bundle-bin
         yubikey-manager-qt
         gparted
-        hashcat
         libsForQt5.kdeconnect-kde
         obsidian
 
         # flatpak
         flatpak
         gnome.gnome-software
+
+        # virtualisation
+        podman-compose
       ];
   };
 
@@ -54,4 +56,31 @@
 
   # flatpak for bluebubbles client
   services.flatpak.enable = true;
+
+  # podman
+  virtualisation = {
+    podman = {
+      enable = true;
+      dockerCompat = true;
+      defaultNetwork.settings.dns_enabled = true;
+    };
+
+    # enable libvirt
+    libvirtd = {
+      enable = true;
+      qemu = {
+        package = pkgs.qemu_kvm;
+        runAsRoot = true;
+        swtpm.enable = true;
+        ovmf = {
+          enable = true;
+          packages = [(pkgs.OVMF.override {
+            secureBoot = true;
+            tpmSupport = true;
+          }).fd];
+        };
+      };
+    };
+  };
+  users.users.caleb.extraGroups = [ "libvirtd" ];
 }
diff --git a/configuration.nix b/configuration.nix
index 6783251..21b2556 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -9,7 +9,6 @@
       ./application-configuration.nix
       ./software-development-configuration.nix
       ./school-configuration.nix
-      ./virtualisation-configuration.nix
       ./faf-linux.nix
       ./winapps.nix
     ];
@@ -57,6 +56,8 @@
     "vscode"
     "code"
     "Oracle_VM_VirtualBox_Extension_Pack"
+
+    "obsidian"
   ];
 
   # Enable the X11 windowing system.
diff --git a/virtualisation-configuration.nix b/virtualisation-configuration.nix
deleted file mode 100644
index 377a098..0000000
--- a/virtualisation-configuration.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ pkgs, ... }:
-{
-  environment.systemPackages = with pkgs; [
-    podman-compose
-    docker-compose
-
-  ];
-
-  virtualisation = {
-    podman = {
-      enable = true;
-      defaultNetwork.settings.dns_enabled = true;
-    };
-
-    docker = {
-      enable = true;
-      rootless = {
-        enable = true;
-        setSocketVariable = true;      
-      };
-    };
-
-    # enable libvirt
-    libvirtd = {
-      enable = true;
-      qemu = {
-        package = pkgs.qemu_kvm;
-        runAsRoot = true;
-        swtpm.enable = true;
-        ovmf = {
-          enable = true;
-          packages = [(pkgs.OVMF.override {
-            secureBoot = true;
-            tpmSupport = true;
-          }).fd];
-        };
-      };
-    };
-  };
-  users.users.caleb.extraGroups = [ "libvirtd" "docker" ];
-}