diff --git a/flake.lock b/flake.lock
index 17e798f..86a1c61 100644
--- a/flake.lock
+++ b/flake.lock
@@ -224,6 +224,26 @@
         "type": "github"
       }
     },
+    "nix-index-database": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1696131323,
+        "narHash": "sha256-Y47r8Jo+9rs+XUWHcDPZtkQs6wFeZ24L4CQTfVwE+vY=",
+        "owner": "Mic92",
+        "repo": "nix-index-database",
+        "rev": "031d4b22505fdea47bd53bfafad517cd03c26a4f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Mic92",
+        "repo": "nix-index-database",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1695830400,
@@ -337,6 +357,7 @@
         "home-manager": "home-manager",
         "hyprland": "hyprland",
         "nix-colors": "nix-colors",
+        "nix-index-database": "nix-index-database",
         "nixpkgs": "nixpkgs",
         "nixpkgs-unstable": "nixpkgs-unstable"
       }
diff --git a/flake.nix b/flake.nix
index 37479c4..85dd841 100644
--- a/flake.nix
+++ b/flake.nix
@@ -20,6 +20,9 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nix-colors.url = "github:misterio77/nix-colors";
+
+    nix-index-database.url = "github:Mic92/nix-index-database";
+    nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
   };
 
   outputs = { self, nixpkgs, home-manager, hyprland, devenv, ... }@inputs:
diff --git a/hosts/default.nix b/hosts/default.nix
index 460d70f..84fb4cd 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -16,7 +16,7 @@
       ./thinkpad
       ./configuration.nix
       ../modules/themes/home.nix
-
+      inputs.nix-index-database.nixosModules.nix-index
       home-manager.nixosModules.home-manager
       {
         home-manager.useGlobalPkgs = true;
@@ -28,7 +28,6 @@
         };
       }
     ];
-
   };
 
 
diff --git a/hosts/home.nix b/hosts/home.nix
index 966983a..9f6d872 100644
--- a/hosts/home.nix
+++ b/hosts/home.nix
@@ -26,6 +26,7 @@
     homeDirectory = "/home/${user}";
 
     packages = with pkgs; [
+      devbox
       nix-prefetch-git
       libnotify
       kubernetes-helm
diff --git a/hosts/thinkpad/apparmor.nix b/hosts/thinkpad/apparmor.nix
index dd96254..be033cb 100644
--- a/hosts/thinkpad/apparmor.nix
+++ b/hosts/thinkpad/apparmor.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ pkgs, ... }:
 {
   security.apparmor.enable = true;
   security.apparmor.killUnconfinedConfinables = true;
diff --git a/hosts/thinkpad/default.nix b/hosts/thinkpad/default.nix
index f61a1b8..56c049b 100644
--- a/hosts/thinkpad/default.nix
+++ b/hosts/thinkpad/default.nix
@@ -29,6 +29,8 @@
     # No xbacklight, this is the alterantive
     dconf.enable = true;
     light.enable = true;
+    command-not-found.enable = false;
+    nix-index-database.comma.enable = true;
   };
 
   services = {
diff --git a/modules/desktop/virtualisation/default.nix b/modules/desktop/virtualisation/default.nix
index 60dc37f..3c4a06b 100644
--- a/modules/desktop/virtualisation/default.nix
+++ b/modules/desktop/virtualisation/default.nix
@@ -1,4 +1,5 @@
 [
   ./docker.nix
   #  ./virtualbox.nix
+  ./libvirt.nix
 ]
diff --git a/modules/desktop/virtualisation/libvirt.nix b/modules/desktop/virtualisation/libvirt.nix
new file mode 100644
index 0000000..d62f850
--- /dev/null
+++ b/modules/desktop/virtualisation/libvirt.nix
@@ -0,0 +1,9 @@
+{ config, pkgs, user, ... }:
+
+{
+  boot.kernelModules = [ "kvm-amd" ];
+  environment.systemPackages = with pkgs; [ virt-manager ];
+  virtualisation.libvirtd.enable = true;
+  users.extraGroups.libvirtd.members = [ "${user}" ];
+}
+
diff --git a/modules/desktop/virtualisation/virtlib.nix b/modules/desktop/virtualisation/virtlib.nix
deleted file mode 100644
index 4702d70..0000000
--- a/modules/desktop/virtualisation/virtlib.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ config, pkgs, user, ... }:
-
-{
-
-  virtualisation.libvirtd.host.enable = true;
-  users.extraGroups.libvirtd.members = [ "${user}" ];
-
-}
-