diff --git a/home/applications/amberol/default.nix b/home/applications/amberol/default.nix
deleted file mode 100644
index ce18f08..0000000
--- a/home/applications/amberol/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  home.packages = [pkgs.amberol];
-}
diff --git a/home/applications/android-tools/default.nix b/home/applications/android-tools/default.nix
deleted file mode 100644
index 0f9a267..0000000
--- a/home/applications/android-tools/default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{pkgs, ...}: {
-  # requires sudo
-  home.packages = [pkgs.android-tools];
-}
diff --git a/home/applications/batsignal/default.nix b/home/applications/batsignal/default.nix
deleted file mode 100644
index 049a19d..0000000
--- a/home/applications/batsignal/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  services.batsignal.enable = true;
-}
diff --git a/home/applications/bottom/default.nix b/home/applications/bottom/default.nix
deleted file mode 100644
index 4bc1015..0000000
--- a/home/applications/bottom/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  programs.bottom.enable = true;
-}
diff --git a/home/applications/cava/default.nix b/home/applications/cava/default.nix
deleted file mode 100644
index 21c3d2e..0000000
--- a/home/applications/cava/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  home.packages = [pkgs.cava];
-}
diff --git a/home/applications/cliphist/default.nix b/home/applications/cliphist/default.nix
deleted file mode 100644
index b2dd112..0000000
--- a/home/applications/cliphist/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  services.cliphist.enable = true;
-}
diff --git a/home/applications/common/wm.nix b/home/applications/common/wm.nix
index 58da7e2..8251d92 100644
--- a/home/applications/common/wm.nix
+++ b/home/applications/common/wm.nix
@@ -1,16 +1,8 @@
 {pkgs, ...}: {
-  home.packages = with pkgs; [
-    pavucontrol
-  ];
+  home.packages = with pkgs; [pavucontrol];
 
-  dconf.settings = {
-    "org/gnome/desktop/wm/preferences" = {
-      "button-layout" = "icon,appmenu:"; # remove csd window buttons
-    };
-  };
-
-  home.sessionVariables = {
-    # https://github.com/localsend/localsend/blob/2457acd8a7412723b174672d174e4853dccd7d99/app/linux/my_application.cc#L45
-    GTK_CSD = 0;
-  };
+  # remove csd window buttons
+  # https://github.com/localsend/localsend/blob/2457acd8a7412723b174672d174e4853dccd7d99/app/linux/my_application.cc#L45
+  home.sessionVariables.GTK_CSD = 0;
+  dconf.settings."org/gnome/desktop/wm/preferences"."button-layout" = "icon,appmenu:";
 }
