add restruct2

home/core/adam.nix

@@ -1,4 +1,3 @@
-{ pkgs, ... }:
 {
   imports = [
     ./git
@@ -6,31 +5,4 @@
     ./shell/adam.nix
     ./appearance
   ];
-  home.packages = with pkgs; [
-    # Desktop
-    alacritty
-    wl-clipboard
-    keepassxc
-    ranger
-    webcord
-    xfce.thunar
-    xfce.thunar-volman
-    xfce.thunar-archive-plugin
-    gnome.file-roller
-    wireguard-tools
-    wpa_supplicant
-    ntfs3g
-    kdePackages.polkit-kde-agent-1
-    networkmanagerapplet
-    htop
-    btop
-    pamixer
-    qbittorrent
-    fastfetch
-    waybar
-    nwg-look
-    thefuck
-    calcurse
-    gnome.adwaita-icon-theme
-  ];
 }

home/core/cnst.nix

@@ -1,4 +1,3 @@
-{ pkgs, ... }:
 {
   imports = [
     ./git
@@ -6,32 +5,4 @@
     ./shell/cnst.nix
     ./appearance
   ];
-  home.packages = with pkgs; [
-    # Desktop
-    alacritty
-    wl-clipboard
-    keepassxc
-    ranger
-    webcord
-    xfce.thunar
-    xfce.thunar-volman
-    xfce.thunar-archive-plugin
-    gnome.file-roller
-    wireguard-tools
-    wpa_supplicant
-    ntfs3g
-    kdePackages.polkit-kde-agent-1
-    networkmanagerapplet
-    htop
-    btop
-    pamixer
-    virt-manager
-    qbittorrent
-    fastfetch
-    waybar
-    nwg-look
-    thefuck
-    calcurse
-    gnome.adwaita-icon-theme
-  ];
 }

home/core/hypr/default.nix

@@ -5,7 +5,7 @@
   ...
 }:
 {
-  imports = [ ../mako ];
+  imports = [ ../../extra/mako ];
 
   xdg.portal =
     let