From bbc11f6af219be3cf6715b40f044d60f78899bb4 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Tue, 27 Jun 2023 16:10:31 +0100
Subject: [PATCH] Add extra Hyprland packages back to flake

---
 flake.nix                 | 37 ++++++++++++++++++++++++++++++-------
 home/desktop/hyprland.nix |  8 --------
 2 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/flake.nix b/flake.nix
index fdb7dc56..e536de2f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -29,15 +29,38 @@
         users.root.imports = [./home/env/bash.nix ./home/env/starship.nix];
       };
     };
-    hyprland-config = {
+    hyprland-config = {pkgs, ...}: {
       imports = [hyprland.nixosModules.default];
+      environment.systemPackages = with pkgs; [
+        gsettings-desktop-schemas
+        pavucontrol
+        pamixer
+        pulseaudio
+        pipewire
+        wireplumber
+        wl-clipboard
+        swayimg
+        hyprpaper
+        grim
+        slurp
+      ];
       security.pam.services.swaylock = {};
-      programs.hyprland.enable = true;
-      services.greetd = {
-        enable = true;
-        settings = rec {
-          initial_session.command = "Hyprland";
-          default_session = initial_session;
+      programs = {
+        hyprland.enable = true;
+        thunar = {
+          enable = true;
+          plugins = with pkgs.xfce; [thunar-archive-plugin thunar-volman];
+        };
+      };
+      services = {
+        gvfs.enable = true; # Mount, trash, and other functionalities
+        tumbler.enable = true; # Thumbnail support for images
+        greetd = {
+          enable = true;
+          settings = rec {
+            initial_session.command = "Hyprland";
+            default_session = initial_session;
+          };
         };
       };
     };
diff --git a/home/desktop/hyprland.nix b/home/desktop/hyprland.nix
index 2a32e703..8311d56a 100644
--- a/home/desktop/hyprland.nix
+++ b/home/desktop/hyprland.nix
@@ -5,19 +5,11 @@
 }: {
   imports = [
     ./swaylock.nix
-    # ./eww.nix
     ./waybar.nix
     ./gtk.nix
     ./dunst.nix
     ./rofi.nix
   ];
-  home.packages = with pkgs; [
-    pipewire
-    wireplumber
-    wl-clipboard
-    swayimg
-    hyprpaper
-  ];
   programs.rofi.package = pkgs.rofi-wayland;
   wayland.windowManager.hyprland = {
     enable = true;