From f720e54d6a600f6dfa38a28f5f17753d7f25a8ee Mon Sep 17 00:00:00 2001
From: Miran Bastaja <mbastaja@sorre.xyz>
Date: Mon, 10 Mar 2025 13:54:57 +0100
Subject: refactor: gui tools out of hyprdesktop

---
 share/hm-modules/hyprdesktop.nix | 26 --------------------------
 share/home/gui-tools.nix         | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 26 deletions(-)
 create mode 100644 share/home/gui-tools.nix

(limited to 'share')

diff --git a/share/hm-modules/hyprdesktop.nix b/share/hm-modules/hyprdesktop.nix
index f747831..82adbff 100644
--- a/share/hm-modules/hyprdesktop.nix
+++ b/share/hm-modules/hyprdesktop.nix
@@ -70,30 +70,6 @@ in
         slurp # region selection UI for wayland
         wl-clipboard # clipboard utility
         xdg-utils
-
-        # TUI/GUI programs
-        thunderbird # email client
-        nsxiv # image viewer
-        signal-desktop
-        whatsie
-        qbittorrent # bittorrent client
-        zathura # document reader
-        bitwarden
-        discord
-        gimp
-        libreoffice-qt6-fresh
-        kdePackages.kdenlive
-        blender
-        haruna
-        anki
-        calibre
-        mullvad-vpn
-
-        # Other
-        # It seems that not all gtk icon themes contain all icons? At least the
-        # Flat-Remix icon themes don't contain all the icons that Foliate uses,
-        # so I'm bringing in the adwaita icons as a fallback.
-        adwaita-icon-theme
       ]
       ++ lists.optionals cfg.hasBluetooth [ overskride ]
       ++ lists.optionals cfg.enableGaming [
@@ -123,11 +99,9 @@ in
     services.dunst.enable = true;
     services.wpaperd.enable = true;
     services.poweralertd.enable = cfg.hasBattery;
-    programs.mpv.enable = true;
     programs.jujutsu.enable = true;
     programs.foot.enable = true;
     programs.waybar.enable = true;
-    programs.librewolf.enable = true;
     programs.tofi.enable = true;
 
     xdg.portal = {
diff --git a/share/home/gui-tools.nix b/share/home/gui-tools.nix
new file mode 100644
index 0000000..6c29905
--- /dev/null
+++ b/share/home/gui-tools.nix
@@ -0,0 +1,32 @@
+{ pkgs, ... }:
+{
+  home.packages =
+    [ pkgs.kdePackaegs.kdenlive ]
+    ++ builtins.attrValues {
+      inherit (pkgs)
+        thunderbird # email client
+        nsxiv # image viewer
+        signal-desktop
+        whatsie
+        qbittorrent # bittorrent client
+        zathura # document reader
+        bitwarden
+        discord
+        gimp
+        libreoffice-qt6-fresh
+        blender
+        haruna
+        anki
+        calibre
+        mullvad-vpn
+
+        # Other
+        # It seems that not all gtk icon themes contain all icons? At least the
+        # Flat-Remix icon themes don't contain all the icons that Foliate uses,
+        # so I'm bringing in the adwaita icons as a fallback.
+        adwaita-icon-theme
+        ;
+    };
+
+  programs.librewolf.enable = true;
+}
-- 
cgit v1.3.1