From 5041e3a218b4d0638b96e91591b62b5715729a9f Mon Sep 17 00:00:00 2001
From: Eriq Taing <eriq12@protonmail.com>
Date: Sat, 7 Jun 2025 15:48:27 -0400
Subject: [PATCH] Changed source to be globbed instead to allow users to add
 their own files without needing to worry about conflicts with config updates

---
 dot_config/hypr/hyprland.conf                 | 17 +----------------
 dot_config/hypr/hyprland.conf.d/env_vars.conf |  2 +-
 dot_config/hypr/hyprland.conf.d/keybinds.conf | 11 ++---------
 3 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/dot_config/hypr/hyprland.conf b/dot_config/hypr/hyprland.conf
index f530bc6..fe32da4 100644
--- a/dot_config/hypr/hyprland.conf
+++ b/dot_config/hypr/hyprland.conf
@@ -1,19 +1,4 @@
 # hyprland.conf
 
 # All component files
-source = ~/.config/hypr/hyprland.conf.d/monitors.conf
-source = ~/.config/hypr/hyprland.conf.d/env_vars.conf
-source = ~/.config/hypr/hyprland.conf.d/game_workspace.conf
-source = ~/.config/hypr/hyprland.conf.d/discord_workspace.conf
-source = ~/.config/hypr/hyprland.conf.d/terminal.conf
-source = ~/.config/hypr/hyprland.conf.d/keybinds.conf
-source = ~/.config/hypr/hyprland.conf.d/browser.conf
-source = ~/.config/hypr/hyprland.conf.d/keybinds.conf.d/arrow_move_window.conf
-source = ~/.config/hypr/hyprland.conf.d/keybinds.conf.d/workspace_binds.conf
-source = ~/.config/hypr/hyprland.conf.d/keybinds.conf.d/media_binds.conf
-source = ~/.config/hypr/hyprland.conf.d/misc_apps.conf
-source = ~/.config/hypr/hyprland.conf.d/devices.conf
-source = ~/.config/hypr/hyprland.conf.d/general_workspaces.conf
-source = ~/.config/hypr/hyprland.conf.d/input.conf
-source = ~/.config/hypr/hyprland.conf.d/hyprland_appearance.conf
-source = ~/.config/hypr/hyprland.conf.d/hyprland_behavior.conf
+source = ~/.config/hypr/hyprland.conf.d/*.conf
diff --git a/dot_config/hypr/hyprland.conf.d/env_vars.conf b/dot_config/hypr/hyprland.conf.d/env_vars.conf
index cc5ef52..a07b521 100644
--- a/dot_config/hypr/hyprland.conf.d/env_vars.conf
+++ b/dot_config/hypr/hyprland.conf.d/env_vars.conf
@@ -25,7 +25,7 @@ env = QT_QUICK_CONTROLS_STYLE,org.kde.desktop
 #env = QT_STYLE_OVERRIDE,breeze
 
 # copy some environments into systemctl
-exec=systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP QT_QPA_PLATFORMTHEME
+# exec=systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP QT_QPA_PLATFORMTHEME
 
 # set default editor
 env = EDITOR,/usr/bin/nvim
diff --git a/dot_config/hypr/hyprland.conf.d/keybinds.conf b/dot_config/hypr/hyprland.conf.d/keybinds.conf
index 02db316..4a4d379 100644
--- a/dot_config/hypr/hyprland.conf.d/keybinds.conf
+++ b/dot_config/hypr/hyprland.conf.d/keybinds.conf
@@ -33,12 +33,5 @@ bind = $mainMod, down, movefocus, d
 bindm = $mainMod SHIFT, mouse:272, movewindow
 bindm = $mainMod SHIFT, mouse:273, resizewindow
 
-# global hotkeys
-# discord mute
-#bind = CTRL SHIFT, M, pass, initialclass:^(discord)$
-#bind = $mainMod SHIFT ALT, M, sendshortcut, CTRL SHIFT, M, class:discord
-bind = $mainMod ALT SHIFT, M, exec, $HOME/bin/toggle_q1u_mic_mute.sh
-
-# toggle other monitor
-bind = $mainMod SHIFT, P, exec, hyprctl keyword monitor "DP-2, disable"
-bind = $mainMod SHIFT CTRL, P, exec, hyprctl keyword monitor "DP-2, 2560x1440@60, 2560x0, 1, transform, 0"
+# finally, source the ones inside keybinds.conf.d, allowing overrides
+source = ~/.config/hypr/hyprland.conf.d/keybinds.conf.d/*.conf