diff --git a/home/core/gui/vscode/default.nix b/home/core/gui/vscode/default.nix
new file mode 100644
index 00000000..39292b75
--- /dev/null
+++ b/home/core/gui/vscode/default.nix
@@ -0,0 +1,5 @@
+{
+  programs.vscode = {
+    enable = true;
+  };
+}
diff --git a/home/users/toothpick/imports.nix b/home/users/toothpick/imports.nix
index 5f96d104..8b540c4c 100644
--- a/home/users/toothpick/imports.nix
+++ b/home/users/toothpick/imports.nix
@@ -6,6 +6,7 @@
     ../../core/gui/browsers
     ../../core/gui/xdg
     ../../core/gui/discord
+    ../../core/gui/vscode
     # core.tui
     ../../core/tui/git/toothpick.nix
     ../../core/tui/shell/toothpick.nix
diff --git a/nixos/core/adb.nix b/nixos/extra/android/default.nix
similarity index 100%
rename from nixos/core/adb.nix
rename to nixos/extra/android/default.nix
diff --git a/nixos/hosts/adampad/imports.nix b/nixos/hosts/adampad/imports.nix
index 0e7cf605..a868f3e5 100644
--- a/nixos/hosts/adampad/imports.nix
+++ b/nixos/hosts/adampad/imports.nix
@@ -1,7 +1,6 @@
 {pkgs, ...}: {
   imports = [
     # core
-    ../../core/adb.nix
     ../../core/fonts.nix
     ../../core/hyprland.nix
     ../../core/zsh.nix
@@ -27,6 +26,7 @@
     ../../services/fwupd.nix
 
     # extra
+    ../../extra/android
     #../../extra/gaming.nix
     #../../extra/workstation
     # ../../extra/nix-ld
diff --git a/nixos/hosts/cnix/imports.nix b/nixos/hosts/cnix/imports.nix
index 43c73f1f..45d877dc 100644
--- a/nixos/hosts/cnix/imports.nix
+++ b/nixos/hosts/cnix/imports.nix
@@ -1,7 +1,6 @@
 {pkgs, ...}: {
   imports = [
     # core
-    ../../core/adb.nix
     ../../core/fonts.nix
     ../../core/hyprland.nix
     ../../core/zsh.nix
@@ -27,6 +26,7 @@
 
     # extra
     ../../extra/gaming.nix
+    ../../extra/android
     #../../extra/workstation
     # ../../extra/nix-ld
   ];
diff --git a/nixos/hosts/toothpc/imports.nix b/nixos/hosts/toothpc/imports.nix
index 62182c33..3cb853bd 100644
--- a/nixos/hosts/toothpc/imports.nix
+++ b/nixos/hosts/toothpc/imports.nix
@@ -1,7 +1,6 @@
 {pkgs, ...}: {
   imports = [
     # core
-    ../../core/adb.nix
     ../../core/fonts.nix
     ../../core/hyprland.nix
     ../../core/zsh.nix
@@ -27,6 +26,7 @@
 
     # extra
     ../../extra/gaming.nix
+    ../../extra/android
     #../../extra/workstation
     # ../../extra/nix-ld
   ];