use lib.concatLists

home-manager/gui.nix

@@ -21,25 +21,42 @@
 
   home.packages =
     with pkgs;
+    lib.concatLists [
+      # libreoffice
+      [
+        libreoffice
+        hunspell # spellcheck
+        hunspellDicts.en_US # spellcheck dictionary
+      ]
+
+      # browsers
+      [
+        tor-browser
+        inputs.zen-browser.packages."${system}".twilight
+      ]
+
+      # music library management
+      [
+        picard
+        puddletag
+        lrcget
+      ]
+
+      # image editing
+      [
+        darktable
+        rawtherapee
+        hugin
+
+        gimp3
+        pinta
+      ]
+
       [
         #calculator
         gnome-calculator
 
-      #productivity stuff
+        # audio editing
-      libreoffice
-      hunspell # spellcheck
-      hunspellDicts.en_US # spellcheck dictionary
-
-      #video and audio downloading
-      parabolic
-
-      #soulseek client
-      nicotine-plus
-
-      #dark web browsing deep web browsing
-      tor-browser
-
-      #audio editing
         audacity
 
         #fonts
@@ -53,7 +70,7 @@
         #audio mixer (pavucontrol but for pipewire)
         pwvucontrol
 
-      #minecraft launcher
+        # minecraft launcher
         prismlauncher
 
         mpv
@@ -66,7 +83,7 @@
 
         signal-desktop
 
-      #accounting
+        # accounting
         # gnucash
 
         # image tools
@@ -82,37 +99,17 @@
         libnotify # notifications library
         xdg-utils # xdg utils
 
-      # music tagging utility
-      picard
-
-      # music lyric fetcher
-      lrcget
-
-      inputs.zen-browser.packages."${system}".twilight
-
-      puddletag
-
         wireshark
 
-      darktable
+        nautilus
-      rawtherapee
-      hugin
-
-      # nufraw
         nufraw-thumbnailer
         gdk-pixbuf
-      nautilus
 
         enblend-enfuse
 
-      savvycan
-
         # simple screen recording on wayland
         wl-screenrec
 
-      gimp3
-      pinta
-
         # wayland-compatible color picker
         hyprpicker
 
@@ -131,7 +128,9 @@
 
         localsend
       ]
-    ++ (builtins.filter lib.isDerivation (builtins.attrValues nerd-fonts));
+      # all the fonts
+      (builtins.filter lib.isDerivation (builtins.attrValues nerd-fonts))
+    ];
 
   # programs.zed-editor = {
   #   enable = true;

home-manager/no-gui.nix

@@ -123,6 +123,7 @@ in
 
   home.packages =
     with pkgs;
+    lib.concatLists [
       [
         # python formatter
         ruff
@@ -202,10 +203,11 @@ in
 
         yt-dlp
       ]
-    ++ rust_pkgs
+      rust_pkgs
-    ++ lsps
+      lsps
-    ++ java_tools
+      java_tools
-    ++ common_tools;
+      common_tools
+    ];
 
   # https://github.com/flamegraph-rs/flamegraph
   home.file.".cargo/config.toml".text = ''