Completed centralized update

home.nix

@@ -2,9 +2,7 @@
 
 let
   callPackage = pkgs.lib.callPackageWith pkgs;
-  custom = import ./custom/default.nix {};
   nord = import ./configs/themes/nord.nix;
-  extra = callPackage ./extra/default.nix {};
 in
 {
   fonts.fontconfig = {
@@ -12,12 +10,13 @@ in
   };
 
   nixpkgs.overlays = [
-    (final: prev: { extra = (prev.lib.callPackageWith prev) ./extra/default.nix {}; })
+    (final: prev: { extra = (prev.lib.callPackageWith prev) ./extra/default.nix {}; }) # Custom library
+    (final: prev: (prev.lib.callPackageWith prev) ./custom/default.nix {}) # Custom packges
     (
       final: prev: {
         extra = prev.extra // {
           colorTheme = import ./configs/themes/nord.nix;
-          colorPalette = with extra; palette.palette {
+          colorPalette = with pkgs.extra; palette.palette {
             black = color.hexToRgba nord.n0;
             red = color.hexToRgba nord.n11;
             green = color.hexToRgba nord.n14;
@@ -40,7 +39,7 @@ in
     language.base = "it_IT.UTF-8";
     keyboard.layout = "it";
     keyboard.options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" ];
-    packages = (
+    packages =
       with pkgs; [
         audacity
         authy
@@ -49,6 +48,7 @@ in
         evolution
         firefox
         gallery-dl
+        gallery-tagger
         gnome3.dconf-editor
         gnome3.easytag
         gnome3.eog
@@ -65,7 +65,6 @@ in
         google-chrome
         htop
         jetbrains.datagrip
-        keepassxc
         krita
         libreoffice-fresh
         lutris
@@ -79,7 +78,6 @@ in
         pavucontrol
         pcmanfm
         pentablet-driver
-        # polybarFull
         procps-ng
         shotwell
         skypeforlinux
@@ -91,12 +89,7 @@ in
         wireguard
         zoom-us
         zotero
-      ]
-    ) ++ (
-      with custom; [
-        gallery-tagger
-      ]
-    );
+      ];
   };
 
   programs.zsh.enable = true;
@@ -120,6 +113,7 @@ in
     ./modules/info.nix
     ./modules/jq.nix
     ./modules/kakoune.nix
+    ./modules/keepassxc.nix
     ./modules/keychain.nix
     # ./modules/kitty.nix
     ./modules/lf.nix
@@ -161,8 +155,9 @@ in
     caffeine.enable = true;
     cbatticon.enable = true;
     gnome-keyring.enable = true;
-    playerctld.enable = true;
     network-manager-applet.enable = true;
+    playerctld.enable = true;
+    # poweralertd.enable = true;
   };
   xsession.numlock.enable = true;
 }