From 02b29bff49c86ee66058fd25d1190317a9c56b5c Mon Sep 17 00:00:00 2001
From: JaKooLit <jimmielovejay@gmail.com>
Date: Sat, 11 Nov 2023 23:17:09 +0900
Subject: [PATCH] some small cleanup

---
 config/hypr/HelpFile.md           |  1 -
 config/hypr/configs/Execs.conf    |  7 +------
 config/hypr/configs/Keybinds.conf |  3 +--
 config/hypr/configs/Settings.conf | 29 ++++++++++++++++-------------
 4 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/config/hypr/HelpFile.md b/config/hypr/HelpFile.md
index cf04ea2..f585b6b 100644
--- a/config/hypr/HelpFile.md
+++ b/config/hypr/HelpFile.md
@@ -87,6 +87,5 @@
 # If you dont like kitty or in your tty to get the pywal colors, edit ~/.config/kitty/kitty.conf or .zshrc (for zsh)
 
 # HIDDEN FEATURES!
-
   - ROFI BEATS or ONLINE Music ( SUPER SHIFT S)
   - EMOTICONS (SUPER ALT E) - useful for chats or messages )
diff --git a/config/hypr/configs/Execs.conf b/config/hypr/configs/Execs.conf
index 4112d8b..2cf5946 100644
--- a/config/hypr/configs/Execs.conf
+++ b/config/hypr/configs/Execs.conf
@@ -23,7 +23,7 @@ exec-once = $scriptsDir/Polkit.sh
 #gnome polkit for nixos
 #exec-once = $scriptsDir/Polkit-NixOS.sh
 
-# Portal Hyprland
+# Portal Hyprland (should be auto starting. However, you can force to start)
 #exec-once = $scriptsDir/PortalHyprland.sh
 
 # starup apps
@@ -32,14 +32,10 @@ exec-once = dunst &
 #exec-once = blueman-applet & 
 exec-once = nm-applet --indicator &
 #exec-once = rog-control-center &
-#exec-once = easyeffects --gapplication-service -l my_own
 
 #clipboard manager
 exec-once = wl-paste --watch cliphist store 
 
-#Catpuccin Hyprland Themes
-source = $themes/mocha.conf
-
 # Rainbow borders
 exec-once = $scriptsDir/RainbowBorders.sh
 
@@ -49,7 +45,6 @@ exec-once = $scriptsDir/RainbowBorders.sh
 # auto close of apps (timeout 5 secs)
 # exec-once = $scriptsDir/AppAutoClose.sh
 
-
 # sway-idle with lock only
 exec-once = swayidle -w timeout 1200 '$lock'
 # sway-idle with lock and sleep
diff --git a/config/hypr/configs/Keybinds.conf b/config/hypr/configs/Keybinds.conf
index e7c83c0..bb7e443 100644
--- a/config/hypr/configs/Keybinds.conf
+++ b/config/hypr/configs/Keybinds.conf
@@ -22,7 +22,6 @@ $volume = $scriptsDir/Volume.sh
 $waybar = $scriptsDir/Waybar.sh
 
 
-
 # see https://wiki.hyprland.org/Configuring/Binds/ for more
 bind = CTRL ALT, Delete, exec, hyprctl dispatch exit 0
 bind = $mainMod SHIFT, C, exec, hyprctl reload
@@ -194,7 +193,7 @@ bind = $mainMod ALT, Print, exec, $screenshot --in10
 #bind = SHIFT, Print, exec, $screenshot --area
 bind = $mainMod SHIFT, Print, exec, $screenshot --area
 
-# screenshot with swappy
+# screenshot with swappy (another screenshot tool)
 bind = $mainMod SHIFT, S, exec, grim -g "$(slurp)" - | swappy -f -
 
 # Screenshot keybindings for Asus G15 (no PrinSrc button)
diff --git a/config/hypr/configs/Settings.conf b/config/hypr/configs/Settings.conf
index 87fb04d..f57f6ca 100644
--- a/config/hypr/configs/Settings.conf
+++ b/config/hypr/configs/Settings.conf
@@ -1,8 +1,16 @@
 ## refer to Hyprland wiki for more info https://wiki.hyprland.org/Configuring/Variables
 ## JaKooLit Github - https://github.com/JaKooLit
 
+$themes = $HOME/.config/hypr/themes
+
+# Catpuccin Hyprland Themes
+source = $themes/mocha.conf
+#source = $themes/frappe.conf
+#source = $themes/latte.conf
+#source = $themes/machiato.conf
+
 # blurls = waybar
-#blurls = rofi
+# blurls = rofi
 
 dwindle {
   pseudotile = yes
@@ -12,7 +20,7 @@ dwindle {
 
 master {
   new_is_master=1
-  new_on_top=0
+  new_on_top=1
   mfact = 0.5
 }
 
@@ -23,23 +31,18 @@ general {
   gaps_out = 8
   border_size = 1
   resize_on_border = true
-  
-  #one color
-  #col.active_border = rgba(7aa2f7aa)
-  
-  #more colors - gradient
-  #col.active_border = rgb(8839ef) rgb(cba6f7) rgb(ca9ee6) rgb(c6a0f6) 45deg
-  col.active_border = rgb(7287fd) rgb(74c7ec) rgb(89b4fa) 45deg 
-  col.inactive_border = rgb(6c7086)
+   
+  col.active_border = $lavender $blue $sapphire $mauve $red $flamingo 45deg 
+  col.inactive_border = $overlay1
 
   layout = master
 }
 
 group {
-  col.border_active = rgba(7aa2f7aa)
+  col.border_active = $maroon
 
 	groupbar {
-	col.active = rgba(7aa2f7aa)
+	col.active = $green
   }
 }
 
@@ -56,7 +59,7 @@ decoration {
   drop_shadow=true
   shadow_range=4
   shadow_render_power = 1
-  col.shadow = rgb(cba7f7)
+  col.shadow = $mauve
   col.shadow_inactive = 0x50000000
 
   blur {