diff --git a/nix/home.nix b/nix/home.nix
index 553bd26..d2596a2 100644
--- a/nix/home.nix
+++ b/nix/home.nix
@@ -4,18 +4,7 @@ let
   secrets = import ./secrets.nix;
 in
 {
-  imports = [
-    ./wm/xmonad
-    ./shell/zsh.nix
-    ./progs/git.nix
-    ./progs/pass.nix
-    ./progs/himalaya.nix
-    ./progs/nvim
-    ./progs/vifm
-    ./progs/exa.nix
-    ./progs/zoxide.nix
-    ./progs/hledger.nix
-  ];
+  imports = (import ./wm) ++ (import ./shell) ++ (import ./progs);
 
   targets.genericLinux.enable = true;
 
@@ -34,6 +23,10 @@ in
   home.packages = with pkgs; [
     # TODO: move packages to separate modules
 
+    any-nix-shell   # fish and zsh support fo nix-shell
+    asciinema       # record the terminal
+    neofetch        # command-line system information
+
     # tools
     xh              # friendly and fast tool for sending HTTP requests
     fd              # a simple, fast and user-friendly alternative to find
diff --git a/nix/progs/default.nix b/nix/progs/default.nix
new file mode 100644
index 0000000..3c187bd
--- /dev/null
+++ b/nix/progs/default.nix
@@ -0,0 +1,10 @@
+[
+    ./git.nix
+    ./pass.nix
+    ./himalaya.nix
+    ./nvim
+    ./vifm
+    ./exa.nix
+    ./zoxide.nix
+    ./hledger.nix
+]
diff --git a/nix/shell/default.nix b/nix/shell/default.nix
new file mode 100644
index 0000000..a317de9
--- /dev/null
+++ b/nix/shell/default.nix
@@ -0,0 +1,3 @@
+[
+  ./zsh.nix
+]
diff --git a/nix/wm/default.nix b/nix/wm/default.nix
new file mode 100644
index 0000000..ce6e841
--- /dev/null
+++ b/nix/wm/default.nix
@@ -0,0 +1,3 @@
+[
+  ./xmonad
+]