diff --git a/hypr/frappe.conf b/hypr/frappe.conf deleted file mode 100644 index 97dff8e..0000000 --- a/hypr/frappe.conf +++ /dev/null @@ -1,61 +0,0 @@ -$rosewaterAlpha = f2d5cf -$flamingoAlpha = eebebe -$pinkAlpha = f4b8e4 -$mauveAlpha = ca9ee6 -$redAlpha = e78284 -$maroonAlpha = ea999c -$peachAlpha = ef9f76 -$yellowAlpha = e5c890 -$greenAlpha = a6d189 -$tealAlpha = 81c8be -$skyAlpha = 99d1db -$sapphireAlpha = 85c1dc -$blueAlpha = 8caaee -$lavenderAlpha = babbf1 - -$textAlpha = c6d0f5 -$subtext1Alpha = b5bfe2 -$subtext0Alpha = a5adce - -$overlay2Alpha = 949cbb -$overlay1Alpha = 838ba7 -$overlay0Alpha = 737994 - -$surface2Alpha = 626880 -$surface1Alpha = 51576d -$surface0Alpha = 414559 - -$baseAlpha = 303446 -$mantleAlpha = 292c3c -$crustAlpha = 232634 - -$rosewater = 0xfff2d5cf -$flamingo = 0xffeebebe -$pink = 0xfff4b8e4 -$mauve = 0xffca9ee6 -$red = 0xffe78284 -$maroon = 0xffea999c -$peach = 0xffef9f76 -$yellow = 0xffe5c890 -$green = 0xffa6d189 -$teal = 0xff81c8be -$sky = 0xff99d1db -$sapphire = 0xff85c1dc -$blue = 0xff8caaee -$lavender = 0xffbabbf1 - -$text = 0xffc6d0f5 -$subtext1 = 0xffb5bfe2 -$subtext0 = 0xffa5adce - -$overlay2 = 0xff949cbb -$overlay1 = 0xff838ba7 -$overlay0 = 0xff737994 - -$surface2 = 0xff626880 -$surface1 = 0xff51576d -$surface0 = 0xff414559 - -$base = 0xff303446 -$mantle = 0xff292c3c -$crust = 0xff232634 diff --git a/hypr/latte.conf b/hypr/latte.conf new file mode 100644 index 0000000..10cd14b --- /dev/null +++ b/hypr/latte.conf @@ -0,0 +1,61 @@ +$rosewaterAlpha = dc8a78 +$flamingoAlpha = dd7878 +$pinkAlpha = ea76cb +$mauveAlpha = 8839ef +$redAlpha = d20f39 +$maroonAlpha = e64553 +$peachAlpha = fe640b +$yellowAlpha = df8e1d +$greenAlpha = 40a02b +$tealAlpha = 179299 +$skyAlpha = 04a5e5 +$sapphireAlpha = 209fb5 +$blueAlpha = 1e66f5 +$lavenderAlpha = 7287fd + +$textAlpha = 4c4f69 +$subtext1Alpha = 5c5f77 +$subtext0Alpha = 6c6f85 + +$overlay2Alpha = 7c7f93 +$overlay1Alpha = 8c8fa1 +$overlay0Alpha = 9ca0b0 + +$surface2Alpha = acb0be +$surface1Alpha = bcc0cc +$surface0Alpha = ccd0da + +$baseAlpha = eff1f5 +$mantleAlpha = e6e9ef +$crustAlpha = dce0e8 + +$rosewater = 0xffdc8a78 +$flamingo = 0xffdd7878 +$pink = 0xffea76cb +$mauve = 0xff8839ef +$red = 0xffd20f39 +$maroon = 0xffe64553 +$peach = 0xfffe640b +$yellow = 0xffdf8e1d +$green = 0xff40a02b +$teal = 0xff179299 +$sky = 0xff04a5e5 +$sapphire = 0xff209fb5 +$blue = 0xff1e66f5 +$lavender = 0xff7287fd + +$text = 0xff4c4f69 +$subtext1 = 0xff5c5f77 +$subtext0 = 0xff6c6f85 + +$overlay2 = 0xff7c7f93 +$overlay1 = 0xff8c8fa1 +$overlay0 = 0xff9ca0b0 + +$surface2 = 0xffacb0be +$surface1 = 0xffbcc0cc +$surface0 = 0xffccd0da + +$base = 0xffeff1f5 +$mantle = 0xffe6e9ef +$crust = 0xffdce0e8 diff --git a/hypr/theme.conf b/hypr/theme.conf index 7a2950d..2e39d08 100644 --- a/hypr/theme.conf +++ b/hypr/theme.conf @@ -21,7 +21,7 @@ layerrule = blur,waybar # Window Customization -source = ~/.config/hypr/frappe.conf +source = ~/.config/hypr/latte.conf general { gaps_in = 15 diff --git a/waybar/config.json b/waybar/config.json index d68ed08..e6655e9 100755 --- a/waybar/config.json +++ b/waybar/config.json @@ -3,7 +3,7 @@ "name": "main", "layer": "top", "position": "top", - "height": 42, + "height": 48, "spacing": 4, "margin-top": 4, "margin-bottom": 0, @@ -31,7 +31,7 @@ "critical": 15 }, "format": "{icon} {capacity}%", - "format-icons": ["", "", "", "", "", ""], + "format-icons": ["", "", "", "", ""], "max-length": 25 }, "clock": { diff --git a/waybar/frappe.css b/waybar/frappe.css deleted file mode 100644 index 18520fb..0000000 --- a/waybar/frappe.css +++ /dev/null @@ -1,37 +0,0 @@ -/* -* -* Catppuccin Frappe palette -* Maintainer: rubyowo -* -*/ - -@define-color base #303446; -@define-color mantle #292c3c; -@define-color crust #232634; - -@define-color text #c6d0f5; -@define-color subtext0 #a5adce; -@define-color subtext1 #b5bfe2; - -@define-color surface0 #414559; -@define-color surface1 #51576d; -@define-color surface2 #626880; - -@define-color overlay0 #737994; -@define-color overlay1 #838ba7; -@define-color overlay2 #949cbb; - -@define-color blue #8caaee; -@define-color lavender #babbf1; -@define-color sapphire #85c1dc; -@define-color sky #99d1db; -@define-color teal #81c8be; -@define-color green #a6d189; -@define-color yellow #e5c890; -@define-color peach #ef9f76; -@define-color maroon #ea999c; -@define-color red #e78284; -@define-color mauve #ca9ee6; -@define-color pink #f4b8e4; -@define-color flamingo #eebebe; -@define-color rosewater #f2d5cf; diff --git a/waybar/latte.css b/waybar/latte.css new file mode 100644 index 0000000..085cc3e --- /dev/null +++ b/waybar/latte.css @@ -0,0 +1,37 @@ +/* +* +* Catppuccin Latte palette +* Maintainer: rubyowo +* +*/ + +@define-color base #eff1f5; +@define-color mantle #e6e9ef; +@define-color crust #dce0e8; + +@define-color text #4c4f69; +@define-color subtext0 #6c6f85; +@define-color subtext1 #5c5f77; + +@define-color surface0 #ccd0da; +@define-color surface1 #bcc0cc; +@define-color surface2 #acb0be; + +@define-color overlay0 #9ca0b0; +@define-color overlay1 #8c8fa1; +@define-color overlay2 #7c7f93; + +@define-color blue #1e66f5; +@define-color lavender #7287fd; +@define-color sapphire #209fb5; +@define-color sky #04a5e5; +@define-color teal #179299; +@define-color green #40a02b; +@define-color yellow #df8e1d; +@define-color peach #fe640b; +@define-color maroon #e64553; +@define-color red #d20f39; +@define-color mauve #8839ef; +@define-color pink #ea76cb; +@define-color flamingo #dd7878; +@define-color rosewater #dc8a78; diff --git a/waybar/style.css b/waybar/style.css index 268f4fa..6748cc5 100755 --- a/waybar/style.css +++ b/waybar/style.css @@ -1,4 +1,4 @@ -@import "frappe.css"; +@import "latte.css"; * { border: none; @@ -10,10 +10,9 @@ } window#waybar { - background: @mantle; - background-color: transparent; - color: @text; - border-bottom: 4px solid @crust; + background: transparent; + color: @peach; + /*border-bottom: 4px solid @crust;*/ border-radius: 0px; padding: 4px; } @@ -35,17 +34,18 @@ window#waybar.hidden { } #workspaces button.active { - color: @lavender; - border-top: 2px solid @lavender; + color: @peach; + border-top: 2px solid @peach; transition: all 0.1s ease; } .modules-left, .modules-center, .modules-right { - padding: 0 4 4 4px; + padding: 4px; } +#battery, #clock, #cpu, #disk, @@ -63,6 +63,7 @@ window#waybar.hidden { padding: 0 10px; } +/* #pulseaudio { color: @sapphire; } @@ -78,7 +79,7 @@ window#waybar.hidden { #temperature { color: @sky; } - +*/