diff --git a/home/applications/easyeffects/default.nix b/home/applications/easyeffects/default.nix
deleted file mode 100644
index 431a02b..0000000
--- a/home/applications/easyeffects/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  home.packages = [pkgs.easyeffects];
-}
diff --git a/home/applications/fd/default.nix b/home/applications/fd/default.nix
deleted file mode 100644
index e957fe2..0000000
--- a/home/applications/fd/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  home.packages = [pkgs.fd];
-}
diff --git a/home/applications/hyperfine/default.nix b/home/applications/hyperfine/default.nix
deleted file mode 100644
index ef74660..0000000
--- a/home/applications/hyperfine/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{pkgs, ...}: {
-  home.packages = [
-    pkgs.hyperfine
-  ];
-}
diff --git a/home/applications/irssi/default.nix b/home/applications/irssi/default.nix
deleted file mode 100644
index 2e28357..0000000
--- a/home/applications/irssi/default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{pkgs, ...}: {
-  home.packages = [pkgs.irssi];
-  #programs.irssi.enable = true;
-}
diff --git a/home/applications/joshuto/default.nix b/home/applications/joshuto/default.nix
deleted file mode 100644
index 1cbea05..0000000
--- a/home/applications/joshuto/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  programs.joshuto.enable = true;
-}
diff --git a/home/applications/lunar-client/default.nix b/home/applications/lunar-client/default.nix
deleted file mode 100644
index b6014ab..0000000
--- a/home/applications/lunar-client/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  home.packages = [pkgs.lunar-client];
-}
diff --git a/home/applications/mangohud/default.nix b/home/applications/mangohud/default.nix
deleted file mode 100644
index ab66356..0000000
--- a/home/applications/mangohud/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  programs.mangohud = {
-    enable = true;
-    # TODO: add configuration, i have no idea how to display stuff with nix syntax
-  };
-}
diff --git a/home/applications/mousai/default.nix b/home/applications/mousai/default.nix
deleted file mode 100644
index 6159534..0000000
--- a/home/applications/mousai/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  home.packages = [pkgs.mousai];
-}
diff --git a/home/applications/mumble/default.nix b/home/applications/mumble/default.nix
deleted file mode 100644
index 9e571ec..0000000
--- a/home/applications/mumble/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  home.packages = [pkgs.mumble];
-}
diff --git a/home/applications/netease-cloud-music-gtk/default.nix b/home/applications/netease-cloud-music-gtk/default.nix
deleted file mode 100644
index 7934a7f..0000000
--- a/home/applications/netease-cloud-music-gtk/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  home.packages = [pkgs.netease-cloud-music-gtk];
-}
diff --git a/home/applications/osu-lazer/default.nix b/home/applications/osu-lazer/default.nix
deleted file mode 100644
index d90985c..0000000
--- a/home/applications/osu-lazer/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  pkgs,
-  inputs,
-  ...
-}: {
-  home.packages = [inputs.nix-gaming.packages.${pkgs.stdenv.hostPlatform.system}.osu-lazer-bin];
-}
diff --git a/home/applications/osu-stable/default.nix b/home/applications/osu-stable/default.nix
deleted file mode 100644
index 687e5a2..0000000
--- a/home/applications/osu-stable/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  pkgs,
-  inputs,
-  config,
-  ...
-}: {
-  home.packages = [
-    (inputs.nix-gaming.packages.${pkgs.stdenv.hostPlatform.system}.osu-stable.override {
-      location = "${config.xdg.dataHome}/osu-stable";
-    })
-  ];
-}
diff --git a/home/applications/prismlauncher/default.nix b/home/applications/prismlauncher/default.nix
deleted file mode 100644
index e705d1e..0000000
--- a/home/applications/prismlauncher/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  home.packages = [(pkgs.prismlauncher.override {glfw = pkgs.glfw-wayland-minecraft;})];
-}
diff --git a/home/applications/protonup-qt/default.nix b/home/applications/protonup-qt/default.nix
deleted file mode 100644
index 1defdf9..0000000
--- a/home/applications/protonup-qt/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  home.packages = [pkgs.protonup-qt];
-}
diff --git a/home/applications/qbittorrent/default.nix b/home/applications/qbittorrent/default.nix
deleted file mode 100644
index 34b808d..0000000
--- a/home/applications/qbittorrent/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  home.packages = [pkgs.qbittorrent];
-}
diff --git a/home/applications/ripgrep/default.nix b/home/applications/ripgrep/default.nix
deleted file mode 100644
index 34cc7c5..0000000
--- a/home/applications/ripgrep/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  programs.ripgrep.enable = true;
-}
diff --git a/home/applications/steam/default.nix b/home/applications/steam/default.nix
deleted file mode 100644
index 1a6442b..0000000
--- a/home/applications/steam/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{pkgs, ...}: {
-  home.packages = [
-    pkgs.steam
-
-    # with ProtonGE
-    # (pkgs.steam.override {
-    #   extraProfile = "export STEAM_EXTRA_COMPAT_TOOLS_PATHS='${inputs.nix-gaming.packages.${pkgs.stdenv.hostPlatform.system}.proton-ge}'";
-    # })
-  ];
-}
diff --git a/home/applications/sway/default.nix b/home/applications/sway/default.nix
index 5b318b4..06b3f3d 100644
--- a/home/applications/sway/default.nix
+++ b/home/applications/sway/default.nix
@@ -8,15 +8,16 @@
   imports = [
     ../common/wayland.nix
     ../common/wm.nix
-    ../cliphist
     ../i3status-rust
     ../mako
     ../rofi
     ../swayidle
     ../swaylock
-    ../udiskie
   ];
 
+  services.cliphist.enable = true;
+  services.udiskie.enable = true;
+
   home.sessionVariables = {
     GTK_IM_MODULE = lib.mkForce "wayland"; # use text-input-v3
   };
diff --git a/home/applications/swww/default.nix b/home/applications/swww/default.nix
deleted file mode 100644
index bab27ee..0000000
--- a/home/applications/swww/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  home.packages = [pkgs.swww];
-}
diff --git a/home/applications/trashy/default.nix b/home/applications/trashy/default.nix
deleted file mode 100644
index 4d527a5..0000000
--- a/home/applications/trashy/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  home.packages = [pkgs.trashy];
-}
diff --git a/home/applications/udiskie/default.nix b/home/applications/udiskie/default.nix
deleted file mode 100644
index f3ea3b8..0000000
--- a/home/applications/udiskie/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  services.udiskie.enable = true;
-}
diff --git a/home/applications/wget/default.nix b/home/applications/wget/default.nix
deleted file mode 100644
index 0dd574d..0000000
--- a/home/applications/wget/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  home.packages = [pkgs.wget];
-}
diff --git a/home/applications/yesplaymusic/yesplaymusic.nix b/home/applications/yesplaymusic/yesplaymusic.nix
deleted file mode 100644
index 855fd9d..0000000
--- a/home/applications/yesplaymusic/yesplaymusic.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  home.packages = [pkgs.yesplaymusic];
-}
diff --git a/home/applications/zoxide/default.nix b/home/applications/zoxide/default.nix
deleted file mode 100644
index c4b4530..0000000
--- a/home/applications/zoxide/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  programs.zoxide.enable = true;
-}
diff --git a/home/default.nix b/home/default.nix
index 12f118e..422478f 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -35,22 +35,22 @@
     inputs.self.homeManagerModules.default
     inputs.nur.hmModules.nur
 
