diff --git a/home/adam/home.nix b/home/adam/home.nix
index b6aa37c8..c3a158ab 100644
--- a/home/adam/home.nix
+++ b/home/adam/home.nix
@@ -10,7 +10,7 @@
   # You can import other home-manager modules here
   imports = [
     ../core/adam.nix
-    ../extra
+    ../extra/adam.nix
   ];
 
   nixpkgs = {
diff --git a/home/cnst/home.nix b/home/cnst/home.nix
index 5ad4a009..1d34eed7 100644
--- a/home/cnst/home.nix
+++ b/home/cnst/home.nix
@@ -10,7 +10,7 @@
   # You can import other home-manager modules here
   imports = [
     ../core/cnst.nix
-    ../extra
+    ../extra/cnst.nix
   ];
 
   nixpkgs = {
diff --git a/home/extra/cnst.nix b/home/extra/cnst.nix
new file mode 100644
index 00000000..148bc144
--- /dev/null
+++ b/home/extra/cnst.nix
@@ -0,0 +1,42 @@
+{pkgs, ...}: {
+  imports = [
+    ./zellij
+    ./firefox
+    ./neovim
+  ];
+  home.packages = with pkgs; [
+    # APPLICATIONS
+    alacritty
+    keepassxc
+    qbittorrent
+    ranger
+    webcord
+    calcurse
+    xfce.thunar
+
+    # UTILITY
+    wl-clipboard
+    xfce.thunar-volman
+    xfce.thunar-archive-plugin
+    gnome.file-roller
+    pamixer
+    pwvucontrol
+    virt-manager
+    fastfetch
+    waybar
+    nwg-look
+    thefuck
+    gnome.adwaita-icon-theme
+
+    # NETWORK
+    wireguard-tools
+    networkmanagerapplet
+    wpa_supplicant
+
+    # SYSTEM
+    kdePackages.polkit-kde-agent-1
+    ntfs3g
+    btop
+    htop
+  ];
+}
diff --git a/home/extra/default.nix b/home/extra/default.nix
deleted file mode 100644
index 8e1662f5..00000000
--- a/home/extra/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  home-manager = {
-    cnst.imports = [
-      ./firefox
-      ./neovim
-      ./zellij
-      ./cnst-pkgs
-    ];
-    adam.imports = [
-      ./firefox
-      ./neovim
-      ./zellij
-      ./adam-pkgs
-    ];
-  };
-}