diff --git a/users/guanranwang/darwin/profiles/device-type/desktop/default.nix b/users/guanranwang/darwin/profiles/device-type/desktop/default.nix
index c23db1d..e592e4f 100644
--- a/users/guanranwang/darwin/profiles/device-type/desktop/default.nix
+++ b/users/guanranwang/darwin/profiles/device-type/desktop/default.nix
@@ -1,13 +1,6 @@
 {...}: {
   ### home-manager
   home-manager.users.guanranwang.imports = map (n: ../../../../home-manager/${n}) [
-    "applications/alacritty"
-    "applications/fish"
-    "applications/bash"
-    "applications/helix"
-    "applications/neovim"
-    "applications/vscode"
-
     "profiles/graphical-stuff/darwin"
   ];
 }
diff --git a/users/guanranwang/home-manager/applications/spotify/default.nix b/users/guanranwang/home-manager/applications/spotify/default.nix
index b8d3bf4..3a6c544 100644
--- a/users/guanranwang/home-manager/applications/spotify/default.nix
+++ b/users/guanranwang/home-manager/applications/spotify/default.nix
@@ -1,19 +1,3 @@
-{
-  pkgs,
-  inputs,
-  ...
-}: let
-  spicePkgs = inputs.spicetify-nix.packages.${pkgs.system}.default;
-in {
-  # import the flake's module for your system
-  imports = [inputs.spicetify-nix.homeManagerModule];
-
-  # configure spicetify :)
-  programs.spicetify = {
-    enable = true;
-    enabledExtensions = with spicePkgs.extensions; [
-      adblock
-      keyboardShortcut
-    ];
-  };
+{pkgs, ...}: {
+  home.packages = [pkgs.spotify];
 }
diff --git a/users/guanranwang/home-manager/applications/spotify/spicetify.nix b/users/guanranwang/home-manager/applications/spotify/spicetify.nix
new file mode 100644
index 0000000..b8d3bf4
--- /dev/null
+++ b/users/guanranwang/home-manager/applications/spotify/spicetify.nix
@@ -0,0 +1,19 @@
+{
+  pkgs,
+  inputs,
+  ...
+}: let
+  spicePkgs = inputs.spicetify-nix.packages.${pkgs.system}.default;
+in {
+  # import the flake's module for your system
+  imports = [inputs.spicetify-nix.homeManagerModule];
+
+  # configure spicetify :)
+  programs.spicetify = {
+    enable = true;
+    enabledExtensions = with spicePkgs.extensions; [
+      adblock
+      keyboardShortcut
+    ];
+  };
+}
diff --git a/users/guanranwang/home-manager/profiles/graphical-stuff/darwin/default.nix b/users/guanranwang/home-manager/profiles/graphical-stuff/darwin/default.nix
index c9ed4ca..dc1555e 100644
--- a/users/guanranwang/home-manager/profiles/graphical-stuff/darwin/default.nix
+++ b/users/guanranwang/home-manager/profiles/graphical-stuff/darwin/default.nix
@@ -4,6 +4,28 @@
   lib,
   ...
 }: {
+  imports = map (n: ../../../../home-manager/applications/${n}) [
+    # Terminal
+    "alacritty"
+
+    # Shell
+    "fish"
+    "bash"
+
+    # Editor
+    "helix"
+    "neovim"
+    "vscode"
+
+    # Language
+    "nix"
+    "go"
+
+    # Media
+    "mpv"
+    "spotify"
+  ];
+
   home = {
     activation = {
       # Workaround for spotlight indexing
diff --git a/users/guanranwang/home-manager/profiles/graphical-stuff/nixos/default.nix b/users/guanranwang/home-manager/profiles/graphical-stuff/nixos/default.nix
index e222439..a582eae 100644
--- a/users/guanranwang/home-manager/profiles/graphical-stuff/nixos/default.nix
+++ b/users/guanranwang/home-manager/profiles/graphical-stuff/nixos/default.nix
@@ -33,7 +33,7 @@
       # Media
       "loupe"
       "mpv"
-      "spotify"
+      "spotify/spicetify"
       "amberol"
       "mousai"
 
diff --git a/users/guanranwang/home-manager/profiles/media/darwin/default.nix b/users/guanranwang/home-manager/profiles/media/darwin/default.nix
deleted file mode 100644
index add8067..0000000
--- a/users/guanranwang/home-manager/profiles/media/darwin/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{pkgs, ...}: {
-  programs.mpv.enable = true;
-  home.packages = with pkgs; [
-    ### Streaming
-    spotify
-    yesplaymusic
-  ];
-}