3 files changed, 48 insertions, 167 deletions
diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf
index 0cfe40f..ee06b7e 100644
--- a/.config/hypr/hyprland.conf
+++ b/.config/hypr/hyprland.conf
@@ -1,11 +1,12 @@
+source = $HOME/.cache/wal/colors-hyprland.conf
 autogenerated = 0
 
 ###################
 ### MY PROGRAMS ###
 ###################
-$terminal = footclient
+$terminal = footclient -o include=~/.cache/wal/colors-foot.ini
 $menu = fuzzel
-$browser = zen-browser
+$browser = librewolf
 
 
 #################
@@ -85,10 +86,8 @@ general {
     border_size = 2
     resize_on_border = false
     allow_tearing = false
-    # col.active_border = rgba(7da6ffee)
-    # col.inactive_border = rgba(888e8eaa)
-    col.active_border = rgb(8aadf4) rgb(24273A) rgb(24273A) rgb(8aadf4) 45deg
-    col.inactive_border = rgb(24273A) rgb(24273A) rgb(24273A) rgb(27273A) 45deg
+    col.active_border = $color14 $color0 $color0 $color14 45deg
+    col.inactive_border = $color0 $color0 $color0 $color0 45deg
     layout = master
 }
 
@@ -261,7 +260,7 @@ bind = $mainMod, S, togglespecialworkspace, magic
 bind = $mainMod SHIFT, S, movetoworkspace, special:magic
 
 # Have scratchpad like DWM which opens alacritty in special workspace
-workspace = special:h, on-created-empty: footclient
+workspace = special:h, on-created-empty: footclient -o include=~/.cache/wal/colors-foot.ini
 bind = $mainMod SHIFT, Return, togglespecialworkspace, h
 
 
diff --git a/.config/hypr/hyprlock.conf b/.config/hypr/hyprlock.conf
index 5fe9fa3..aedfce1 100644
--- a/.config/hypr/hyprlock.conf
+++ b/.config/hypr/hyprlock.conf
@@ -1,100 +1,60 @@
-source = $HOME/.config/hypr/mocha.conf
+# -- pywal colors --
+source = $HOME/.cache/wal/colors-hyprland.conf
 
-$accent = $mauve
-$accentAlpha = $mauveAlpha
-$font = Fira Code
-
-# GENERAL
 general {
-  hide_cursor = true
+    hide_cursor = true
+    no_fade_in = false
+    grace = 0
+    disable_loading_bar = true
 }
 
-# BACKGROUND
+
 background {
   monitor =
-  path = $HOME/.config/background
   blur_passes = 0
-  color = $base
+  color = $background
 }
 
-# LAYOUT
+# -- time --
 label {
-  monitor =
-  text = Layout: $LAYOUT
-  color = $text
-  font_size = 25
-  font_family = $font
-  position = 30, -30
-  halign = left
-  valign = top
+    monitor =
+    text = cmd[update:1000] echo "$(date +"%H:%M")"
+    color = $color7
+    font_size = 80
+    font_family = Fira Code ExtraBold
+    position = 0, 100
+    halign = center
+    valign = center
 }
 
-# TIME
-label {
-  monitor =
-  text = $TIME
-  color = $text
-  font_size = 90
-  font_family = $font
-  position = -30, 0
-  halign = right
-  valign = top
-}
 
-# DATE
+# -- greeting --
 label {
-  monitor =
-  text = cmd[update:43200000] date +"%A, %d %B %Y"
-  color = $text
-  font_size = 25
-  font_family = $font
-  position = -30, -150
-  halign = right
-  valign = top
+    monitor =
+    text = Hello $USER :3
+    color = $color7
+    font_size = 20
+    font_family = Fira Code
+    position = 0, 0
+    halign = center
+    valign = center
 }
 
