diff --git a/home/laptop/home.nix b/home/laptop/home.nix
index 2e7a169..c8b7fe0 100644
--- a/home/laptop/home.nix
+++ b/home/laptop/home.nix
@@ -1,5 +1,9 @@
 { pkgs, lib, ... }: {
+
   imports = [ ./programs ./packages ];
+
+  programs.home-manager = { enable = true; };
+
   home = {
     username = "ivand";
     homeDirectory = "/home/ivand";
@@ -19,7 +23,6 @@
       };
     };
   };
-  programs.home-manager = { enable = true; };
 
   wayland = {
     windowManager.sway = {
diff --git a/home/laptop/packages/default.nix b/home/laptop/packages/default.nix
index a74c22b..4cd6858 100644
--- a/home/laptop/packages/default.nix
+++ b/home/laptop/packages/default.nix
@@ -9,5 +9,31 @@
     nixfmt
     sqlite
     ripgrep
+    xdg-user-dirs
+    wl-clipboard
+    wayland
+    tectonic
+    slurp
+    pinentry-qt
+    mupdf
+    mako
+    grim
+    gnome.cheese
+    gimp
+    firefox-devedition-bin
+    ffmpeg
+    nodePackages_latest.pnpm
+    rustup
+    lolcat
+    deno
+    nodejs_20
+    python311
+    python311Packages.pip
+    piper
+    poetry
+    thunderbird
+    tor-browser-bundle-bin
+    ungoogled-chromium
+    xdg-utils
   ];
 }
diff --git a/sys/laptop/configuration.nix b/sys/laptop/configuration.nix
index 46cb96b..4681412 100644
--- a/sys/laptop/configuration.nix
+++ b/sys/laptop/configuration.nix
@@ -57,57 +57,23 @@
       busybox
       cmatrix
       coreutils-full
-      deno
       fd
-      ffmpeg
-      firefox-devedition-bin
-      gimp
       git
       glibc
-      glxinfo
-      gnome.cheese
       gnumake
-      grim
       home-manager
-      jmtpfs
       jq
       libgccjit
-      libmtp
-      lolcat
-      mako
       mlocate
-      mupdf
-      nodePackages_latest.pnpm
-      nodejs_20
-      pinentry-qt
-      piper
-      poetry
-      python311
-      python311Packages.pip
-      rustup
-      slurp
       tealdeer
-      tectonic
-      thunderbird
-      tor-browser-bundle-bin
-      ungoogled-chromium
       unzip
       vim
-      vimPlugins.nvchad
-      viu
-      wayland
-      wdisplays
       wget
-      wl-clipboard
-      xdg-user-dirs
-      xdg-utils
-      zbar
       zip
     ];
     variables = {
       EDITOR = "nvim";
       PNPM_HOME = "$HOME/.local/share/pnpm";
-      QT_QPA_PLATFORM = "wayland";
     };
     shells = with pkgs; [ zsh ];
     etc = {