From 54201f002bb47b483732d5b1f0ee2b669021ea4d Mon Sep 17 00:00:00 2001
From: Simon Gardling <titaniumtown@proton.me>
Date: Tue, 12 Aug 2025 01:57:55 -0700
Subject: [PATCH] use lib.concatLists

---
 home-manager/gui.nix    | 165 ++++++++++++++++++++--------------------
 home-manager/no-gui.nix | 116 ++++++++++++++--------------
 2 files changed, 141 insertions(+), 140 deletions(-)

diff --git a/home-manager/gui.nix b/home-manager/gui.nix
index 228a4c2..5860226 100644
--- a/home-manager/gui.nix
+++ b/home-manager/gui.nix
@@ -21,117 +21,116 @@
 
   home.packages =
     with pkgs;
-    [
-      #calculator
-      gnome-calculator
+    lib.concatLists [
+      # libreoffice
+      [
+        libreoffice
+        hunspell # spellcheck
+        hunspellDicts.en_US # spellcheck dictionary
+      ]
 
-      #productivity stuff
-      libreoffice
-      hunspell # spellcheck
-      hunspellDicts.en_US # spellcheck dictionary
+      # browsers
+      [
+        tor-browser
+        inputs.zen-browser.packages."${system}".twilight
+      ]
 
-      #video and audio downloading
-      parabolic
+      # music library management
+      [
+        picard
+        puddletag
+        lrcget
+      ]
 
-      #soulseek client
-      nicotine-plus
+      # image editing
+      [
+        darktable
+        rawtherapee
+        hugin
 
-      #dark web browsing deep web browsing
-      tor-browser
+        gimp3
+        pinta
+      ]
 
-      #audio editing
-      audacity
+      [
+        #calculator
+        gnome-calculator
 
-      #fonts
-      noto-fonts
-      noto-fonts-emoji
-      liberation_ttf
+        # audio editing
+        audacity
 
-      #for ebook reading
-      foliate
+        #fonts
+        noto-fonts
+        noto-fonts-emoji
+        liberation_ttf
 
-      #audio mixer (pavucontrol but for pipewire)
-      pwvucontrol
+        #for ebook reading
+        foliate
 
-      #minecraft launcher
-      prismlauncher
+        #audio mixer (pavucontrol but for pipewire)
+        pwvucontrol
 
-      mpv
-      mumble
-      system76-keyboard-configurator
+        # minecraft launcher
+        prismlauncher
 
-      #jellyfin
-      finamp # music player
-      delfin # jellyfin client
+        mpv
+        mumble
+        system76-keyboard-configurator
 
-      signal-desktop
+        #jellyfin
+        finamp # music player
+        delfin # jellyfin client
 
-      #accounting
-      # gnucash
+        signal-desktop
 
-      # image tools
-      inkscape
-      nomacs
+        # accounting
+        # gnucash
 
-      # partitioning utilities
-      gparted
-      gnome-disk-utility
+        # image tools
+        inkscape
+        nomacs
 
-      # small nicities
-      wl-clipboard # wl-copy & wl-paste
-      libnotify # notifications library
-      xdg-utils # xdg utils
+        # partitioning utilities
+        gparted
+        gnome-disk-utility
 
-      # music tagging utility
-      picard
+        # small nicities
+        wl-clipboard # wl-copy & wl-paste
+        libnotify # notifications library
+        xdg-utils # xdg utils
 
-      # music lyric fetcher
-      lrcget
+        wireshark
 
-      inputs.zen-browser.packages."${system}".twilight
+        nautilus
+        nufraw-thumbnailer
+        gdk-pixbuf
 
-      puddletag
+        enblend-enfuse
 
-      wireshark
+        # simple screen recording on wayland
+        wl-screenrec
 
-      darktable
-      rawtherapee
-      hugin
+        # wayland-compatible color picker
+        hyprpicker
 
-      # nufraw
-      nufraw-thumbnailer
-      gdk-pixbuf
-      nautilus
+        blender
 
-      enblend-enfuse
+        ghidra-bin
 
-      savvycan
+        # for mod organizer 2
+        zenity
+        p7zip
 
-      # simple screen recording on wayland
-      wl-screenrec
+        # password manager
+        keepassxc
 
-      gimp3
-      pinta
+        freecad-wayland
 
-      # wayland-compatible color picker
-      hyprpicker
-
-      blender
-
-      ghidra-bin
-
-      # for mod organizer 2
-      zenity
-      p7zip
-
-      # password manager
-      keepassxc
-
-      freecad-wayland
-
-      localsend
-    ]
-    ++ (builtins.filter lib.isDerivation (builtins.attrValues nerd-fonts));
+        localsend
+      ]
+      # all the fonts
+      (builtins.filter lib.isDerivation (builtins.attrValues nerd-fonts))
+    ];
 
   # programs.zed-editor = {
   #   enable = true;
diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix
index a01c71a..7b24d04 100644
--- a/home-manager/no-gui.nix
+++ b/home-manager/no-gui.nix
@@ -123,89 +123,91 @@ in
 
   home.packages =
     with pkgs;
-    [
-      # python formatter
-      ruff
+    lib.concatLists [
+      [
+        # python formatter
+        ruff
 
-      # for website generation
-      hugo
-      go
+        # for website generation
+        hugo
+        go
 
-      # for benchmaking stuff
-      hyperfine
+        # for benchmaking stuff
+        hyperfine
 
-      pfetch-rs
-      waypipe
+        pfetch-rs
+        waypipe
 
-      sshfs
+        sshfs
 
-      # nix formatter
-      nixfmt-rfc-style
+        # nix formatter
+        nixfmt-rfc-style
 
-      # serial viewer
-      minicom
+        # serial viewer
+        minicom
 
-      # "~~matt's~~ my trace route"
-      mtr
+        # "~~matt's~~ my trace route"
+        mtr
 
-      ffmpeg-full
+        ffmpeg-full
 
-      # microcontroller tooling
-      probe-rs
+        # microcontroller tooling
+        probe-rs
 
-      (python312.withPackages (
-        ps: with ps; [
-          mypy # type checking
+        (python312.withPackages (
+          ps: with ps; [
+            mypy # type checking
 
-          python-lsp-server # lsp
-          python-lsp-ruff # ruff integration
-          pyserial
+            python-lsp-server # lsp
+            python-lsp-ruff # ruff integration
+            pyserial
 
-          numpy
-          matplotlib
-          notebook
+            numpy
+            matplotlib
+            notebook
 
-          pandas
-        ]
-      ))
+            pandas
+          ]
+        ))
 
-      binwalk
+        binwalk
 
-      # clang-format and clang-tidy
-      clang-tools
-      clang
-      gdb
+        # clang-format and clang-tidy
+        clang-tools
+        clang
+        gdb
 
-      git-crypt
+        git-crypt
 
-      imagemagick
+        imagemagick
 
-      nixpkgs-review
+        nixpkgs-review
 
-      nmap
+        nmap
 
-      # terminal image viewer
-      timg
+        # terminal image viewer
+        timg
 
-      tcpdump
+        tcpdump
 
-      borgbackup
+        borgbackup
 
-      # used to deploy nix system to server
-      # (and in the future, desktop)
-      deploy-rs
+        # used to deploy nix system to server
+        # (and in the future, desktop)
+        deploy-rs
 
-      # power stuff
-      powerstat
+        # power stuff
+        powerstat
 
-      nodePackages_latest.nodejs
+        nodePackages_latest.nodejs
 
-      yt-dlp
-    ]
-    ++ rust_pkgs
-    ++ lsps
-    ++ java_tools
-    ++ common_tools;
+        yt-dlp
+      ]
+      rust_pkgs
+      lsps
+      java_tools
+      common_tools
+    ];
 
   # https://github.com/flamegraph-rs/flamegraph
   home.file.".cargo/config.toml".text = ''