diff --git a/home/applications/sway/default.nix b/home/applications/sway/default.nix
index 72ac112..ba2f9b8 100644
--- a/home/applications/sway/default.nix
+++ b/home/applications/sway/default.nix
@@ -6,14 +6,6 @@
   ...
 }:
 {
-  imports = [
-    ../i3status-rust
-    ../kanshi
-    ../mako
-    ../swayidle
-    ../swaylock
-  ];
-
   home.packages = with pkgs; [
     wl-clipboard
     pwvucontrol
diff --git a/home/applications/swayidle/default.nix b/home/applications/swayidle/default.nix
index 3b7005d..66194bf 100644
--- a/home/applications/swayidle/default.nix
+++ b/home/applications/swayidle/default.nix
@@ -1,14 +1,9 @@
 {
-  pkgs,
   lib,
   config,
   ...
 }:
 {
-  imports = [
-    ../swaylock
-  ];
-
   services.swayidle = {
     enable = true;
     timeouts = [
diff --git a/home/default.nix b/home/default.nix
index b557533..b4651c8 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -1,4 +1,5 @@
 {
+  lib,
   pkgs,
   ...
 }:
@@ -6,49 +7,26 @@
   home = {
     username = "guanranwang";
     homeDirectory = "/home/guanranwang";
-    stateVersion = "23.05";
+    stateVersion = "24.05";
   };
 
-  imports =
-    [
-      ./theme.nix
-      ./xdg-mime.nix
-    ]
-    ++ map (n: ./applications/${n}) [
-      "atuin"
-      "bash"
-      "bat"
-      "eza"
-      "fcitx5"
-      "firefox"
-      "fish"
-      "foot"
-      "git"
-      "go"
-      "gpg"
-      "mpv"
-      "nautilus"
-      "neovim"
-      "nix"
-      "ssh"
-      "starship"
-      "sway"
-      "tealdeer"
-      "thunderbird"
-      "tmux"
-      "ydict"
-    ];
+  imports = [
+    ./theme.nix
+    ./xdg-mime.nix
+  ] ++ lib.filter (x: lib.hasSuffix "default.nix" x) (lib.fileset.toList ./applications);
 
-  programs.jq.enable = true;
-  programs.obs-studio.enable = true;
-  programs.ripgrep.enable = true;
-  programs.skim.enable = true;
-  programs.zoxide.enable = true;
+  programs = {
+    jq.enable = true;
+    obs-studio.enable = true;
+    ripgrep.enable = true;
+    skim.enable = true;
+    zoxide.enable = true;
+  };
 
   home.packages = with pkgs; [
+    dconf-editor
     fastfetch
     fd
-    dconf-editor
     file-roller
     fractal
     gnome-calculator
@@ -56,5 +34,4 @@
     loupe
     seahorse
   ];
-
 }