diff --git a/home/arrakis/default.nix b/home/arrakis/default.nix
index 9d2d2c5..29bf5af 100644
--- a/home/arrakis/default.nix
+++ b/home/arrakis/default.nix
@@ -16,6 +16,7 @@
     ../common/programs/hyprland
     ../common/programs/ghostty.nix
     ../common/programs/syncthing.nix
+    ../common/programs/unity.nix
     ../common/programs/gpg.nix
     ../common/features/xdg.nix
     ../common/features/bluetooth.nix
diff --git a/hosts/arrakis/default.nix b/hosts/arrakis/default.nix
index 20c9fd6..1fe3c0e 100644
--- a/hosts/arrakis/default.nix
+++ b/hosts/arrakis/default.nix
@@ -18,6 +18,7 @@
     ../common/features/nix-ld.nix
     ../common/features/bluetooth.nix
     ../common/features/ledger.nix
+    ../common/features/android-studio.nix
   ];
 
   networking.hostName = "arrakis";
diff --git a/hosts/common/features/android-studio.nix b/hosts/common/features/android-studio.nix
index 5f72b53..dcbf4a6 100644
--- a/hosts/common/features/android-studio.nix
+++ b/hosts/common/features/android-studio.nix
@@ -5,13 +5,13 @@
     "adbusers"
   ];
 
-  programs.adb.enable = true;
+  # programs.adb.enable = true;
 
   services.udev.packages = with pkgs; [
     android-udev-rules
   ];
 
-  environment.systemPackages = with pkgs; [
-    android-studio
-  ];
+  # environment.systemPackages = with pkgs; [
+  #   android-studio
+  # ];
 }
diff --git a/hosts/common/features/display/gdm.nix b/hosts/common/features/display/gdm.nix
index 598f618..db426e1 100644
--- a/hosts/common/features/display/gdm.nix
+++ b/hosts/common/features/display/gdm.nix
@@ -4,9 +4,9 @@
     enable = true;
     displayManager = {
       startx.enable = true;
-      gdm.enable = true;
     };
     autoRepeatDelay = 250;
     autoRepeatInterval = 30;
   };
+  services.displayManager.gdm.enable = true;
 }