diff --git a/home/packages/android.nix b/home/packages/android.nix
new file mode 100644
index 0000000..3e57358
--- /dev/null
+++ b/home/packages/android.nix
@@ -0,0 +1,27 @@
+{
+  inputs,
+  pkgs,
+  ...
+}: let
+  kotlin-lsp = pkgs.runCommand "kotlin-lsp" {} ''
+    mkdir -p $out/bin
+    ln -s ${pkgs.kotlin-language-server}/bin/kotlin-language-server $out/bin/kotlin-lsp
+  '';
+in {
+  users.users.someone.packages = with pkgs; [
+    # android development
+    jdk17
+    gradle
+    android-tools
+    kotlin-lsp
+    ktlint
+    scrcpy
+    (pkgs.androidenv.composeAndroidPackages {
+      buildToolsVersions = ["36.0.0" "35.0.0" "34.0.0" "29.0.3"];
+      platformVersions = ["29" "34" "35" "36"];
+      includeNDK = true;
+      ndkVersions = ["27.0.12077973"];
+      cmakeVersions = ["3.22.1"];
+    }).androidsdk
+  ];
+}
diff --git a/home/packages/packages.nix b/home/packages/packages.nix
index 4132044..3440e14 100644
--- a/home/packages/packages.nix
+++ b/home/packages/packages.nix
@@ -34,24 +34,11 @@
     croc
     qbittorrent
     weathr
+    distrobox
     # gnome
     dconf-editor
     (papers.override {supportNautilus = true;})
-    scrcpy
-    android-tools
     awww
-     openvpn
-
-      # android development
-      jdk17
-      gradle
-      android-tools
-      (pkgs.androidenv.composeAndroidPackages {
-        buildToolsVersions = ["36.0.0" "35.0.0" "34.0.0" "29.0.3"];
-        platformVersions = ["29" "34" "35" "36"];
-        includeNDK = true;
-        ndkVersions = ["27.0.12077973"];
-        cmakeVersions = ["3.22.1"];
-      }).androidsdk
-    ];
+    openvpn
+  ];
 }
diff --git a/home/terminal/software/opencode/_languages.nix b/home/terminal/software/opencode/_languages.nix
index bbb5af9..66b61c8 100644
--- a/home/terminal/software/opencode/_languages.nix
+++ b/home/terminal/software/opencode/_languages.nix
@@ -18,6 +18,7 @@ in {
   packages = with pkgs; [
     astro-language-server
     biome
+    kotlin-language-server
     marksman
     nil
     tailwindcss-language-server
@@ -59,6 +60,10 @@ in {
       command = [lspBins.nil];
       extensions = ["nix"];
     };
+    kotlin = {
+      command = ["kotlin-language-server"];
+      extensions = ["kt" "kts"];
+    };
     marksman = {
       command = [lspBins.marksman];
       extensions = ["md"];
diff --git a/home/terminal/software/opencode/default.nix b/home/terminal/software/opencode/default.nix
index 1d0e14e..a05830c 100644
--- a/home/terminal/software/opencode/default.nix
+++ b/home/terminal/software/opencode/default.nix
@@ -94,7 +94,7 @@ in {
           "zai"
           "zenmux"
         ];
-        enabled_providers = [ "opencode" "google" "openrouter" ];
+        enabled_providers = [ "opencode" "google" "openrouter" "deepseek" "nvidia" "alibaba" "mistral" "cloudflare-workers-ai" ];
         mcp = {
           gh_grep = {
             type = "remote";