diff --git a/.config/hypr/animations.conf b/.config/hypr/animations.conf
index 2ae8f82..4df98bd 100644
--- a/.config/hypr/animations.conf
+++ b/.config/hypr/animations.conf
@@ -1,11 +1,16 @@
-# ▄▀█ █▄░█ █ █▀▄▀█ ▄▀█ ▀█▀ █ █▀█ █▄░█
-# █▀█ █░▀█ █ █░▀░█ █▀█ ░█░ █ █▄█ █░▀█
-#
-# See https://wiki.hyprland.org/Configuring/Animations/
-# this file can be edited manually or use animation selector to select animations
-# disable animations while in hyprpicker and selection screenshot
-layerrule = noanim, hyprpicker
-layerrule = noanim, selection
+#! ▄▀█ █▄░█ █ █▀▄▀█ ▄▀█ ▀█▀ █ █▀█ █▄░█
+#! █▀█ █░▀█ █ █░▀░█ █▀█ ░█░ █ █▄█ █░▀█
-source = $HOME/.config/hypr/animations/end4.conf
+
+#*┌────────────────────────────────────────────────────────────────────────────┐
+#*│ # See https://wiki.hyprland.org/Configuring/Animations/ │
+#*│ # HyDE Controlled content // DO NOT EDIT │
+#*│ # Edit or add animations in the ./hypr/animations/ directory │
+#*│ # and run the 'animations.sh --select' command to update this file │
+#*│ │
+#*└────────────────────────────────────────────────────────────────────────────┘
+
+$ANIMATION=animations-vertical
+$ANIMATION_PATH=./animations/animations-vertical.conf
+source = $ANIMATION_PATH
diff --git a/.config/hypr/animations/theme.conf b/.config/hypr/animations/theme.conf
index 0680895..42e5eeb 100644
--- a/.config/hypr/animations/theme.conf
+++ b/.config/hypr/animations/theme.conf
@@ -1,26 +1,23 @@
-# ▄▀█ █▄░█ █ █▀▄▀█ ▄▀█ ▀█▀ █ █▀█ █▄░█
-# █▀█ █░▀█ █ █░▀░█ █▀█ ░█░ █ █▄█ █░▀█
-#
-# Inspired by "fast" and "Vertical"
-# availabe in ~/.config/hypr/animations/
-# credit for fast:- https://github.com/mylinuxforwork/dotfiles
-# -----------------------------------------------------
+# This file is generated by wallbash:animations.dcol
+
+# // ▄▀█ █▄░█ █ █▀▄▀█ ▄▀█ ▀█▀ █ █▀█ █▄░█
+# // █▀█ █░▀█ █ █░▀░█ █▀█ ░█░ █ █▄█ █░▀█
+
+# See https://wiki.hyprland.org/Configuring/Animations/
+# credits: https://github.com/prasanthrangan/hyprdots
+
animations {
- enabled = true
- bezier = linear, 0, 0, 1, 1
- bezier = md3_standard, 0.2, 0, 0, 1
- bezier = md3_decel, 0.05, 0.7, 0.1, 1
- bezier = md3_accel, 0.3, 0, 0.8, 0.15
- bezier = overshot, 0.05, 0.9, 0.1, 1.1
- bezier = crazyshot, 0.1, 1.5, 0.76, 0.92
- bezier = hyprnostretch, 0.05, 0.9, 0.1, 1.0
- bezier = fluent_decel, 0.1, 1, 0, 1
- bezier = easeInOutCirc, 0.85, 0, 0.15, 1
- bezier = easeOutCirc, 0, 0.55, 0.45, 1
- bezier = easeOutExpo, 0.16, 1, 0.3, 1
- animation = windows, 1, 3, md3_decel, popin 60%
- animation = border, 1, 10, default
- animation = fade, 1, 2.5, md3_decel
- animation = workspaces, 1, 3, fluent_decel, slidefadevert 30%
- animation = specialWorkspace, 1, 3, md3_decel, slidevert
-}
\ No newline at end of file
+ enabled = yes
+ bezier = wind, 0.05, 0.9, 0.1, 1.05
+ bezier = winIn, 0.1, 1.1, 0.1, 1.1
+ bezier = winOut, 0.3, -0.3, 0, 1
+ bezier = liner, 1, 1, 1, 1
+ animation = windows, 1, 6, wind, slide
+ animation = windowsIn, 1, 6, winIn, slide
+ animation = windowsOut, 1, 5, winOut, slide
+ animation = windowsMove, 1, 5, wind, slide
+ animation = border, 1, 1, liner
+ animation = borderangle, 1, 30, liner, once
+ animation = fade, 1, 10, default
+ animation = workspaces, 1, 5, wind
+}
diff --git a/.config/hypr/hyprlock/theme.conf b/.config/hypr/hyprlock/theme.conf
index 8953bc0..7948f1e 100644
--- a/.config/hypr/hyprlock/theme.conf
+++ b/.config/hypr/hyprlock/theme.conf
@@ -1,115 +1,112 @@
-# By: Arfan on Clouds https://github.com/arfan-on-clouds/hyprclouds
-# Modified by: The HyDE Project
+# HyDE default layout
+# Wallbash generated layout
-$resolve.font=SF Pro Display|https://font.download/dl/font/sf-pro-display.zip
-$resolve.font=AlfaSlabOne|https://font.download/dl/font/alfa-slab-one.zip
+# Local Variables
+$fontFamily = JetBrainsMono Nerd Font
+$fn_greet=echo "Good $(date +%H | awk '{if ($1 < 12) print "Morning"; else if ($1 < 18) print "Afternoon"; else print "Evening"}'), ${USER}"
+
+# GENERAL
+general {
+ no_fade_in = false
+ grace = 0
+ disable_loading_bar = true
+}
# BACKGROUND
background {
monitor =
- color = $wallbash_pry1_rgba
path = $BACKGROUND_PATH
- blur_size = 4
- blur_passes = 3 # 0 disables blurring
- noise = 0.0117
- contrast = 1.3000 # Vibrant!!!
- brightness = 0.8000
- vibrancy = 0.2100
- vibrancy_darkness = 0.0
+ blur_passes = 2
+}
+
+# TIME
+label {
+ monitor =
+ text = $TIME
+ color = $wallbash_txt1_rgba
+ font_size = 90
+ font_family = $fontFamily
+ position = -30, 0
+ halign = right
+ valign = top
+}
+
+# DATE
+label {
+ monitor =
+ text = cmd[update:43200000] date +"%A, %d %B %Y"
+ color = $wallbash_txt2_rgba
+ font_size = 25
+ font_family = $fontFamily
+ position = -30, -150
+ halign = right
+ valign = top
+}
+
+# USER AVATAR
+image {
+ monitor =
+ path = $MPRIS_IMAGE
+ size = 150 # lesser side if not 1:1 ratio
+ reload_time = 0 # seconds between reloading, 0 to reload with SIGUSR2
+ reload_cmd = # command to get new path. if empty, old path will be used. don't run "follow" commands like tail -F
+ position = 0, 0
+ halign = center
+ valign = center
}
# INPUT FIELD
input-field {
monitor =
- size = 190, 50
- outline_thickness = 2
- dots_size = 0.2 # Scale of input-field height, 0.2 - 0.8
- dots_spacing = 0.2 # Scale of dots' absolute size, 0.0 - 1.0
+ size = 200, 50 #!
+ outline_thickness = 3
+ dots_size = 0.33 # Scale of input-field height, 0.2 - 0.8
+ dots_spacing = 0.15 # Scale of dots' absolute size, 0.0 - 1.0
dots_center = true
- fade_on_empty = true
- font_family = SF Pro Display Bold
- placeholder_text =
- hide_input = false
- position = 0, -170
- halign = center
- valign = center
+ dots_rounding = -1 # -1 default circle, -2 follow input-field rounding
outer_color = $wallbash_pry4_rgba
inner_color = $wallbash_pry2_rgba
font_color = $wallbash_3xa9_rgba
+ fade_on_empty = true
+ fade_timeout = 1000 # Milliseconds before fade_on_empty is triggered.
+ placeholder_text = Input Password... # Text rendered in the input box when it's empty.
+ hide_input = false
+ rounding = -1 # -1 means complete rounding (circle/oval)
check_color = $wallbash_pry4_rgba
-
-}
-
-# Hour-Time
-label {
- monitor =
- text = cmd[update:1000] echo -e "$(date +"%I")"
- color = $wallbash_1xa8_rgba
- shadow_passes = 3
- shadow_size = 2
- font_size = 100
- font_family = AlfaSlabOne
- position = 0, 100
- halign = center
- valign = center
-}
-
-# Minute-Time
-label {
- monitor =
- text = cmd[update:1000] echo -e "$(date +"%M")"
- color = $wallbash_3xa9_rgba
- font_size = 100
- font_family = AlfaSlabOne
- shadow_passes = 3
- shadow_size = 2
- position = 0, -20
- halign = center
- valign = center
-}
-
-# Day-Date-Month
-label {
- monitor =
- text = cmd[update:1000] echo -e "$(date +"%d %b %A")"
- color = $wallbash_3xa9_rgba
- shadow_passes = 3
- shadow_size = 1
- font_size = 12
- font_family = JetBrains Mono Nerd Font Mono ExtraBold
- position = 1%, -1%
- halign = left
- valign = top
-}
-
-
-
-# CURRENT SONG
-label {
- monitor =
- text = cmd[update:1000] $MPRIS_TEXT # Outputs the song title when mpris is available, otherwise, it will output the splash command.
- color = $wallbash_3xa9_rgba
- shadow_passes = 3
- shadow_size = 1
- font_size = 14
- font_family = JetBrains Mono Nerd, SF Pro Display Bold
- position = 0, 20
+ fail_color = rgba(FF0000FF) # if authentication failed, changes outer_color and fail message color
+ fail_text = $FAIL ($ATTEMPTS) # can be set to empty
+ fail_transition = 300 # transition time in ms between normal outer_color and fail_color
+ capslock_color = -1
+ numlock_color = -1
+ bothlock_color = -1 # when both locks are active. -1 means don't change outer color (same for above)
+ invert_numlock = false # change color if numlock is off
+ swap_font_color = true # see below
+ position = 0, 80
halign = center
valign = bottom
}
-image {
+
+
+# USER Greeting
+label {
monitor =
- path = $MPRIS_IMAGE
- size = 80 # lesser side if not 1:1 ratio
- rounding = -1 # negative values mean circle
- border_size = 0
- shadow_passes = 3
- shadow_size = 3
- border_color = rgb(221, 221, 221)
- rotate = 0 # degrees, counter-clockwise
- reload_time = 0 # seconds between reloading, 0 to reload with SIGUSR2
- # reload_cmd = # command to get new path. if empty, old path will be used. don't run "follow" commands like tail -F
- position = 0, 10%
+ text = cmd[update:60000] $fn_greet
+ color = $text
+ font_size = 20
+ font_family = $fontFamily Bold
+ position = 0, -190
+ halign = center
+ valign = center
+}
+
+# Mpris and SPLASH
+label {
+ monitor =
+ text = cmd[update:1000] $SPLASH_CMD # Outputs the song title when mpris is available, otherwise, it will output the splash command.
+ color = $wallbash_txt2_rgba
+ font_family = $fontFamily
+ font_size = 15
+ position = 0, 0
halign = center
valign = bottom
}
@@ -134,24 +131,8 @@ label {
text = $LAYOUT
color = $wallbash_4xa9_rgba
font_size = 20
- font_family = JetBrains Mono Nerd, SF Pro Display Bold
+ font_family = $fontFamily
position = -2%, 1%
halign = right
valign = bottom
}
-
-
-# Weather
-#! Put the weather command last to lessen the load time of other modules
-label {
- monitor =
- text = cmd[update:18000000] $WEATHER_CMD
- color = $wallbash_3xa9_rgba
- font_size = 16
- shadow_passes = 3
- shadow_size = 1
- font_family = JetBrains Mono Nerd, SF Pro Display Bold
- position = -1%, -1%
- halign = right
- valign = top
-}
diff --git a/.config/hypr/themes/colors.conf b/.config/hypr/themes/colors.conf
index d2cbb8d..c4267db 100644
--- a/.config/hypr/themes/colors.conf
+++ b/.config/hypr/themes/colors.conf
@@ -3,109 +3,109 @@
# Color group 1
-$wallbash_pry1 = 131311 # primary color 1
+$wallbash_pry1 = 181A0B # primary color 1
$wallbash_txt1 = FFFFFF # text color 1
-$wallbash_1xa1 = 525229 # accent color 1 for primary color 1
-$wallbash_1xa2 = 6B6B3A # accent color 2 for primary color 1
-$wallbash_1xa3 = 7D7D4B # accent color 3 for primary color 1
-$wallbash_1xa4 = 8F8F57 # accent color 4 for primary color 1
-$wallbash_1xa5 = A3A365 # accent color 5 for primary color 1
-$wallbash_1xa6 = C2C27A # accent color 6 for primary color 1
-$wallbash_1xa7 = E6E69A # accent color 7 for primary color 1
-$wallbash_1xa8 = F0F0AA # accent color 8 for primary color 1
-$wallbash_1xa9 = FFFFCC # accent color 9 for primary color 1
+$wallbash_1xa1 = 4C5229 # accent color 1 for primary color 1
+$wallbash_1xa2 = 656B3A # accent color 2 for primary color 1
+$wallbash_1xa3 = 767D4B # accent color 3 for primary color 1
+$wallbash_1xa4 = 878F57 # accent color 4 for primary color 1
+$wallbash_1xa5 = 9BA365 # accent color 5 for primary color 1
+$wallbash_1xa6 = B8C27A # accent color 6 for primary color 1
+$wallbash_1xa7 = DBE69A # accent color 7 for primary color 1
+$wallbash_1xa8 = E6F0AA # accent color 8 for primary color 1
+$wallbash_1xa9 = F8FFCC # accent color 9 for primary color 1
# in rgba format
-$wallbash_pry1_rgba = rgba(19,19,17,1) # primary color 1
-$wallbash_txt1_rgba = rgba(255,255,255,1) # text color 1
-$wallbash_1xa1_rgba = rgba(82,82,41,1) # accent color 1 for primary color 1
-$wallbash_1xa2_rgba = rgba(107,107,58,1) # accent color 2 for primary color 1
-$wallbash_1xa3_rgba = rgba(125,125,75,1) # accent color 3 for primary color 1
-$wallbash_1xa4_rgba = rgba(143,143,87,1) # accent color 4 for primary color 1
-$wallbash_1xa5_rgba = rgba(163,163,101,1) # accent color 5 for primary color 1
-$wallbash_1xa6_rgba = rgba(194,194,122,1) # accent color 6 for primary color 1
-$wallbash_1xa7_rgba = rgba(230,230,154,1) # accent color 7 for primary color 1
-$wallbash_1xa8_rgba = rgba(240,240,170,1) # accent color 8 for primary color 1
-$wallbash_1xa9_rgba = rgba(255,255,204,1) # accent color 9 for primary color 1
+$wallbash_pry1_rgba = rgba(24,26,11,0.95) # primary color 1
+$wallbash_txt1_rgba = rgba(255,255,255,0.95) # text color 1
+$wallbash_1xa1_rgba = rgba(76,82,41,0.95) # accent color 1 for primary color 1
+$wallbash_1xa2_rgba = rgba(101,107,58,0.95) # accent color 2 for primary color 1
+$wallbash_1xa3_rgba = rgba(118,125,75,0.95) # accent color 3 for primary color 1
+$wallbash_1xa4_rgba = rgba(135,143,87,0.95) # accent color 4 for primary color 1
+$wallbash_1xa5_rgba = rgba(155,163,101,0.95) # accent color 5 for primary color 1
+$wallbash_1xa6_rgba = rgba(184,194,122,0.95) # accent color 6 for primary color 1
+$wallbash_1xa7_rgba = rgba(219,230,154,0.95) # accent color 7 for primary color 1
+$wallbash_1xa8_rgba = rgba(230,240,170,0.95) # accent color 8 for primary color 1
+$wallbash_1xa9_rgba = rgba(248,255,204,0.95) # accent color 9 for primary color 1
# Color group 2
-$wallbash_pry2 = 362920 # primary color 2
+$wallbash_pry2 = 3E4838 # primary color 2
$wallbash_txt2 = FFFFFF # text color 2
-$wallbash_2xa1 = 523929 # accent color 1 for primary color 2
-$wallbash_2xa2 = 6B4E3A # accent color 2 for primary color 2
-$wallbash_2xa3 = 7D5F4B # accent color 3 for primary color 2
-$wallbash_2xa4 = 8F6E57 # accent color 4 for primary color 2
-$wallbash_2xa5 = A37F65 # accent color 5 for primary color 2
-$wallbash_2xa6 = C2977A # accent color 6 for primary color 2
-$wallbash_2xa7 = E6B99A # accent color 7 for primary color 2
-$wallbash_2xa8 = F0C7AA # accent color 8 for primary color 2
-$wallbash_2xa9 = FFE1CC # accent color 9 for primary color 2
+$wallbash_2xa1 = 385229 # accent color 1 for primary color 2
+$wallbash_2xa2 = 4C6B3A # accent color 2 for primary color 2
+$wallbash_2xa3 = 5E7D4B # accent color 3 for primary color 2
+$wallbash_2xa4 = 6C8F57 # accent color 4 for primary color 2
+$wallbash_2xa5 = 7CA365 # accent color 5 for primary color 2
+$wallbash_2xa6 = 95C27A # accent color 6 for primary color 2
+$wallbash_2xa7 = B6E69A # accent color 7 for primary color 2
+$wallbash_2xa8 = C4F0AA # accent color 8 for primary color 2
+$wallbash_2xa9 = DFFFCC # accent color 9 for primary color 2
# in rgba format
-$wallbash_pry2_rgba = rgba(54,41,32,1) # primary color 2
-$wallbash_txt2_rgba = rgba(255,255,255,1) # text color 2
-$wallbash_2xa1_rgba = rgba(82,57,41,1) # accent color 1 for primary color 2
-$wallbash_2xa2_rgba = rgba(107,78,58,1) # accent color 2 for primary color 2
-$wallbash_2xa3_rgba = rgba(125,95,75,1) # accent color 3 for primary color 2
-$wallbash_2xa4_rgba = rgba(143,110,87,1) # accent color 4 for primary color 2
-$wallbash_2xa5_rgba = rgba(163,127,101,1) # accent color 5 for primary color 2
-$wallbash_2xa6_rgba = rgba(194,151,122,1) # accent color 6 for primary color 2
-$wallbash_2xa7_rgba = rgba(230,185,154,1) # accent color 7 for primary color 2
-$wallbash_2xa8_rgba = rgba(240,199,170,1) # accent color 8 for primary color 2
-$wallbash_2xa9_rgba = rgba(255,225,204,1) # accent color 9 for primary color 2
+$wallbash_pry2_rgba = rgba(62,72,56,0.95) # primary color 2
+$wallbash_txt2_rgba = rgba(255,255,255,0.95) # text color 2
+$wallbash_2xa1_rgba = rgba(56,82,41,0.95) # accent color 1 for primary color 2
+$wallbash_2xa2_rgba = rgba(76,107,58,0.95) # accent color 2 for primary color 2
+$wallbash_2xa3_rgba = rgba(94,125,75,0.95) # accent color 3 for primary color 2
+$wallbash_2xa4_rgba = rgba(108,143,87,0.95) # accent color 4 for primary color 2
+$wallbash_2xa5_rgba = rgba(124,163,101,0.95) # accent color 5 for primary color 2
+$wallbash_2xa6_rgba = rgba(149,194,122,0.95) # accent color 6 for primary color 2
+$wallbash_2xa7_rgba = rgba(182,230,154,0.95) # accent color 7 for primary color 2
+$wallbash_2xa8_rgba = rgba(196,240,170,0.95) # accent color 8 for primary color 2
+$wallbash_2xa9_rgba = rgba(223,255,204,0.95) # accent color 9 for primary color 2
# Color group 3
-$wallbash_pry3 = 5E4533 # primary color 3
+$wallbash_pry3 = 56625A # primary color 3
$wallbash_txt3 = FFFFFF # text color 3
-$wallbash_3xa1 = 523A29 # accent color 1 for primary color 3
-$wallbash_3xa2 = 6B4E3A # accent color 2 for primary color 3
-$wallbash_3xa3 = 7D604B # accent color 3 for primary color 3
-$wallbash_3xa4 = 8F6E57 # accent color 4 for primary color 3
-$wallbash_3xa5 = A37F65 # accent color 5 for primary color 3
-$wallbash_3xa6 = C2987A # accent color 6 for primary color 3
-$wallbash_3xa7 = E6B99A # accent color 7 for primary color 3
-$wallbash_3xa8 = F0C7AA # accent color 8 for primary color 3
-$wallbash_3xa9 = FFE1CC # accent color 9 for primary color 3
+$wallbash_3xa1 = 295236 # accent color 1 for primary color 3
+$wallbash_3xa2 = 3A6B4A # accent color 2 for primary color 3
+$wallbash_3xa3 = 4B7D5C # accent color 3 for primary color 3
+$wallbash_3xa4 = 578F6A # accent color 4 for primary color 3
+$wallbash_3xa5 = 65A37A # accent color 5 for primary color 3
+$wallbash_3xa6 = 7AC292 # accent color 6 for primary color 3
+$wallbash_3xa7 = 9AE6B3 # accent color 7 for primary color 3
+$wallbash_3xa8 = AAF0C1 # accent color 8 for primary color 3
+$wallbash_3xa9 = CCFFDD # accent color 9 for primary color 3
# in rgba format
-$wallbash_pry3_rgba = rgba(94,69,51,1) # primary color 3
-$wallbash_txt3_rgba = rgba(255,255,255,1) # text color 3
-$wallbash_3xa1_rgba = rgba(82,58,41,1) # accent color 1 for primary color 3
-$wallbash_3xa2_rgba = rgba(107,78,58,1) # accent color 2 for primary color 3
-$wallbash_3xa3_rgba = rgba(125,96,75,1) # accent color 3 for primary color 3
-$wallbash_3xa4_rgba = rgba(143,110,87,1) # accent color 4 for primary color 3
-$wallbash_3xa5_rgba = rgba(163,127,101,1) # accent color 5 for primary color 3
-$wallbash_3xa6_rgba = rgba(194,152,122,1) # accent color 6 for primary color 3
-$wallbash_3xa7_rgba = rgba(230,185,154,1) # accent color 7 for primary color 3
-$wallbash_3xa8_rgba = rgba(240,199,170,1) # accent color 8 for primary color 3
-$wallbash_3xa9_rgba = rgba(255,225,204,1) # accent color 9 for primary color 3
+$wallbash_pry3_rgba = rgba(86,98,90,0.95) # primary color 3
+$wallbash_txt3_rgba = rgba(255,255,255,0.95) # text color 3
+$wallbash_3xa1_rgba = rgba(41,82,54,0.95) # accent color 1 for primary color 3
+$wallbash_3xa2_rgba = rgba(58,107,74,0.95) # accent color 2 for primary color 3
+$wallbash_3xa3_rgba = rgba(75,125,92,0.95) # accent color 3 for primary color 3
+$wallbash_3xa4_rgba = rgba(87,143,106,0.95) # accent color 4 for primary color 3
+$wallbash_3xa5_rgba = rgba(101,163,122,0.95) # accent color 5 for primary color 3
+$wallbash_3xa6_rgba = rgba(122,194,146,0.95) # accent color 6 for primary color 3
+$wallbash_3xa7_rgba = rgba(154,230,179,0.95) # accent color 7 for primary color 3
+$wallbash_3xa8_rgba = rgba(170,240,193,0.95) # accent color 8 for primary color 3
+$wallbash_3xa9_rgba = rgba(204,255,221,0.95) # accent color 9 for primary color 3
# Color group 4
-$wallbash_pry4 = 8B6F56 # primary color 4
-$wallbash_txt4 = FFFFFF # text color 4
-$wallbash_4xa1 = 523C29 # accent color 1 for primary color 4
-$wallbash_4xa2 = 6B513A # accent color 2 for primary color 4
-$wallbash_4xa3 = 7D634B # accent color 3 for primary color 4
-$wallbash_4xa4 = 8F7157 # accent color 4 for primary color 4
-$wallbash_4xa5 = A38265 # accent color 5 for primary color 4
-$wallbash_4xa6 = C29C7A # accent color 6 for primary color 4
-$wallbash_4xa7 = E6BD9A # accent color 7 for primary color 4
-$wallbash_4xa8 = F0CBAA # accent color 8 for primary color 4
-$wallbash_4xa9 = FFE4CC # accent color 9 for primary color 4
+$wallbash_pry4 = A4A768 # primary color 4
+$wallbash_txt4 = 131314 # text color 4
+$wallbash_4xa1 = 505229 # accent color 1 for primary color 4
+$wallbash_4xa2 = 696B3A # accent color 2 for primary color 4
+$wallbash_4xa3 = 7B7D4B # accent color 3 for primary color 4
+$wallbash_4xa4 = 8C8F57 # accent color 4 for primary color 4
+$wallbash_4xa5 = A0A365 # accent color 5 for primary color 4
+$wallbash_4xa6 = BEC27A # accent color 6 for primary color 4
+$wallbash_4xa7 = E2E69A # accent color 7 for primary color 4
+$wallbash_4xa8 = ECF0AA # accent color 8 for primary color 4
+$wallbash_4xa9 = FDFFCC # accent color 9 for primary color 4
# in rgba format
-$wallbash_pry4_rgba = rgba(139,111,86,1) # primary color 4
-$wallbash_txt4_rgba = rgba(255,255,255,1) # text color 4
-$wallbash_4xa1_rgba = rgba(82,60,41,1) # accent color 1 for primary color 4
-$wallbash_4xa2_rgba = rgba(107,81,58,1) # accent color 2 for primary color 4
-$wallbash_4xa3_rgba = rgba(125,99,75,1) # accent color 3 for primary color 4
-$wallbash_4xa4_rgba = rgba(143,113,87,1) # accent color 4 for primary color 4
-$wallbash_4xa5_rgba = rgba(163,130,101,1) # accent color 5 for primary color 4
-$wallbash_4xa6_rgba = rgba(194,156,122,1) # accent color 6 for primary color 4
-$wallbash_4xa7_rgba = rgba(230,189,154,1) # accent color 7 for primary color 4
-$wallbash_4xa8_rgba = rgba(240,203,170,1) # accent color 8 for primary color 4
-$wallbash_4xa9_rgba = rgba(255,228,204,1) # accent color 9 for primary color 4
+$wallbash_pry4_rgba = rgba(164,167,104,0.95) # primary color 4
+$wallbash_txt4_rgba = rgba(19,19,20,0.95) # text color 4
+$wallbash_4xa1_rgba = rgba(80,82,41,0.95) # accent color 1 for primary color 4
+$wallbash_4xa2_rgba = rgba(105,107,58,0.95) # accent color 2 for primary color 4
+$wallbash_4xa3_rgba = rgba(123,125,75,0.95) # accent color 3 for primary color 4
+$wallbash_4xa4_rgba = rgba(140,143,87,0.95) # accent color 4 for primary color 4
+$wallbash_4xa5_rgba = rgba(160,163,101,0.95) # accent color 5 for primary color 4
+$wallbash_4xa6_rgba = rgba(190,194,122,0.95) # accent color 6 for primary color 4
+$wallbash_4xa7_rgba = rgba(226,230,154,0.95) # accent color 7 for primary color 4
+$wallbash_4xa8_rgba = rgba(236,240,170,0.95) # accent color 8 for primary color 4
+$wallbash_4xa9_rgba = rgba(253,255,204,0.95) # accent color 9 for primary color 4
diff --git a/.config/hypr/themes/theme.conf b/.config/hypr/themes/theme.conf
index 9894b1c..e667f2c 100644
--- a/.config/hypr/themes/theme.conf
+++ b/.config/hypr/themes/theme.conf
@@ -1,64 +1,34 @@
-# // P̳r̳a̳s̳a̳n̳t̳h̳ R̳a̳n̳g̳a̳n̳
-$GTK_THEME=Grukai
-$ICON_THEME=buuf-icons-for-plasma
+$GTK_THEME=Kripton
+$ICON_THEME=Vivid-Glassy-Dark-Icons
+$CURSOR_THEME=Sweet-cursors
$COLOR_SCHEME=prefer-dark
-$CURSOR_THEME=Simp1e
-$CURSOR_SIZE=18
-$FONT = Inter
-
-
-# Optional: The varibles above will be set automatically when the theme is loaded
-# This exec commands will soon be deprecated
+$CURSOR_SIZE=20
+$FONT=Noto_Sans
general {
- gaps_in = 3
- gaps_out = 5
- border_size = 2
- col.active_border = rgba(B3BBA3ff) rgba(1A1A1Aff) 45deg
- col.inactive_border = rgba(232425ff) rgba(444742ff) 45deg
+ gaps_in = 6
+ gaps_out = 12
+ border_size = 3
+ col.active_border = rgba(78c6ebff) rgba(8289a3ff) 45deg
+ col.inactive_border = rgba(7, 15, 42, 0.58)
layout = dwindle
resize_on_border = true
}
-group {
- col.border_active = rgba(B3BBA3ff) rgba(1A1A1Aff) 45deg
- col.border_inactive = rgba(232425cc) rgba(444742cc) 45deg
- col.border_locked_active = rgba(FFFFFFff) rgba(0D0D0Dff) 45deg
- col.border_locked_inactive = rgba(FFFFFFcc) rgba(FFFFFFcc) 45deg
-}
-
decoration {
- rounding = 8
- shadow:enabled = true
-
- active_opacity = 0.95
- inactive_opacity = 0.8
-
- dim_inactive = true
- dim_strength = 0.15
+ rounding = 6
blur {
enabled = yes
- size = 2
- passes = 7
+ size = 4
+ passes = 2
new_optimizations = on
ignore_opacity = on
xray = false
- brightness = 0.9
- }
-
- shadow {
- enabled = true
- ignore_window = false
- offset = 4 4 4 4
- range = 9
- render_power = 1
- scale = 1.0
- color = 0xaa130d06
- color_inactive = 0x66130d06
}
}
-layerrule = blur,waybar
+blurls = waybar
+
diff --git a/.config/hypr/themes/wallbash.conf b/.config/hypr/themes/wallbash.conf
index 50cccea..b864717 100644
--- a/.config/hypr/themes/wallbash.conf
+++ b/.config/hypr/themes/wallbash.conf
@@ -1,19 +1,19 @@
# Auto-generated by HyDE // Read-only
# // ----------------------------
-# HyDE Theme: Grukai
-# Configuration File: "/home/elleoma/.config/hyde/themes/Grukai/hypr.theme"
+# HyDE Theme: Code Garden
+# Configuration File: "/home/elleoma/.config/hyde/themes/Code Garden/hypr.theme"
# Wallbash Mode : theme
# // ----------------------------
-$HYDE_THEME=Grukai
-$GTK_THEME=Grukai
+$HYDE_THEME=Code Garden
+$GTK_THEME=Kripton
$COLOR-SCHEME=prefer-dark
-$ICON_THEME=buuf-icons-for-plasma
+$ICON_THEME=Vivid-Glassy-Dark-Icons
-$CURSOR_THEME=Simp1e
-$CURSOR_SIZE=18
+$CURSOR_THEME=Sweet-cursors
+$CURSOR_SIZE=20
-$FONT=Inter
+$FONT=Noto_Sans
$FONT_SIZE=10
$DOCUMENT_FONT=Cantarell
$DOCUMENT_FONT_SIZE=10
diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index 3aa9d03..c5c2a1e 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -1,5 +1,5 @@
{
- "LuaSnip": { "branch": "master", "commit": "66b5c2707e624dcd2cd3605676c64a2efe47e9d1" },
+ "LuaSnip": { "branch": "master", "commit": "3d5bced1b9ae69fa3f9b1942e28af5dbc537f946" },
"NvChad": { "branch": "v2.5", "commit": "29ebe31ea6a4edf351968c76a93285e6e108ea08" },
"base46": { "branch": "v2.5", "commit": "fde7a2cd54599e148d376f82980407c2d24b0fa2" },
"cmp-async-path": { "branch": "main", "commit": "0ed1492f59e730c366d261a5ad822fa37e44c325" },
@@ -8,29 +8,29 @@
"cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
"cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
"conform.nvim": { "branch": "master", "commit": "973f3cb73887d510321653044791d7937c7ec0fa" },
- "crates.nvim": { "branch": "main", "commit": "33ec63096f7f72b610ed3bb1760be34c2fffb694" },
+ "crates.nvim": { "branch": "main", "commit": "c915ab5334a46178f64ce17ab606a79454bcd14f" },
"friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
- "gitsigns.nvim": { "branch": "main", "commit": "0cb5a7753d3c4b8e9cfdc9d88d9110cb8d4b1544" },
- "image.nvim": { "branch": "master", "commit": "4c51d6202628b3b51e368152c053c3fb5c5f76f2" },
+ "gitsigns.nvim": { "branch": "main", "commit": "b01433169be710d6c69f7b4ee264d9670698b831" },
"indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
- "mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" },
+ "mason.nvim": { "branch": "main", "commit": "3671ab0d40aa5bd24b1686562bd0a23391ecf76a" },
"menu": { "branch": "main", "commit": "7a0a4a2896b715c066cfbe320bdc048091874cc6" },
"minty": { "branch": "main", "commit": "aafc9e8e0afe6bf57580858a2849578d8d8db9e0" },
"nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" },
"nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" },
- "nvim-dap": { "branch": "master", "commit": "cc77338e6e34c79f1c638f51ae4160dc9bfb05de" },
+ "nvim-dap": { "branch": "master", "commit": "5dd4d50f2e6a2eaf9e57fad023d294ef371bda35" },
"nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" },
- "nvim-lspconfig": { "branch": "master", "commit": "5bb3fb4a63eb38361f3f992618f65dd4fa52e72b" },
+ "nvim-lspconfig": { "branch": "master", "commit": "4d3b3bb8815fbe37bcaf3dbdb12a22382bc11ebe" },
"nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
- "nvim-tree.lua": { "branch": "master", "commit": "b0b49552c9462900a882fe772993b01d780445fe" },
+ "nvim-tree.lua": { "branch": "master", "commit": "65bae449224b8a3bc149471b96587b23b13a9946" },
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
- "nvim-web-devicons": { "branch": "master", "commit": "0422a19d9aa3aad2c7e5cca167e5407b13407a9d" },
- "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
+ "nvim-web-devicons": { "branch": "master", "commit": "4a8369f4c78ef6f6f895f0cec349e48f74330574" },
+ "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
"rust.vim": { "branch": "master", "commit": "889b9a7515db477f4cb6808bef1769e53493c578" },
- "rustaceanvim": { "branch": "master", "commit": "c86d5d36456fdaa91a3a9dddb4bac09c58fc8cd3" },
+ "rustaceanvim": { "branch": "master", "commit": "66398662c07d265b226897500ed50eafba3dffb4" },
"telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
- "ui": { "branch": "v3.0", "commit": "80b577c0acdd458b60db62ba2a84625abb638bbb" },
+ "ui": { "branch": "v3.0", "commit": "dc4950f5bd4117e2da108b681506c908b93d4a62" },
+ "vim-wakatime": { "branch": "master", "commit": "3403495670f0ee08887401a28f8430dc4ac67429" },
"volt": { "branch": "main", "commit": "7b8c5e790120d9f08c8487dcb80692db6d2087a1" },
"which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
}
diff --git a/.config/nvim/lua/options.lua b/.config/nvim/lua/options.lua
index 738f20b..0fa2db9 100644
--- a/.config/nvim/lua/options.lua
+++ b/.config/nvim/lua/options.lua
@@ -1,6 +1,12 @@
require "nvchad.options"
-- add yours here!
+local o = vim.o
+
+-- set tabsize
+o.tabstop = 4
+o.expandtab = true
+o.shiftwidth = 4
-- local o = vim.o
--- o.cursorlineopt ='both' -- to enable cursorline!
+o.cursorlineopt ='both' -- to enable cursorline!
diff --git a/.config/nvim/lua/plugins/init.lua b/.config/nvim/lua/plugins/init.lua
index 1f9dbfd..656b042 100644
--- a/.config/nvim/lua/plugins/init.lua
+++ b/.config/nvim/lua/plugins/init.lua
@@ -86,14 +86,19 @@ return {
},
{
- "3rd/image.nvim",
- build = false, -- so that it doesn't build the rock https://github.com/3rd/image.nvim/issues/91#issuecomment-2453430239
- lazy = false,
- opts = {
- processor = "magick_cli",
- }
+ 'wakatime/vim-wakatime',
+ lazy = false
},
+ -- {
+ -- "3rd/image.nvim",
+ -- build = false, -- so that it doesn't build the rock https://github.com/3rd/image.nvim/issues/91#issuecomment-2453430239
+ -- lazy = false,
+ -- opts = {
+ -- processor = "magick_cli",
+ -- }
+ -- },
+
-- {
-- "nvim-treesitter/nvim-treesitter",
-- opts = {
diff --git a/.config/zsh/conf.d/hyde/terminal.zsh b/.config/zsh/conf.d/hyde/terminal.zsh
index 63a0106..b8f34ab 100644
--- a/.config/zsh/conf.d/hyde/terminal.zsh
+++ b/.config/zsh/conf.d/hyde/terminal.zsh
@@ -152,7 +152,7 @@ function _load_compinit() {
function _load_prompt() {
# Try to load prompts immediately
- if ! source ${ZDOTDIR}/prompt.zsh > /dev/null 2>&1; then
+ if ! source ${ZDOTDIR}/prompt.zsh >/dev/null 2>&1; then
[[ -f $ZDOTDIR/conf.d/hyde/prompt.zsh ]] && source $ZDOTDIR/conf.d/hyde/prompt.zsh
fi
}
@@ -173,8 +173,11 @@ if [[ -f $HOME/.zsh_history ]] && [[ ! -f $HISTFILE ]]; then
echo "Please manually move $HOME/.zsh_history to $HISTFILE"
echo "Or move it somewhere else to avoid conflicts"
fi
+HISTSIZE=10000
+SAVEHIST=10000
-export HISTFILE ZSH_AUTOSUGGEST_STRATEGY
+
+export HISTFILE ZSH_AUTOSUGGEST_STRATEGY HISTSIZE SAVEHIST
# HyDE Package Manager
PM_COMMAND=(hyde-shell pm)
@@ -190,35 +193,49 @@ fi
_load_compinit
-
if [[ ${HYDE_ZSH_NO_PLUGINS} != "1" ]]; then
- # Deduplicate omz plugins()
_dedup_zsh_plugins
-
- if [[ "$HYDE_ZSH_OMZ_DEFER" == "1" ]]; then
+ if [[ "$HYDE_ZSH_OMZ_DEFER" == "1" ]] && [[ -r $ZSH/oh-my-zsh.sh ]]; then
+ # Loads the buggy deferred oh-my-zsh plugin system by HyDE // This is only for oh-my-zsh and compatibility
_load_deferred_plugin_system_by_hyde
_load_prompt # This disables transient prompts sadly
- else
- [[ -r $ZSH/oh-my-zsh.sh ]] && source $ZSH/oh-my-zsh.sh
+ elif source $ZDOTDIR/plugin.zsh >/dev/null 2>&1; then
+ # Load plugins from the user's plugin.zsh file
+ # This is useful for users who want to use their own plugin system
+ source $ZDOTDIR/plugin.zsh
_load_prompt
_load_functions
_load_completions
+ elif [[ -r $ZSH/oh-my-zsh.sh ]]; then
+ # Load oh-my-zsh if it exists in the ZSH directory
+ # Default if the $ZDOTDIR/plugin.zsh file does not exist or returns an error
+ source $ZSH/oh-my-zsh.sh
+ _load_prompt
+ _load_functions
+ _load_completions
+ else
+ echo "No plugin system found. Please install a plugin system or create a $ZDOTDIR/plugin.zsh file."
+ echo "You can use $ZDOTDIR/plugin.zsh file to load your own plugins."
fi
else
+ # Load user plugins if they exist
+ # Assumes user has a plugin.zsh file in their $ZDOTDIR
+ [[ -r $ZDOTDIR/plugin.zsh ]] && source $ZDOTDIR/plugin.zsh
_load_prompt
_load_functions
_load_completions
-
- chmod +r $ZDOTDIR/.zshrc # Make sure .zshrc is readable
- [[ -r $ZDOTDIR/.zshrc ]] && source $ZDOTDIR/.zshrc
fi
+__package_manager () {
+ ${PM_COMMAND[@]} "$@"
+}
+
alias c='clear' \
- in='${PM_COMMAND[@]} install' \
- un='${PM_COMMAND[@]} remove' \
- up='${PM_COMMAND[@]} upgrade' \
- pl='${PM_COMMAND[@]} search installed' \
- pa='${PM_COMMAND[@]} search all' \
+ in='__package_manager install' \
+ un='__package_manager remove' \
+ up='__package_manager upgrade' \
+ pl='__package_manager search installed' \
+ pa='__package_manager search all' \
vc='code' \
fastfetch='fastfetch --logo-type kitty' \
..='cd ..' \
@@ -227,3 +244,5 @@ alias c='clear' \
.4='cd ../../../..' \
.5='cd ../../../../..' \
mkdir='mkdir -p'
+
+