From 672b5942e0edeacaa87e6bed11782c1c3b608325 Mon Sep 17 00:00:00 2001
From: Aly Raffauf <alyraffauf@gmail.com>
Date: Wed, 27 Mar 2024 12:58:41 -0400
Subject: [PATCH] hyprland: replaced basic apps with xfce equivalents

---
 home/hypr/default.nix | 14 ++++++++++++--
 modules/hyprland.nix  | 11 ++++++-----
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/home/hypr/default.nix b/home/hypr/default.nix
index 62212abb..15a1105d 100644
--- a/home/hypr/default.nix
+++ b/home/hypr/default.nix
@@ -4,7 +4,7 @@
   # Packages that should be installed to the user profile.
   home.packages = with pkgs; [
     brightnessctl
-    gnome.eog
+    evince
     hyprcursor
     hypridle
     hyprland-protocols
@@ -15,11 +15,21 @@
     hyprshot
     playerctl
     pyprland
-    udiskie
     xdg-desktop-portal-hyprland
     xfce.exo
+    xfce.ristretto
+    xfce.thunar
+    xfce.thunar-archive-plugin
+    xfce.thunar-media-tags-plugin
+    xfce.thunar-volman
+    xfce.tumbler
+    xfce.xfce4-settings
+    xfce.xfce4-taskmanager
+    xfce.xfconf
   ];
 
+  services.gpg-agent.enable = true;
+
   wayland.windowManager.hyprland = {
     enable = true;
     extraConfig = builtins.readFile ./hyprland.conf;
diff --git a/modules/hyprland.nix b/modules/hyprland.nix
index cf8c7b6d..602e84bd 100644
--- a/modules/hyprland.nix
+++ b/modules/hyprland.nix
@@ -41,12 +41,13 @@
 
   services.gnome.gnome-keyring.enable = true;
   security.pam.services.gdm.enableKwallet = true;
+  security.pam.services.gdm.enableGnomeKeyring = true;
 
-  programs.xfconf.enable = true;
-  programs.thunar = {
-    enable = true;
-    plugins = with pkgs.xfce; [ thunar-archive-plugin thunar-volman ];
-  };
+  # programs.xfconf.enable = true;
+  # programs.thunar = {
+  #   enable = true;
+  #   plugins = with pkgs.xfce; [ thunar-archive-plugin thunar-volman ];
+  # };
   services.gvfs.enable = true; # Mount, trash, and other functionalities
   services.tumbler.enable = true; # Thumbnail support for images