From 09a219dd8b3c8b1580f92f48d84c94cd7774feee Mon Sep 17 00:00:00 2001
From: "Alexandre Cavalheiro S. Tiago da Silva" <contact@thewizard.link>
Date: Thu, 1 Feb 2024 21:13:00 -0300
Subject: [PATCH] chore: disable hyprland-focus plugin and style borders

---
 home-manager.nix                              |  2 +-
 programs/hyprland/{config.nix => default.nix} | 71 +++++++++----------
 2 files changed, 33 insertions(+), 40 deletions(-)
 rename programs/hyprland/{config.nix => default.nix} (85%)

diff --git a/home-manager.nix b/home-manager.nix
index 54f9922..b7ad2f5 100644
--- a/home-manager.nix
+++ b/home-manager.nix
@@ -9,7 +9,7 @@
   imports = [
     ./programs/fish/config.nix
     ./programs/git.nix
-    ./programs/hyprland/config.nix
+    ./programs/hyprland
     ./programs/mangohud.nix
     ./programs/obs-studio.nix
     ./programs/rofi/default.nix
diff --git a/programs/hyprland/config.nix b/programs/hyprland/default.nix
similarity index 85%
rename from programs/hyprland/config.nix
rename to programs/hyprland/default.nix
index 55135b9..07f8fa3 100644
--- a/programs/hyprland/config.nix
+++ b/programs/hyprland/default.nix
@@ -11,44 +11,37 @@
     ];
 
     extraConfig = ''
-
-      ########################################################################################
-      AUTOGENERATED HYPR CONFIG.
-      PLEASE USE THE CONFIG PROVIDED IN THE GIT REPO /examples/hypr.conf AND EDIT IT,
-      OR EDIT THIS ONE ACCORDING TO THE WIKI INSTRUCTIONS.
-      ########################################################################################
-
       # Catppuccin Macchiato - https://github.com/catppuccin/hyprland
-      $rosewaterAlpha = f4dbd6
-      $flamingoAlpha  = f0c6c6
-      $pinkAlpha      = f5bde6
-      $mauveAlpha     = c6a0f6
-      $redAlpha       = ed8796
-      $maroonAlpha    = ee99a0
-      $peachAlpha     = f5a97f
-      $yellowAlpha    = eed49f
-      $greenAlpha     = a6da95
-      $tealAlpha      = 8bd5ca
-      $skyAlpha       = 91d7e3
-      $sapphireAlpha  = 7dc4e4
-      $blueAlpha      = 8aadf4
-      $lavenderAlpha  = b7bdf8
+      $rosewaterAlpha = rgb(f4dbd6)
+      $flamingoAlpha  = rgb(f0c6c6)
+      $pinkAlpha      = rgb(f5bde6)
+      $mauveAlpha     = rgb(c6a0f6)
+      $redAlpha       = rgb(ed8796)
+      $maroonAlpha    = rgb(ee99a0)
+      $peachAlpha     = rgb(f5a97f)
+      $yellowAlpha    = rgb(eed49f)
+      $greenAlpha     = rgb(a6da95)
+      $tealAlpha      = rgb(8bd5ca)
+      $skyAlpha       = rgb(91d7e3)
+      $sapphireAlpha  = rgb(7dc4e4)
+      $blueAlpha      = rgb(8aadf4)
+      $lavenderAlpha  = rgb(b7bdf8)
 
-      $textAlpha      = cad3f5
-      $subtext1Alpha  = b8c0e0
-      $subtext0Alpha  = a5adcb
+      $textAlpha      = rgb(cad3f5)
+      $subtext1Alpha  = rgb(b8c0e0)
+      $subtext0Alpha  = rgb(a5adcb)
 
-      $overlay2Alpha  = 939ab7
-      $overlay1Alpha  = 8087a2
-      $overlay0Alpha  = 6e738d
+      $overlay2Alpha  = rgb(939ab7)
+      $overlay1Alpha  = rgb(8087a2)
+      $overlay0Alpha  = rgb(6e738d)
 
-      $surface2Alpha  = 5b6078
-      $surface1Alpha  = 494d64
-      $surface0Alpha  = 363a4f
+      $surface2Alpha  = rgb(5b6078)
+      $surface1Alpha  = rgb(494d64)
+      $surface0Alpha  = rgb(363a4f)
 
-      $baseAlpha      = 24273a
-      $mantleAlpha    = 1e2030
-      $crustAlpha     = 181926
+      $baseAlpha      = rgb(24273a)
+      $mantleAlpha    = rgb(1e2030)
+      $crustAlpha     = rgb(181926)
 
       $rosewater = 0xfff5e0dc
       $flamingo  = 0xfff2cdcd
@@ -128,11 +121,11 @@
       general {
           # See https://wiki.hyprland.org/Configuring/Variables/ for more
 
-          gaps_in = 5
-          gaps_out = 20
-          border_size = 0 # Removed because of hyprfocus plugin
-          col.active_border = $lavender
-          col.inactive_border = $crust
+          gaps_in = 6
+          gaps_out = 18
+          border_size = 2
+          col.active_border = $lavender $red 15deg
+          col.inactive_border = $yellow $sapphire 15deg
 
           layout = dwindle
       }
@@ -280,7 +273,7 @@
 
       # Plugins
       plugin:hyprfocus {
-          enabled = yes
+          enabled = no
 
           keyboard_focus_animation = shrink
           mouse_focus_animation = shrink