From c8bec32001a3e0adb2175d2e6b3e385e9858e3b7 Mon Sep 17 00:00:00 2001
From: Chris Toph <toph@ryot.foo>
Date: Fri, 18 Apr 2025 14:45:13 -0400
Subject: [PATCH] Update Hyprland configuration and improve icon theme settings

---
 home/toph/common/optional/hyprland/binds.nix  |  2 +-
 .../toph/common/optional/hyprland/default.nix | 16 +++++++-------
 .../optional/hyprland/theme/default.nix       | 22 ++++++++++++++++---
 home/toph/common/optional/xdg.nix             |  2 +-
 4 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/home/toph/common/optional/hyprland/binds.nix b/home/toph/common/optional/hyprland/binds.nix
index 5279ec1..38dc480 100644
--- a/home/toph/common/optional/hyprland/binds.nix
+++ b/home/toph/common/optional/hyprland/binds.nix
@@ -66,7 +66,7 @@ let
           "SUPER,         L,              exec,                       hyprlock"
           # "SUPER,         L,              exec,                       ${lockscreen}"
           "SUPER,         Q,              killactive,"
-          "CTRL_ALT,      Delete,         exit,"
+          "CTRL_ALT,      Delete,         exec,                       uwsm stop"
           ",              ${brightUp},    exec,                       ${brightness} + 10"
           ",              ${brightDown},  exec,                       ${brightness} - 10"
 
diff --git a/home/toph/common/optional/hyprland/default.nix b/home/toph/common/optional/hyprland/default.nix
index 558a244..0fc5e73 100644
--- a/home/toph/common/optional/hyprland/default.nix
+++ b/home/toph/common/optional/hyprland/default.nix
@@ -31,14 +31,14 @@
         "NIXOS_OZONE_WL, 1" # for ozone-based and electron apps to run on wayland
         "MOZ_ENABLE_WAYLAND, 1" # for firefox to run on wayland
         "MOZ_WEBRENDER, 1" # for firefox to run on wayland
-        "XDG_SESSION_TYPE,wayland"
-        "XDG_SESSION_DESKTOP,Hyprland"
-        "XDG_CURRENT_DESKTOP,Hyprland"
-        "WLR_NO_HARDWARE_CURSORS,1"
-        "WLR_RENDERER_ALLOW_SOFTWARE,1"
-        "QT_QPA_PLATFORM,wayland"
-        "GTK_USE_PORTAL,1"
-        "HYPRCURSOR_THEME,rose-pine-hyprcursor" # this will be better than default for now
+        "XDG_SESSION_TYPE, wayland"
+        "XDG_SESSION_DESKTOP, Hyprland"
+        "XDG_CURRENT_DESKTOP, Hyprland"
+        "WLR_NO_HARDWARE_CURSORS, 1"
+        "WLR_RENDERER_ALLOW_SOFTWARE, 1"
+        "QT_QPA_PLATFORM, wayland"
+        "GTK_USE_PORTAL, 1"
+        "HYPRCURSOR_THEME, rose-pine-hyprcursor" # this will be better than default for now
       ];
 
       xwayland = {
diff --git a/home/toph/common/optional/hyprland/theme/default.nix b/home/toph/common/optional/hyprland/theme/default.nix
index d556c04..2c9bc3f 100644
--- a/home/toph/common/optional/hyprland/theme/default.nix
+++ b/home/toph/common/optional/hyprland/theme/default.nix
@@ -7,6 +7,17 @@
 let
   path = lib.custom.relativeToRoot "pkgs/common/monocraft-nerd-fonts/package.nix";
   monocraft-nerd-fonts = pkgs.callPackage path { inherit pkgs; };
+
+  qogir = pkgs.qogir-icon-theme.override {
+    colorVariants = [
+      "dark"
+      "standard"
+    ];
+    themeVariants = [
+      "ubuntu"
+    ];
+  };
+
 in
 {
   imports = [
@@ -61,8 +72,14 @@ in
     enable = true;
 
     iconTheme = {
-      package = pkgs.adwaita-icon-theme;
-      name = "Adwaita";
+      # package = qogir;
+      # name = "Qogir";
+      package = (
+        pkgs.papirus-icon-theme.override {
+          color = "yellow";
+        }
+      );
+      name = "Papirus";
     };
   };
 
@@ -77,4 +94,3 @@ in
     };
   };
 }
- 
\ No newline at end of file
diff --git a/home/toph/common/optional/xdg.nix b/home/toph/common/optional/xdg.nix
index 07c69e6..81de989 100644
--- a/home/toph/common/optional/xdg.nix
+++ b/home/toph/common/optional/xdg.nix
@@ -5,7 +5,7 @@
 }:
 let
   # FIXME(xdg): That should use config options and just reference whatever is configured as the default
-  files = [ "nautilus.desktop" ];
+  files = [ "org.gnome.Nautilus.desktop" ];
   browser = [ "zen.desktop" ];
   editor = [ "code.desktop" ];
   steam = [ "steam-session.desktop" ];