From f1ba98d3d6b4455e0263ae51a40ee499125282ac Mon Sep 17 00:00:00 2001
From: Fergus Molloy <fergus@molloy.xyz>
Date: Fri, 20 Jun 2025 09:50:57 +0100
Subject: [PATCH] move hyprland configs to correct dir, also update git config

---
 git/.gitconfig                                    | 12 ++++++++++--
 hyprland/.config/{hyprland => hypr}/hyprland.conf |  8 ++++----
 hyprland/.config/{hyprland => hypr}/hyprlock.conf |  0
 3 files changed, 14 insertions(+), 6 deletions(-)
 rename hyprland/.config/{hyprland => hypr}/hyprland.conf (98%)
 rename hyprland/.config/{hyprland => hypr}/hyprlock.conf (100%)

diff --git a/git/.gitconfig b/git/.gitconfig
index ab4ba4e..cbc711e 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -9,6 +9,14 @@
 [branch]
   autoSetupRebase = always
 [commit]
-  gpgsign = true
+  gpgSign = true
+[tag]
+  gpgSign = true
 [push]
-	autoSetupRemote = true
+  autoSetupRemote = true
+[pull]
+  rebase = true
+[rerere]
+  enabled = true
+[include]
+  path = ./.git-gpg
diff --git a/hyprland/.config/hyprland/hyprland.conf b/hyprland/.config/hypr/hyprland.conf
similarity index 98%
rename from hyprland/.config/hyprland/hyprland.conf
rename to hyprland/.config/hypr/hyprland.conf
index 35af79c..7957fe5 100644
--- a/hyprland/.config/hyprland/hyprland.conf
+++ b/hyprland/.config/hypr/hyprland.conf
@@ -24,9 +24,9 @@
 # See https://wiki.hyprland.org/Configuring/Keywords/
 
 # Set programs that you use
-$terminal = uwsm app -- kitty
-$fileManager = uwsm app -- dolphin
-$menu = uwsm app -- wofi --show drun
+$terminal = kitty
+$fileManager = dolphin
+$menu = wofi --show drun
 
 
 #################
@@ -211,7 +211,7 @@ bind = $mainMod, Return, exec, $terminal
 bind = $mainMod, Q, killactive,
 bind = $mainMod, M, exit,
 bind = $mainMod, E, exec, $fileManager
-bind = $mainMod, G, exec, uwsm app -- firefox
+bind = $mainMod, G, exec, firefox
 bind = $mainMod, D, exec, $menu
 # bind = $mainMod, P, pseudo, # dwindle
 bind = $mainMod, J, togglesplit, # dwindle
diff --git a/hyprland/.config/hyprland/hyprlock.conf b/hyprland/.config/hypr/hyprlock.conf
similarity index 100%
rename from hyprland/.config/hyprland/hyprlock.conf
rename to hyprland/.config/hypr/hyprlock.conf