From 157658546e441a1bc24af4cddae22278871be49c Mon Sep 17 00:00:00 2001
From: Dave Gallant <dave.gallant@gmail.com>
Date: Mon, 26 Feb 2024 19:42:31 -0500
Subject: [PATCH] Group gnomeExtensions in variable

---
 modules/machines/hephaestus/configuration.nix | 118 +++++++++---------
 1 file changed, 61 insertions(+), 57 deletions(-)

diff --git a/modules/machines/hephaestus/configuration.nix b/modules/machines/hephaestus/configuration.nix
index d564eae..769e359 100644
--- a/modules/machines/hephaestus/configuration.nix
+++ b/modules/machines/hephaestus/configuration.nix
@@ -3,7 +3,21 @@
   pkgs,
   unstable,
   ...
-}: {
+}: let
+  gnomeExtensions = with pkgs.gnomeExtensions; [
+    appindicator
+    bluetooth-quick-connect
+    blur-my-shell
+    caffeine
+    clipboard-indicator
+    dash-to-dock
+    grand-theft-focus
+    notification-banner-reloaded
+    quick-settings-tweaker
+    tailscale-status
+    tray-icons-reloaded
+  ];
+in {
   imports = [./hardware.nix];
 
   hardware.opengl.enable = true;
@@ -124,60 +138,50 @@
     };
   };
 
-  environment.systemPackages = with pkgs; [
-    android-tools
-    bitwarden
-    cryptsetup
-    deja-dup
-    discord
-    docker
-    docker-compose
-    foliate
-    ghostscript
-    gimp-with-plugins
-    glibcLocales
-    gnome.gnome-tweaks
-    gnomeExtensions.appindicator
-    gnomeExtensions.bluetooth-quick-connect
-    gnomeExtensions.blur-my-shell
-    gnomeExtensions.caffeine
-    gnomeExtensions.clipboard-indicator
-    gnomeExtensions.dash-to-dock
-    gnomeExtensions.grand-theft-focus
-    gnomeExtensions.notification-banner-reloaded
-    gnomeExtensions.quick-settings-tweaker
-    gnomeExtensions.tailscale-status
-    gnomeExtensions.tray-icons-reloaded
-    iputils
-    kazam
-    legendary-gl
-    lm_sensors
-    mullvad-vpn
-    netdata
-    nfs-utils
-    pavucontrol
-    pinentry-curses
-    podman
-    podman-compose
-    psst
-    qemu
-    rustup
-    ryujinx
-    signal-desktop
-    strace
-    tailscale
-    traceroute
-    ungoogled-chromium
-    unstable.logseq
-    unstable.obsidian
-    unstable.yuzu
-    unstable.zoom-us
-    usbutils
-    virt-manager
-    vlc
-    whois
-    wine
-    wine64
-    wireshark-qt
-  ];
+  environment.systemPackages = with pkgs;
+    [
+      android-tools
+      bitwarden
+      cryptsetup
+      deja-dup
+      discord
+      docker
+      docker-compose
+      foliate
+      ghostscript
+      gimp-with-plugins
+      glibcLocales
+      gnome.gnome-tweaks
+      iputils
+      kazam
+      legendary-gl
+      lm_sensors
+      mullvad-vpn
+      netdata
+      nfs-utils
+      pavucontrol
+      pinentry-curses
+      podman
+      psst
+      qemu
+      rustup
+      ryujinx
+      strace
+      tailscale
+      traceroute
+      ungoogled-chromium
+      unstable.logseq
+      unstable.obsidian
+      unstable.signal-desktop
+      unstable.yuzu
+      unstable.zoom-us
+      usbutils
+      virt-manager
+      vlc
+      whois
+      wine
+      wine64
+      wireshark-qt
+    ]
+    ++ gnomeExtensions;
 }