diff --git a/home/cli/bat.nix b/home/cli/bat.nix
new file mode 100644
index 0000000..b91437c
--- /dev/null
+++ b/home/cli/bat.nix
@@ -0,0 +1,5 @@
+{pkgs, ...}: {
+  home.packages = with pkgs; [
+    bat
+  ];
+}
diff --git a/home/gui/anime/handbrake.nix b/home/gui/anime/handbrake.nix
new file mode 100644
index 0000000..f594804
--- /dev/null
+++ b/home/gui/anime/handbrake.nix
@@ -0,0 +1,5 @@
+{pkgs, ...}: {
+  home.packages = with pkgs; [
+    handbrake
+  ];
+}
diff --git a/home/gui/anime/tsukimi.nix b/home/gui/anime/tsukimi.nix
new file mode 100644
index 0000000..86dc327
--- /dev/null
+++ b/home/gui/anime/tsukimi.nix
@@ -0,0 +1,5 @@
+{pkgs, ...}: {
+  home.packages = with pkgs; [
+    tsukimi
+  ];
+}
diff --git a/home/wayland/pamixer.nix b/home/wayland/pamixer.nix
new file mode 100644
index 0000000..ca1d997
--- /dev/null
+++ b/home/wayland/pamixer.nix
@@ -0,0 +1,5 @@
+{pkgs, ...}: {
+  home.packages = with pkgs; [
+    pamixer
+  ];
+}
diff --git a/modules/system/environment.nix b/modules/system/environment.nix
index d9b952d..451a947 100644
--- a/modules/system/environment.nix
+++ b/modules/system/environment.nix
@@ -47,11 +47,13 @@ in {
       v4l-utils
 
       # Editor
+      nano
       neovim
 
       # Networking tool
-      curl
+      iperf3
       nexttrace
+      curl
       aria2
       yt-dlp
 
@@ -69,14 +71,11 @@ in {
       libnotify
       libvirt
       lm_sensors
+
+      # Dev
       gcc
       clang
       zig
-      nano
-      bat
-      pamixer
-      iperf3
-      handbrake
     ];
   };