diff --git a/modules/home-editor.nix b/modules/home-editor.nix
new file mode 100644
index 0000000..704ba95
--- /dev/null
+++ b/modules/home-editor.nix
@@ -0,0 +1,7 @@
+{self, pkgs, ...}:
+
+{
+  home.packages = [
+    self.packages.${pkgs.stdenv.system}.nvf
+  ];
+}
diff --git a/modules/home-terminal.nix b/modules/home-terminal.nix
new file mode 100644
index 0000000..5096fe4
--- /dev/null
+++ b/modules/home-terminal.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+  home.packages = with pkgs; [
+    kitty # default terminal emulator for hyprland
+  ];
+}
diff --git a/users/rafiq/default.nix b/users/rafiq/default.nix
index d446985..f7d4923 100644
--- a/users/rafiq/default.nix
+++ b/users/rafiq/default.nix
@@ -2,10 +2,11 @@
 
 {
   imports = [
-    ../../modules/home-git.nix
-    ../../modules/home-tmux.nix
-    ../../modules/home-sh.nix
-    ../../modules/home-wm.nix
+    ../../modules/home-git.nix # git specific configs
+    ../../modules/home-tmux.nix # tmux specific configs (might move this)
+    ../../modules/home-sh.nix # bash and other shell specific configs
+    ../../modules/home-wm.nix # window manager configs
+    ../../modules/home-editor.nix # editor specific configs
   ];
 
   home = {
@@ -13,7 +14,6 @@
     homeDirectory = "/home/rafiq";
 
     packages = [
-      self.packages.${pkgs.stdenv.system}.nvf
       pkgs.kitty
       pkgs.fastfetch
       pkgs.wl-clipboard