+    ./applications/atuin
+    ./applications/bat
+    ./applications/eza
+    ./applications/fastfetch
     ./applications/git
     ./applications/gpg
-    ./applications/starship
-    ./applications/eza
     ./applications/skim
-    ./applications/bat
-    ./applications/zoxide
-    ./applications/ripgrep
-    ./applications/wget
-    ./applications/fd
-    ./applications/atuin
-    ./applications/zellij
-    ./applications/fastfetch
+    ./applications/starship
     ./applications/tealdeer
+    ./applications/zellij
   ];
 
+  programs.ripgrep.enable = true;
+  programs.zoxide.enable = true;
+  home.packages = with pkgs; [fd] ++ lib.optionals pkgs.stdenv.hostPlatform.isLinux (with pkgs; [trashy]);
+
   home.shellAliases = {
     ".." = "cd ..";
     "farsee" = "curl -F 'c=@-' 'https://fars.ee/'"; # pb
diff --git a/hosts/aristotle/default.nix b/hosts/aristotle/default.nix
index 32c83a9..39d5156 100644
--- a/hosts/aristotle/default.nix
+++ b/hosts/aristotle/default.nix
@@ -27,18 +27,17 @@
   home-manager.users.guanranwang = {
     imports = map (n: ../../home/applications/${n}) [
       "spotify/spicetify.nix"
-      "amberol"
-      "mousai"
       "thunderbird"
       "telegram-desktop"
-      "hyperfine"
       "ydict"
-      "android-tools"
     ];
 
     home.packages = with pkgs; [
+      amberol
       fractal
       gnome.gnome-calculator
+      hyperfine
+      mousai
     ];
 
     programs.obs-studio.enable = true;
diff --git a/nixos/profiles/common/core/default.nix b/nixos/profiles/common/core/default.nix
index c751f35..f0d951e 100644
--- a/nixos/profiles/common/core/default.nix
+++ b/nixos/profiles/common/core/default.nix
@@ -28,7 +28,7 @@
   ];
 
   ### home-manager
-  home-manager.users.guanranwang = import ./home;
+  home-manager.users.guanranwang = import ../../../../home;
 
   users.mutableUsers = false;
   home-manager = {
diff --git a/nixos/profiles/common/core/home/default.nix b/nixos/profiles/common/core/home/default.nix
deleted file mode 100644
index 91af935..0000000
--- a/nixos/profiles/common/core/home/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{...}: {
-  imports = [
-    ../../../../../home
-    ../../../../../home/applications/trashy
-  ];
-}
diff --git a/nixos/profiles/common/opt-in/gaming/home/default.nix b/nixos/profiles/common/opt-in/gaming/home/default.nix
index eca11ab..06504bb 100644
--- a/nixos/profiles/common/opt-in/gaming/home/default.nix
+++ b/nixos/profiles/common/opt-in/gaming/home/default.nix
@@ -1,12 +1,23 @@
-{...}: {
-  imports = map (n: ../../../../../../home/applications/${n}) [
-    "steam"
-    "prismlauncher"
-    "osu-lazer"
-    #"osu-stable"
-    "mangohud"
+{
+  pkgs,
+  inputs,
+  ...
+}: let
+  gamePkgs = inputs.nix-gaming.packages.${pkgs.stdenv.hostPlatform.system};
+in {
+  programs.mangohud.enable = true;
 
-    # VOIP
-    "mumble"
-  ];
+  home.packages = with pkgs;
+    [
+      (prismlauncher.override {glfw = glfw-wayland-minecraft;})
+      mumble
+      steam
+      # (pkgs.steam.override {extraProfile = "export STEAM_EXTRA_COMPAT_TOOLS_PATHS='${gamePkgs.proton-ge}'";})
+      # lunar-client
+      # protonup-qt
+    ]
+    ++ (with gamePkgs; [
+      osu-lazer-bin
+      # (osu-stable.override {location = "${config.xdg.dataHome}/osu-stable";})
+    ]);
 }