diff --git a/configurations/home-manager/leyla/packages/default.nix b/configurations/home-manager/leyla/packages/default.nix
index bc41350..0917d04 100644
--- a/configurations/home-manager/leyla/packages/default.nix
+++ b/configurations/home-manager/leyla/packages/default.nix
@@ -46,6 +46,7 @@ in {
         })
         (lib.mkIf (hardware.directAccess.enable && config.user.isDesktopUser) {
           anki.enable = true;
+          android-studio.enable = true;
           makemkv.enable = true;
           discord.enable = true;
           signal-desktop-bin.enable = true;
diff --git a/configurations/nixos/emergent/configuration.nix b/configurations/nixos/emergent/configuration.nix
index 6121069..958b423 100644
--- a/configurations/nixos/emergent/configuration.nix
+++ b/configurations/nixos/emergent/configuration.nix
@@ -40,7 +40,7 @@
   services.xserver.wacom.enable = true;
 
   # installed opentabletdriver
-  hardware.opentabletdriver.enable = true;
+  # hardware.opentabletdriver.enable = true;
   hardware.keyboard.qmk.enable = true;
 
   # Enable the GNOME Desktop Environment.
@@ -69,6 +69,12 @@
     };
   };
 
+  virtualisation.libvirtd.enable = true;
+
+  users.users.eve = {
+    extraGroups = ["libvirtd"];
+  };
+
   services.tailscale.enable = true;
   # We were having weird build errors so this is disabled right now
   # error: The option `devices.emergent.folders.eve_records.path' was accessed but has no value defined. Try setting the option
@@ -109,6 +115,8 @@
   # See https://search.nixos.org/packages for all options
   environment.systemPackages = with pkgs; [
     wget
+    gnome-boxes
+    libvirt
   ];
 
   # Packages that need to be installed with some extra configuration
diff --git a/configurations/nixos/emergent/hardware-configuration.nix b/configurations/nixos/emergent/hardware-configuration.nix
index 4e13149..b077f9c 100644
--- a/configurations/nixos/emergent/hardware-configuration.nix
+++ b/configurations/nixos/emergent/hardware-configuration.nix
@@ -12,7 +12,7 @@
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"];
+  boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" "wacom" "kvm" "kvm_amd"];
   boot.initrd.kernelModules = [];
   boot.kernelModules = [];
   boot.extraModulePackages = [];
diff --git a/configurations/nixos/twilight/hardware-configuration.nix b/configurations/nixos/twilight/hardware-configuration.nix
index 1389caf..94c83d6 100644
--- a/configurations/nixos/twilight/hardware-configuration.nix
+++ b/configurations/nixos/twilight/hardware-configuration.nix
@@ -18,12 +18,12 @@
 
   fileSystems = {
     "/" = {
-      device = "/dev/disk/by-uuid/8be49c65-2b57-48f1-b74d-244d26061adb";
+      device = "/dev/disk/by-id/ata-TOSHIBA_DT01ACA100_77D21HVNS-part2";
       fsType = "ext4";
     };
 
     "/boot" = {
-      device = "/dev/disk/by-uuid/3006-3867";
+      device = "/dev/disk/by-id/ata-TOSHIBA_DT01ACA100_77D21HVNS-part1";
       fsType = "vfat";
       options = ["fmask=0022" "dmask=0022"];
     };
diff --git a/modules/home-manager-modules/programs/android-studio.nix b/modules/home-manager-modules/programs/android-studio.nix
new file mode 100644
index 0000000..0f76276
--- /dev/null
+++ b/modules/home-manager-modules/programs/android-studio.nix
@@ -0,0 +1,35 @@
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}: {
+  options.programs.android-studio = {
+    enable = lib.mkEnableOption "enable android-studio";
+  };
+
+  config = lib.mkIf config.programs.android-studio.enable (lib.mkMerge [
+    {
+      home.packages = with pkgs; [
+        android-studio
+      ];
+    }
+    # TODO: create this
+    # (
+    #   lib.mkIf config.impermanence.enable {
+    #     home.persistence."/persist${config.home.homeDirectory}" = {
+    #       directories = [
+    #         # configuration
+    #         "${config.xdg.configHome}/Google/AndroidStudio"
+    #         # Android SDK
+    #         ".android"
+    #         # Gradle cache
+    #         ".gradle"
+    #         # Android Studio projects cache
+    #         "${config.xdg.cacheHome}/Google/AndroidStudio"
+    #       ];
+    #     };
+    #   }
+    # )
+  ]);
+}
diff --git a/modules/home-manager-modules/programs/default.nix b/modules/home-manager-modules/programs/default.nix
index e70cfc8..5b3a169 100644
--- a/modules/home-manager-modules/programs/default.nix
+++ b/modules/home-manager-modules/programs/default.nix
@@ -1,5 +1,6 @@
 {...}: {
   imports = [
+    ./android-studio.nix
     ./firefox.nix
     ./signal.nix
     ./bitwarden.nix