Remove with antipatter and aggregate google-chrome override

hm_modules/__basic.nix

@@ -1,23 +1,11 @@
 { pkgs, ... }: {
   home = {
     language.base = "it_IT.UTF-8";
-    packages = with pkgs; [
-      fd
-      file
-      htop
-      lf
-      mmv-go
-      neofetch
-      nixos-option
-      pv
-      ripgrep
-      unrar
-      unzip
-      wget
-      xclip
-      yq
-      zip
-    ];
+    packages = builtins.attrValues {
+      inherit (pkgs)
+        fd file htop lf mmv-go neofetch nixos-option pv ripgrep unrar unzip wget
+        xclip yq zip;
+    };
   };
 
   imports = [

hm_modules/biblio.nix

@@ -1 +1,3 @@
-{ pkgs, ... }: { home.packages = with pkgs; [ calibre mangal ]; }
+{ pkgs, ... }: {
+  home.packages = builtins.attrValues { inherit (pkgs) calibre mangal; };
+}

hm_modules/blender.nix

@@ -1 +1 @@
-{ pkgs, ... }: { home.packages = with pkgs; [ blender ]; }
+{ pkgs, ... }: { home.packages = [ pkgs.blender ]; }

hm_modules/blender_nvidia.nix

@@ -1,4 +1,4 @@
 { pkgs, ... }: {
-  home.packages = with pkgs; [ (blender.override { cudaSupport = true; }) ];
+  home.packages = [ (pkgs.blender.override { cudaSupport = true; }) ];
 }
 

hm_modules/bottom.nix

@@ -1,7 +1,7 @@
 { pkgs, ... }:
 let tomlGenerate = (pkgs.formats.toml { }).generate "bottom-toml";
 in {
-  home.packages = with pkgs; [ bottom ];
+  home.packages = [ pkgs.bottom ];
   xdg.configFile."bottom/bottom.toml".source = tomlGenerate {
     "flags" = {
       "left_legend" = true;

hm_modules/bspwm.nix

@@ -43,5 +43,5 @@ in {
     network-manager-applet.enable = true;
     blueman-applet.enable = true;
   };
-  home.packages = with pkgs; [ blueman ];
+  home.packages = [ pkgs.blueman ];
 }

hm_modules/development/cpp.nix

@@ -1,12 +1,8 @@
 { pkgs, config, lib, ... }: {
-  home.packages = with pkgs;
-    [
-
-    ] ++ lib.optionals config.programs.helix.enable [
-      clang-tools # C, CPP
-      cmake-language-server # CMAKE
-    ] ++ lib.optionals config.programs.kakoune.enable [
-      clang-tools # C, CPP
-      cmake-language-server # CMAKE
-    ];
+  home.packages =
+    lib.optionals config.programs.helix.enable builtins.attrValues {
+      inherit (pkgs) clang-tools cmake-language-server;
+    } ++ lib.optionals config.programs.kakoune.enable builtins.attrValues {
+      inherit (pkgs) clang-tools cmake-language-server;
+    };
 }

hm_modules/development/data.nix

@@ -1,11 +1,10 @@
 { config, pkgs, lib, ... }: {
-  home.packages = with pkgs;
-    lib.optionals config.programs.helix.enable [
-      nodePackages.vscode-langservers-extracted # CSS, HTML, JSON, SCSS
-      yaml-language-server # YAML
-      taplo-cli # TOML
-    ] ++ lib.optionals config.programs.kakoune.enable [
-      nodePackages.vscode-langservers-extracted # CSS, HTML, JSON, SCSS
-      yaml-language-server # YAML
-    ];
+  home.packages =
+    lib.optionals config.programs.helix.enable builtins.attrValues {
+      inherit (pkgs) yaml-language-server taplo-cli;
+      inherit (pkgs.nodePackages) vscode-langservers-extracted;
+    } ++ lib.optionals config.programs.kakoune.enable builtins.attrValues {
+      inherit (pkgs) yaml-language-server;
+      inherit (pkgs.nodePackages) vscode-langservers-extracted;
+    };
 }

hm_modules/development/docker.nix

@@ -1,8 +1,9 @@
 { pkgs, config, lib, ... }: {
-  home.packages = with pkgs;
-    [ docker-compose docker-machine ]
-    ++ lib.optionals config.programs.helix.enable
-    [ nodePackages.dockerfile-language-server-nodejs ];
+  home.packages =
+    builtins.attrValues { inherit (pkgs) docker-compose docker-machine; }
+    ++ lib.optionals config.programs.helix.enable builtins.attrValues {
+      inherit (pkgs.nodePackages) dockerfile-language-server-nodejs;
+    };
   home.shellAliases = {
     "dkcd" = "docker-compose down";
     "dkc" = "docker-compose";

hm_modules/development/go.nix

@@ -4,7 +4,6 @@
     goPath = ".go";
   };
 
-  home.packages = with pkgs;
-    lib.optionals config.programs.helix.enable [ gopls ]
-    ++ (lib.optionals config.programs.kakoune.enable [ gopls ]);
+  home.packages = lib.optionals config.programs.helix.enable [ pkgs.gopls ]
+    ++ (lib.optionals config.programs.kakoune.enable [ pkgs.gopls ]);
 }

hm_modules/development/javascript.nix

@@ -1,11 +1,10 @@
 { pkgs, lib, config, ... }: {
-  home.packages = with pkgs;
-    [
-
-    ] ++ lib.optionals config.programs.helix.enable
-    [ nodePackages.typescript-language-server ]
-    ++ lib.optionals config.programs.kakoune.enable
-    [ nodePackages.typescript-language-server ];
+  home.packages =
+    lib.optionals config.programs.helix.enable builtins.attrValues {
+      inherit (pkgs.nodePackages) typescript-language-server;
+    } ++ lib.optionals config.programs.kakoune.enable builtins.attrValues {
+      inherit (pkgs.nodePackages) typescript-language-server;
+    };
   programs.neovim.withNodeJs = true;
 }
 

hm_modules/development/kubernetes.nix

@@ -1 +1,4 @@
-{ pkgs, ... }: { home.packages = with pkgs; [ kubectl kubernetes-helm lens ]; }
+{ pkgs, ... }: {
+  home.packages =
+    builtins.attrValues { inherit (pkgs) kubectl kubernetes-helm lens; };
+}

hm_modules/development/latex.nix

@@ -1,13 +1,8 @@
 { pkgs, config, lib, ... }: {
-  home.packages = with pkgs;
-    [ bibtool texlive.combined.scheme-medium ]
-    ++ lib.optionals config.programs.helix.enable [ texlab ]
-    ++ lib.optionals config.programs.kakoune.enable [
-      texlab
-      aspell
-      aspellDicts.en
-      aspellDicts.en-computers
-      aspellDicts.en-science
-      aspellDicts.it
-    ];
+  home.packages = [ pkgs.bibtool pkgs.texlive.combined.scheme-medium ]
+    ++ lib.optionals config.programs.helix.enable [ pkgs.texlab ]
+    ++ lib.optionals config.programs.kakoune.enable (builtins.attrValues {
+      inherit (pkgs) texlab aspell;
+      inherit (pkgs.aspellDicts) en en-computers en-science it;
+    });
 }

hm_modules/development/nix.nix

@@ -1,7 +1,7 @@
 { pkgs, config, lib, ... }: {
-  home.packages = with pkgs;
-    [ nixpkgs-fmt nixfmt nix-prefetch-scripts nix-review nix-tree ]
-    ++ lib.optionals config.programs.helix.enable [ nil ]
-    ++ lib.optionals config.programs.kakoune.enable [ rnix-lsp ];
-  programs.neovim.plugins = with pkgs.vimPlugins; [ vim-nix ];
+  home.packages = builtins.attrValues {
+    inherit (pkgs) nixpkgs-fmt nixfmt nix-prefetch-scripts nix-review nix-tree;
+  } ++ lib.optionals config.programs.helix.enable [ pkgs.nil ]
+    ++ lib.optionals config.programs.kakoune.enable [ pkgs.rnix-lsp ];
+  programs.neovim.plugins = [ pkgs.vimPlugins.vim-nix ];
 }

hm_modules/development/pycharm.nix

@@ -1,7 +1,7 @@
 { pkgs, ... }: {
-  home.packages = with pkgs; [
-    jetbrains.pycharm-professional
-    python3
+  home.packages = {
+    inherit (pkgs) python3;
+    inherit (pkgs.jetbrains) pycharm-professional;
     # pypy3
-  ];
+  };
 }

hm_modules/development/python.nix

@@ -1,17 +1,9 @@
 { pkgs, lib, config, ... }: {
-  home.packages = with pkgs;
-    [ black ] ++ lib.optionals config.programs.helix.enable [
-      python3Packages.python-lsp-server # PYLSP
-      # python3Packages.pyls-mypy # MYPY # NOT UPDATED
-      python3Packages.pyls-flake8 # FLAKE8
-      # python3Packages.pyls-black # BLACK # NOT UPDATED
-      python3Packages.pyls-isort # ISORT
-    ] ++ lib.optionals config.programs.kakoune.enable [
-      python3Packages.python-lsp-server # PYLSP
-      # python3Packages.pyls-mypy # MYPY # NOT UPDATED
-      python3Packages.pyls-flake8 # FLAKE8
-      # python3Packages.pyls-black # BLACK # NOT UPDATED
-      python3Packages.pyls-isort # ISORT
-    ];
+  home.packages = [ pkgs.black ]
+    ++ lib.optionals config.programs.helix.enable builtins.attrValues {
+      inherit (pkgs.python3Packages) python-lsp-server pyls-flake8 pyls-isort;
+    } ++ lib.optionals config.programs.kakoune.enable builtins.attrValues {
+      inherit (pkgs.python3Packages) python-lsp-server pyls-flake8 pyls-isort;
+    };
   programs.neovim.withPython3 = true;
 }

hm_modules/development/rust.nix

@@ -1,35 +1,19 @@
 { pkgs, lib, config, ... }: {
-  home.packages = with pkgs;
-    [
-      bacon
-      cargo
-      # cargo-about
-      cargo-audit
-      # cargo-auditable
-      cargo-criterion
-      cargo-deadlinks
-      # cargo-deny
-      # cargo-deps
-      cargo-expand
-      # cargo-feature
-      cargo-flamegraph
-      cargo-fuzz
-      cargo-hack
-      cargo-hakari
-      cargo-inspect
-      cargo-modules
-      cargo-outdated
-      cargo-profiler
-      cargo-release
-      cargo-show-asm
-      cargo-spellcheck
-      cargo-tarpaulin
-      cargo-udeps
-      cargo-watch
-      cargo-workspaces
-      clippy
-      rustc
-      rustfmt
-    ] ++ lib.optionals config.programs.helix.enable [ lldb rust-analyzer ]
-    ++ lib.optionals config.programs.kakoune.enable [ rust-analyzer ];
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      bacon cargo cargo-audit cargo-criterion cargo-deadlinks cargo-expand
+      cargo-flamegraph cargo-fuzz cargo-hack cargo-hakari cargo-inspect
+      cargo-modules cargo-outdated cargo-profiler cargo-release cargo-show-asm
+      cargo-spellcheck cargo-tarpaulin cargo-udeps cargo-watch cargo-workspaces
+      clippy rustc rustfmt;
+    # cargo-about
+    # cargo-auditable
+    # cargo-deny
+    # cargo-deps
+    # cargo-feature
+
+  } ++ lib.optionals config.programs.helix.enable
+    (builtins.attrValues { inherit (pkgs) lldb rust-analyzer; })
+    ++ lib.optionals config.programs.kakoune.enable
+    (builtins.attrValues { inherit (pkgs) rust-analyzer; });
 }

hm_modules/dunst.nix

@@ -2,7 +2,10 @@
 with pkgs.lib.nix-rice;
 let strPalette = palette.toRGBHex pkgs.rice.colorPalette;
 in {
-  home.packages = with pkgs; [ dunst rice.font.normal.package ];
+  home.packages = builtins.attrValues {
+    inherit (pkgs) dunst;
+    inherit (pkgs.rice.font.normal) package;
+  };
   services.dunst = {
     enable = true;
     iconTheme = {

hm_modules/fonts.nix

@@ -1,12 +1,9 @@
 { pkgs, ... }: {
   fonts.fontconfig = { enable = true; };
-  home.packages = with pkgs; [
-    dejavu_fonts
-    noto-fonts
-    noto-fonts-extra
-    noto-fonts-cjk-sans
-    font-awesome
-    corefonts # Microsoft fonts
-    vistafonts
-  ];
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      dejavu_fonts noto-fonts noto-fonts-extra noto-fonts-cjk-sans font-awesome
+      corefonts # Microsoft fonts
+      vistafonts;
+  };
 }

hm_modules/git.nix

@@ -118,5 +118,6 @@ in {
   };
   programs.bash.shellAliases = shellAliases;
   programs.zsh.shellAliases = shellAliases;
-  home.packages = with pkgs; [ gh git-secret glab meld ];
+  home.packages =
+    builtins.attrValues { inherit (pkgs) gh git-secret glab meld; };
 }

hm_modules/helix.nix

@@ -33,10 +33,10 @@ in {
     EDITOR = "hx";
     VISUAL = "hx";
   };
-  home.packages = with pkgs; [
-    nil # Nix language server
-    desktopItem
-  ];
+  home.packages = builtins.attrValues {
+    inherit (pkgs) nil; # Nix language server
+    inherit desktopItem;
+  };
   programs.helix = {
     enable = true;
     package = pkgs.unstable_pkgs.helix;

hm_modules/kakoune.nix

@@ -30,36 +30,36 @@ let
       set-face global BufferPadding default,default
     '';
 
-  packages = with pkgs; [
-    editorconfig-core-c
-
-    (pkgs.makeDesktopItem {
-      name = "Kakoune";
-      exec = "kak %F";
-      icon = "kakoune";
-      desktopName = "Kakoune";
-      comment = "Kakoune text editor";
-      terminal = true;
-      categories = [ "Development" ];
-      mimeTypes = [
-        "text/english"
-        "text/plain"
-        "text/x-makefile"
-        "text/x-c++hdr"
-        "text/x-c++src"
-        "text/x-chdr"
-        "text/x-csrc"
-        "text/x-java"
-        "text/x-moc"
-        "text/x-pascal"
-        "text/x-tcl"
-        "text/x-tex"
-        "application/x-shellscript"
-        "text/x-c"
-        "text/x-c++"
-      ];
-    })
-  ];
+  desktopItem = pkgs.makeDesktopItem {
+    name = "Kakoune";
+    exec = "kak %F";
+    icon = "kakoune";
+    desktopName = "Kakoune";
+    comment = "Kakoune text editor";
+    terminal = true;
+    categories = [ "Development" ];
+    mimeTypes = [
+      "text/english"
+      "text/plain"
+      "text/x-makefile"
+      "text/x-c++hdr"
+      "text/x-c++src"
+      "text/x-chdr"
+      "text/x-csrc"
+      "text/x-java"
+      "text/x-moc"
+      "text/x-pascal"
+      "text/x-tcl"
+      "text/x-tex"
+      "application/x-shellscript"
+      "text/x-c"
+      "text/x-c++"
+    ];
+  };
+  packages = builtins.attrValues {
+    inherit (pkgs) editorconfig-core-c;
+    inherit desktopItem;
+  };
 
 in {
   programs.bash.shellAliases = { k = "kak"; };

hm_modules/kicad.nix

@@ -1 +1 @@
-{ pkgs, ... }: { home.packages = with pkgs; [ kicad ]; }
+{ pkgs, ... }: { home.packages = [ pkgs.kicad ]; }

hm_modules/nautilus.nix

@@ -1 +1 @@
-{ pkgs, ... }: { home.packages = with pkgs; [ gnome.nautilus ]; }
+{ pkgs, ... }: { home.packages = [ pkgs.gnome.nautilus ]; }

hm_modules/office.nix

@@ -1,10 +1,6 @@
 { pkgs, ... }: {
-  home.packages = with pkgs; [
-    libreoffice-fresh
-    # onlyoffice-bin
-    hunspellDicts.en_GB-large
-    hunspellDicts.en_US-large
-    hunspellDicts.it_IT
-    hunspell.bin
-  ];
+  home.packages = builtins.attrValues {
+    inherit (pkgs) hunspell libreoffice-fresh;
+    inherit (pkgs.hunspellDicts) en_GB-large en_US-large it_IT;
+  };
 }

hm_modules/polybar.nix

@@ -110,15 +110,13 @@ let
 
   ramp = [ "▂" "▃" "▄" "▅" "▆" "▇" ];
 in {
-  home.packages = with pkgs; [
-    pkgs.rice.font.monospace.package
+  home.packages = builtins.attrValues {
+    inherit (pkgs) noto-fonts material-design-icons noto-fonts-cjk-sans;
     # emojione
     # noto-fonts-emoji
-    noto-fonts
-    material-design-icons
     # font-awesome
-    noto-fonts-cjk-sans
-  ];
+    inherit (pkgs.rice.font.monospace) package;
+  };
   services.polybar = {
     enable = true;
     package = pkgs.polybarFull;

hm_modules/pro_audio.nix

@@ -14,38 +14,25 @@ let
     VST3_PATH = "$HOME/.vst3:${userLibFolder}/vst3:${systemLibFolder}/vst3";
   };
 in {
-  home.packages = with pkgs; [
-    carla
-    rnnoise
-    ardour
-    # zrythm
-    breeze-icons
-    mixxx
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      carla rnnoise ardour
+      # zrythm
+      breeze-icons mixxx
 
-    # Plugins
-    artyFX
-    autotalent
-    boops
-    cardinal
-    geonkick
-    # helm
-    lsp-plugins
-    # noise-repellent
-    samplv1
-    # speech-denoiser
-    # stochas
-    # sunvox
-    surge
-    giada
-    surge-XT
-    talentedhack
-    # tunefish
-    vocproc
-    x42-plugins
-    zita-at1
-    zynaddsubfx
-    zyn-fusion
-  ];
+      # Plugins
+      artyFX autotalent boops cardinal geonkick
+      # helm
+      lsp-plugins
+      # noise-repellent
+      samplv1
+      # speech-denoiser
+      # stochas
+      # sunvox
+      surge giada surge-XT talentedhack
+      # tunefish
+      vocproc x42-plugins zita-at1 zynaddsubfx zyn-fusion;
+  };
 
   home.sessionVariables = variables;
 }

hm_modules/research.nix

@@ -1,7 +1,8 @@
 { pkgs, ... }: {
-  home.packages = with pkgs;
-    [
-      # unstable.mendeley # Reference manager
-      unstable_pkgs.obsidian # Note manager
-    ];
+  home.packages = builtins.attrValues {
+    inherit (pkgs.unstable_pkgs)
+    # mendeley # Reference manager
+      obsidian # Note manager
+    ;
+  };
 }

hm_modules/rofi.nix

@@ -1,11 +1,8 @@
 { pkgs, ... }: {
 
-  home.packages = with pkgs; [
-    rofimoji
-    rofi-bluetooth
-    rofi-power-menu
-    rofi-vpn
-  ];
+  home.packages = builtins.attrValues {
+    inherit (pkgs) rofimoji rofi-bluetooth rofi-power-menu rofi-vpn;
+  };
 
   programs.rofi = {
     enable = true;
@@ -13,7 +10,7 @@
     font = "${pkgs.rice.font.monospace.name} ${
         toString pkgs.rice.font.monospace.size
       }";
-    plugins = with pkgs; [ rofi-calc ];
+    plugins = [ pkgs.rofi-calc ];
     extraConfig = { modi = "drun,run,ssh,window,calc"; };
     terminal = "kitty";
     theme = "onedark";

hm_modules/security.nix

@@ -1,20 +1,18 @@
 { pkgs, ... }: {
-  home.packages = with pkgs; [
-    # RECOGNITION
-    nmap
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      nmap # RECOGNITION
 
-    # WEB
-    # altair
-    # burpsuite
-    httpie
+      # WEB
+      httpie
+      # altair
+      # burpsuite
 
-    # REVERSING
-    bintools
-    ghidra-bin
-    radare2
-    # cutter
+      bintools ghidra-bin radare2 # REVERSING
+      # cutter
 
-    # INFRASTRUCTURE
-    # cocktail-bar-cli
-  ];
+      # INFRASTRUCTURE
+      # cocktail-bar-cli
+    ;
+  };
 }

hm_modules/sxhkd.nix

@@ -3,14 +3,11 @@
     # ./nautilus.nix
     # ./thunar.nix
   ];
-  home.packages = with pkgs; [
-    gnome.gnome-screenshot
-    lockscreen
-    terminator
-    bsp-layout
-    bc # required by bsp-layout
-    clipedit
-  ];
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+    # bc 
+      bsp-layout clipedit lockscreen terminator; # required by bsp-layout
+  };
   services.sxhkd = let
     primaryTerminal = "kitty";
     secondaryTerminal = "terminator";
@@ -41,7 +38,7 @@
     enable = true;
     keybindings = {
       "alt + Tab" = "rofi -show window";
-      "Print" = "gnome-screenshot";
+      "Print" = "${pkgs.gnome.gnome-screenshot}/bin/gnome-screenshot";
       "super + alt + {h,j,k,l}" =
         "bspc node -z {left -20 0,bottom 0 20,top 0 -20,right 20 0}";
       "super + alt + m" = "lockscreen";

hm_modules/terminator.nix

@@ -27,7 +27,7 @@ let
       bright.white
     ];
 in {
-  home.packages = with pkgs; [ terminator ];
+  home.packages = [ pkgs.terminator ];
 
   xdg.configFile."terminator/config".text = with strPalette; ''
     [global_config]

hm_modules/zsh.nix

@@ -1,5 +1,6 @@
 { pkgs, ... }: {
-  home.packages = with pkgs; [ nix-zsh-completions zsh-completions ];
+  home.packages =
+    builtins.attrValues { inherit (pkgs) nix-zsh-completions zsh-completions; };
 
   programs.zsh = {
     enable = true;