From f1061c3c8c3d52f4fd3e761308cb56f06f71d3e0 Mon Sep 17 00:00:00 2001
From: Benjamin Palko <Benjaminpalko@hotmail.com>
Date: Sat, 20 Jul 2024 13:02:26 -0400
Subject: [PATCH] move hyprland to subfolder

---
 gtk-3.0/settings.ini              |  4 ---
 gtk-4.0/settings.ini              |  4 ---
 home-manager/hyprland.nix         | 33 ------------------
 home-manager/hyprland/default.nix | 57 +++++++++++++++++++++++++++++++
 nixos/hyprland.nix                |  9 ++++-
 nixos/nixos.nix                   |  2 +-
 6 files changed, 66 insertions(+), 43 deletions(-)
 delete mode 100644 gtk-3.0/settings.ini
 delete mode 100644 gtk-4.0/settings.ini
 delete mode 100644 home-manager/hyprland.nix
 create mode 100644 home-manager/hyprland/default.nix

diff --git a/gtk-3.0/settings.ini b/gtk-3.0/settings.ini
deleted file mode 100644
index 1a671a4..0000000
--- a/gtk-3.0/settings.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[Settings]
-gtk-application-prefer-dark-theme=1
-gtk-cursor-theme-name=catpuccin-mocha-light-cursors
-
diff --git a/gtk-4.0/settings.ini b/gtk-4.0/settings.ini
deleted file mode 100644
index 1a671a4..0000000
--- a/gtk-4.0/settings.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[Settings]
-gtk-application-prefer-dark-theme=1
-gtk-cursor-theme-name=catpuccin-mocha-light-cursors
-
diff --git a/home-manager/hyprland.nix b/home-manager/hyprland.nix
deleted file mode 100644
index 498103d..0000000
--- a/home-manager/hyprland.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ ... }:
-{
-  xdg.configFile = {
-    "gtk-3.0" = {
-      source = ../gtk-3.0;
-      recursive = true;
-    };
-    "gtk-4.0" = {
-      source = ../gtk-4.0;
-      recursive = true;
-    };
-    hypr = {
-      source = ../hypr;
-      recursive = true;
-    };
-    rofi = {
-      source = ../rofi;
-      recursive = true;
-    };
-    swaync = {
-      source = ../swaync;
-      recursive = true;
-    };
-    wal = {
-      source = ../wal;
-      recursive = true;
-    };
-    waybar = {
-      source = ../waybar;
-      recursive = true;
-    };
-  };
-}
diff --git a/home-manager/hyprland/default.nix b/home-manager/hyprland/default.nix
new file mode 100644
index 0000000..bf48a4a
--- /dev/null
+++ b/home-manager/hyprland/default.nix
@@ -0,0 +1,57 @@
+{ pkgs, ... }:
+{
+  home.pointerCursor = {
+    gtk.enable = true;
+    # x11.enable = true;
+    package = pkgs.catppuccin-cursors;
+    name = "catpuccin-mocha-light-cursors";
+    size = 24;
+  };
+
+  wayland.windowManager.hyprland = {
+    enable = true;
+  };
+
+  gtk = {
+    enable = true;
+    gtk3.extraConfig = {
+      gtk-application-prefer-dark-theme = 1;
+    };
+    gtk4.extraConfig = {
+      gtk-application-prefer-dark-theme = 1;
+    };
+
+    theme = {
+      package = pkgs.whitesur-gtk-theme;
+      name = "Whitesur-dark";
+    };
+
+    iconTheme = {
+      package = pkgs.whitesur-icon-theme;
+      name = "Whitesur-Dark";
+    };
+  };
+
+  xdg.configFile = {
+    hypr = {
+      source = ../../hypr;
+      recursive = true;
+    };
+    rofi = {
+      source = ../../rofi;
+      recursive = true;
+    };
+    swaync = {
+      source = ../../swaync;
+      recursive = true;
+    };
+    wal = {
+      source = ../../wal;
+      recursive = true;
+    };
+    waybar = {
+      source = ../../waybar;
+      recursive = true;
+    };
+  };
+}
diff --git a/nixos/hyprland.nix b/nixos/hyprland.nix
index 60930ea..14a83d5 100644
--- a/nixos/hyprland.nix
+++ b/nixos/hyprland.nix
@@ -2,10 +2,17 @@
 {
   programs.hyprland = {
     enable = true;
+    xwayland.enable = true;
   };
   programs.hyprlock.enable = true;
   services.hypridle.enable = true;
-  programs.thunar.enable = true;
+  programs.thunar = {
+    enable = true;
+    plugins = with pkgs.xfce; [
+      thunar-archive-plugin
+      thunar-volman
+    ];
+  };
 
   environment.systemPackages = with pkgs; [
     hyprcursor
diff --git a/nixos/nixos.nix b/nixos/nixos.nix
index 2711454..b0fc364 100644
--- a/nixos/nixos.nix
+++ b/nixos/nixos.nix
@@ -39,7 +39,7 @@ in
       home.homeDirectory = "/home/${username}";
       imports = [
         ../home-manager/git.nix
-        ../home-manager/hyprland.nix
+        ../home-manager/hyprland
         ../home-manager/media.nix
         ../home-manager/nvim.nix
         ../home-manager/terminal.nix