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

home/extra/adam.nix

@@ -4,7 +4,6 @@
     ./zellij
     ./firefox
     ./neovim
-    ./mako
   ];
   home.packages = with pkgs; [
     # Desktop

home/extra/cnst.nix

@@ -2,7 +2,6 @@
 {
   imports = [
     ./firefox
-    ./mako
     ./neovim
     ./zellij
   ];

home/extra/neovim/default.nix

@@ -1,7 +1,9 @@
-{ pkgs, inputs, ... }:
-with pkgs;
-let
-
+{
+  pkgs,
+  inputs,
+  ...
+}:
+with pkgs; let
   tools = [
     fswatch # File watcher utility, replacing libuv.fs_event for neovim 10.0
     fzf
@@ -50,15 +52,16 @@ let
   nix = [
     alejandra
     nixd
-    nixfmt-rfc-style
+    nil
     nixpkgs-fmt
     statix
   ];
 
   python = [
+    pyright
     black
     isort
-    python311Packages.jedi-language-server
+    python312Packages.jedi-language-server
     ruff
     ruff-lsp
   ];
@@ -79,6 +82,7 @@ let
     deno
     nodePackages.sql-formatter
     nodePackages.typescript-language-server
+    nodePackages.prettier
     nodejs
     prettierd # multi-language formatters
     vscode-langservers-extracted
@@ -87,9 +91,7 @@ let
 
   extraPackages =
     tools ++ c ++ gamedev ++ golang ++ lua ++ markup ++ nix ++ python ++ rust ++ shell ++ web;
-in
-
-{
+in {
   # for quick development
   home.packages = rust;
 
@@ -97,7 +99,7 @@ in
     enable = true;
     defaultEditor = true;
     package = inputs.neovim-nightly-overlay.packages.${pkgs.system}.default;
-    plugins = with pkgs.vimPlugins; [ telescope-cheat-nvim ];
+    plugins = with pkgs.vimPlugins; [telescope-cheat-nvim];
     inherit extraPackages;
   };
 }