diff --git a/home/default.nix b/home/default.nix
index 877d5f7..a75b69f 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -1,12 +1,16 @@
 { system, pkgs, home-manager, modules, ... }:
-with modules.home;
+let
+  ivand-programs = with modules.home.programs; [ nvim zsh tmux git chromium kitty lf obs-studio sway swaylock browserpass ];
+  ivand-packages = with modules.home.packages; [ dev essential media ];
+  vid-programs = with modules.home.programs; [ nvim zsh tmux ];
+in
 {
   ivand = home-manager.lib.homeManagerConfiguration {
     inherit pkgs;
-    modules = with programs; [ ./ivand packages nvim zsh tmux git chromium kitty lf obs-studio sway swaylock browserpass ];
+    modules = [ ./ivand ] ++ ivand-programs ++ ivand-packages;
   };
   vid = home-manager.lib.homeManagerConfiguration {
     inherit pkgs;
-    modules = with programs; [ ./vid nvim zsh tmux ];
+    modules = [ ./vid ] ++ vid-programs;
   };
 }
diff --git a/modules/home/packages/default.nix b/modules/home/packages/default.nix
index ac1593a..d5fa37d 100644
--- a/modules/home/packages/default.nix
+++ b/modules/home/packages/default.nix
@@ -1,47 +1,5 @@
 { pkgs, ... }: {
-  home.packages = with pkgs; [
-    scripts
-    # wayland/sway stuff
-    bemenu
-    wl-clipboard
-    wayland
-    xwayland
-    mako
-    grim
-    slurp
-    # programs
-    brave
-    firefox-devedition-bin
-    tor-browser-bundle-bin
-    libreoffice-qt
-    gimp
-    mpv
-    imv
-    gnome.cheese
-    pavucontrol
-    fluent-reader
-    libsForQt5.kdenlive
-    glaxnimate
-    # cli utils
-    ripgrep
-    bat
-    bottom
-    procs
-    lolcat
-    shell_gpt
-    mupdf
-    gopass
-    transmission
-    yewtube
-    ffmpeg
-    # AI
-    ollama
-    # misc
-    piper
-    xdg-utils
-    xdg-user-dirs
-    woeusb
-    # games
-    minetest
-  ];
+  dev = import ./dev { inherit pkgs; };
+  essential = import ./essential { inherit pkgs; };
+  media = import ./media { inherit pkgs; };
 }
diff --git a/modules/home/packages/dev/default.nix b/modules/home/packages/dev/default.nix
new file mode 100644
index 0000000..e841d81
--- /dev/null
+++ b/modules/home/packages/dev/default.nix
@@ -0,0 +1,9 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    tor-browser-bundle-bin
+    firefox-devedition-bin
+    shell_gpt
+    woeusb
+    ollama
+  ];
+}
diff --git a/modules/home/packages/essential/default.nix b/modules/home/packages/essential/default.nix
new file mode 100644
index 0000000..379d185
--- /dev/null
+++ b/modules/home/packages/essential/default.nix
@@ -0,0 +1,24 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    scripts
+    bemenu
+    wl-clipboard
+    wayland
+    xwayland
+    mako
+    grim
+    slurp
+    brave
+    mpv
+    imv
+    ripgrep
+    bat
+    bottom
+    procs
+    mupdf
+    gopass
+    ffmpeg
+    xdg-utils
+    xdg-user-dirs
+  ];
+}
diff --git a/modules/home/packages/media/default.nix b/modules/home/packages/media/default.nix
new file mode 100644
index 0000000..7207217
--- /dev/null
+++ b/modules/home/packages/media/default.nix
@@ -0,0 +1,12 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    gimp
+    gnome.cheese
+    pavucontrol
+    fluent-reader
+    libsForQt5.kdenlive
+    glaxnimate
+    transmission
+    yewtube
+  ];
+}