-# FINGERPRINT
-{
-  monitor = "";
-  text = "$FPRINTPROMPT";
-  color = "$text";
-  font_size = 14;
-  font_family = $font;
-  position = "0, -107";
-  halign = "center";
-  valign = "center";
-}
-
-# USER AVATAR
-image {
-  monitor =
-  path = $HOME/.face
-  size = 100
-  border_color = $accent
-  position = 0, 75
-  halign = center
-  valign = center
-}
-
-# INPUT FIELD
+# -- password input --
 input-field {
-  monitor =
-  size = 300, 60
-  outline_thickness = 4
-  dots_size = 0.2
-  dots_spacing = 0.2
-  dots_center = true
-  outer_color = $accent
-  inner_color = $surface0
-  font_color = $text
-  fade_on_empty = false
-  placeholder_text = <span foreground="##$textAlpha"><i>󰌾 Logged in as </i><span foreground="##$accentAlpha">$USER</span></span>
-  hide_input = false
-  check_color = $accent
-  fail_color = $red
-  fail_text = <i>$FAIL <b>($ATTEMPTS)</b></i>
-  capslock_color = $yellow
-  position = 0, -47
-  halign = center
-  valign = center
+    monitor =
+    size = 230, 40
+    outline_thickness = 0
+    dots_size = 0.2
+    dots_spacing = 0.4
+    dots_center = true
+    inner_color = $color1
+    font_color = $color7
+    fade_on_empty = false
+    placeholder_text = <span foreground='white'><i>Unlock the mystery</i></span>
+    fail_color = $color7
+    hide_input = false
+    position = 0, -50
+    halign = center
+    valign = center
 }
diff --git a/.config/hypr/mocha.conf b/.config/hypr/mocha.conf
deleted file mode 100644
index 8ccb56a..0000000
--- a/.config/hypr/mocha.conf
+++ /dev/null
@@ -1,78 +0,0 @@
-
-$rosewater = rgb(f5e0dc)
-$rosewaterAlpha = f5e0dc
-
-$flamingo = rgb(f2cdcd)
-$flamingoAlpha = f2cdcd
-
-$pink = rgb(f5c2e7)
-$pinkAlpha = f5c2e7
-
-$mauve = rgb(cba6f7)
-$mauveAlpha = cba6f7
-
-$red = rgb(f38ba8)
-$redAlpha = f38ba8
-
-$maroon = rgb(eba0ac)
-$maroonAlpha = eba0ac
-
-$peach = rgb(fab387)
-$peachAlpha = fab387
-
-$yellow = rgb(f9e2af)
-$yellowAlpha = f9e2af
-
-$green = rgb(a6e3a1)
-$greenAlpha = a6e3a1
-
-$teal = rgb(94e2d5)
-$tealAlpha = 94e2d5
-
-$sky = rgb(89dceb)
-$skyAlpha = 89dceb
-
-$sapphire = rgb(74c7ec)
-$sapphireAlpha = 74c7ec
-
-$blue = rgb(89b4fa)
-$blueAlpha = 89b4fa
-
-$lavender = rgb(b4befe)
-$lavenderAlpha = b4befe
-
-$text = rgb(cdd6f4)
-$textAlpha = cdd6f4
-
-$subtext1 = rgb(bac2de)
-$subtext1Alpha = bac2de
-
-$subtext0 = rgb(a6adc8)
-$subtext0Alpha = a6adc8
-
-$overlay2 = rgb(9399b2)
-$overlay2Alpha = 9399b2
-
-$overlay1 = rgb(7f849c)
-$overlay1Alpha = 7f849c
-
-$overlay0 = rgb(6c7086)
-$overlay0Alpha = 6c7086
-
-$surface2 = rgb(585b70)
-$surface2Alpha = 585b70
-
-$surface1 = rgb(45475a)
-$surface1Alpha = 45475a
-
-$surface0 = rgb(313244)
-$surface0Alpha = 313244
-
-$base = rgb(1e1e2e)
-$baseAlpha = 1e1e2e
-
-$mantle = rgb(181825)
-$mantleAlpha = 181825
-
-$crust = rgb(11111b)
-$crustAlpha = 11111b