diff --git a/src/.config/alacritty/alacritty.yml b/src/.config/alacritty/alacritty.yml
index c8b6add..d9ecc44 100644
--- a/src/.config/alacritty/alacritty.yml
+++ b/src/.config/alacritty/alacritty.yml
@@ -1,2 +1,2 @@
import:
- - ~/.config/alacritty/catppuccin/catppuccin-macchiato.yml
+ - ~/.config/alacritty/theme.yml
\ No newline at end of file
diff --git a/src/.config/alacritty/catppuccin b/src/.config/alacritty/catppuccin
deleted file mode 160000
index 3c808cb..0000000
--- a/src/.config/alacritty/catppuccin
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3c808cbb4f9c87be43ba5241bc57373c793d2f17
diff --git a/src/.config/alacritty/theme.yml b/src/.config/alacritty/theme.yml
new file mode 100644
index 0000000..2c3f607
--- /dev/null
+++ b/src/.config/alacritty/theme.yml
@@ -0,0 +1,49 @@
+colors:
+ primary:
+ background: "#282a36"
+ foreground: "#f8f8f2"
+ bright_foreground: "#ffffff"
+ cursor:
+ text: "#282a36"
+ cursor: "#f8f8f2"
+ vi_mode_cursor:
+ text: CellBackground
+ cursor: CellForeground
+ selection:
+ text: CellForeground
+ background: "#44475a"
+ normal:
+ black: "#21222c"
+ red: "#ff5555"
+ green: "#50fa7b"
+ yellow: "#f1fa8c"
+ blue: "#bd93f9"
+ magenta: "#ff79c6"
+ cyan: "#8be9fd"
+ white: "#f8f8f2"
+ bright:
+ black: "#6272a4"
+ red: "#ff6e6e"
+ green: "#69ff94"
+ yellow: "#ffffa5"
+ blue: "#d6acff"
+ magenta: "#ff92df"
+ cyan: "#a4ffff"
+ white: "#ffffff"
+ search:
+ matches:
+ foreground: "#44475a"
+ background: "#50fa7b"
+ focused_match:
+ foreground: "#44475a"
+ background: "#ffb86c"
+ footer_bar:
+ background: "#282a36"
+ foreground: "#f8f8f2"
+ hints:
+ start:
+ foreground: "#282a36"
+ background: "#f1fa8c"
+ end:
+ foreground: "#f1fa8c"
+ background: "#282a36"
diff --git a/src/.config/hypr/hyprland.conf b/src/.config/hypr/hyprland.conf
index a400c8e..c5a84c8 100644
--- a/src/.config/hypr/hyprland.conf
+++ b/src/.config/hypr/hyprland.conf
@@ -1,4 +1,4 @@
-source=~/.config/hypr/macchiato.conf
+source=~/.config/hypr/theme.conf
# This is for my workstation.
# monitor=,highres,auto,auto is for my laptop.
@@ -44,11 +44,6 @@ general {
gaps_out = 0
border_size = 3
- col.active_border = $pink
- col.inactive_border = $surface0
-
- col.group_border_active=$flamingo
- col.group_border=$surface0
layout = dwindle
}
@@ -59,8 +54,6 @@ decoration {
drop_shadow = yes
shadow_range = 4
shadow_render_power = 3
- col.shadow=$surface0
- col.shadow_inactive=$surface0
}
animations {
diff --git a/src/.config/hypr/macchiato.conf b/src/.config/hypr/macchiato.conf
deleted file mode 100644
index 91a88a1..0000000
--- a/src/.config/hypr/macchiato.conf
+++ /dev/null
@@ -1,61 +0,0 @@
-$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
-
-$textAlpha = cad3f5
-$subtext1Alpha = b8c0e0
-$subtext0Alpha = a5adcb
-
-$overlay2Alpha = 939ab7
-$overlay1Alpha = 8087a2
-$overlay0Alpha = 6e738d
-
-$surface2Alpha = 5b6078
-$surface1Alpha = 494d64
-$surface0Alpha = 363a4f
-
-$baseAlpha = 24273a
-$mantleAlpha = 1e2030
-$crustAlpha = 181926
-
-$rosewater = 0xfff5e0dc
-$flamingo = 0xfff2cdcd
-$pink = 0xfff5c2e7
-$mauve = 0xffcba6f7
-$red = 0xfff38ba8
-$maroon = 0xffeba0ac
-$peach = 0xfffab387
-$yellow = 0xfff9e2af
-$green = 0xffa6e3a1
-$teal = 0xff94e2d5
-$sky = 0xff89dceb
-$sapphire = 0xff74c7ec
-$blue = 0xff89b4fa
-$lavender = 0xffb4befe
-
-$text = 0xffcdd6f4
-$subtext1 = 0xffbac2de
-$subtext0 = 0xffa6adc8
-
-$overlay2 = 0xff9399b2
-$overlay1 = 0xff7f849c
-$overlay0 = 0xff6c7086
-
-$surface2 = 0xff585b70
-$surface1 = 0xff45475a
-$surface0 = 0xff313244
-
-$base = 0xff1e1e2e
-$mantle = 0xff181825
-$crust = 0xff11111b
diff --git a/src/.config/hypr/theme.conf b/src/.config/hypr/theme.conf
new file mode 100644
index 0000000..84e978c
--- /dev/null
+++ b/src/.config/hypr/theme.conf
@@ -0,0 +1,28 @@
+# dracula/hyprland
+general {
+ col.active_border = rgb(44475a) rgb(bd93f9) 90deg
+ col.inactive_border = rgba(44475aaa)
+ col.group_border = rgba(282a36dd)
+ col.group_border_active = rgb(bd93f9) rgb(44475a) 90deg
+ # non-gradient alternative
+ #col.active_border = rgb(bd93f9)
+ #col.inactive_border = rgba(44475aaa)
+ #col.group_border = rgba(282a36dd)
+ #col.group_border_active = rgb(bd93f9)
+ # darker alternative
+ #col.active_border = rgb(44475a) # or rgb(6272a4)
+ #col.inactive_border = rgb(282a36)
+ #col.group_border = rgb(282a36)
+ #col.group_border_active = rgb(44475a) # or rgb(6272a4)
+
+}
+decoration {
+ col.shadow = rgba(1E202966)
+ # suggested shadow setting
+ #drop_shadow = yes
+ #shadow_range = 60
+ #shadow_offset = 1 2
+ #shadow_render_power = 3
+ #shadow_scale = 0.97
+}
+#windowrulev2 = bordercolor rgb(ff5555),xwayland:1 # check if window is xwayland
\ No newline at end of file
diff --git a/src/.config/mako/config b/src/.config/mako/config
index 17ba0ec..4146842 100644
--- a/src/.config/mako/config
+++ b/src/.config/mako/config
@@ -1,2 +1,12 @@
-background-color=#24273aef
-border-color=#363a4fff
\ No newline at end of file
+background-color=#282a36
+text-color=#44475a
+border-color=#282a36
+
+[urgency=low]
+border-color=#282a36
+
+[urgency=normal]
+border-color=#f1fa8c
+
+[urgency=high]
+border-color=#ff5555
\ No newline at end of file
diff --git a/src/.config/rofi/catppuccin-macchiato.rasi b/src/.config/rofi/catppuccin-macchiato.rasi
deleted file mode 100644
index 696d769..0000000
--- a/src/.config/rofi/catppuccin-macchiato.rasi
+++ /dev/null
@@ -1,111 +0,0 @@
-* {
- bg-col: #24273a;
- bg-col-light: #24273a;
- border-col: #24273a;
- selected-col: #24273a;
- blue: #8aadf4;
- fg-col: #cad3f5;
- fg-col2: #ed8796;
- grey: #6e738d;
-
- width: 600;
- font: "JetBrainsMono Nerd Font 14";
-}
-
-element-text, element-icon , mode-switcher {
- background-color: inherit;
- text-color: inherit;
-}
-
-window {
- height: 360px;
- border: 3px;
- border-color: @border-col;
- background-color: @bg-col;
-}
-
-mainbox {
- background-color: @bg-col;
-}
-
-inputbar {
- children: [prompt,entry];
- background-color: @bg-col;
- border-radius: 5px;
- padding: 2px;
-}
-
-prompt {
- background-color: @blue;
- padding: 6px;
- text-color: @bg-col;
- border-radius: 3px;
- margin: 20px 0px 0px 20px;
-}
-
-textbox-prompt-colon {
- expand: false;
- str: ":";
-}
-
-entry {
- padding: 6px;
- margin: 20px 0px 0px 10px;
- text-color: @fg-col;
- background-color: @bg-col;
-}
-
-listview {
- border: 0px 0px 0px;
- padding: 6px 0px 0px;
- margin: 10px 0px 0px 20px;
- columns: 2;
- lines: 5;
- background-color: @bg-col;
-}
-
-element {
- padding: 5px;
- background-color: @bg-col;
- text-color: @fg-col ;
-}
-
-element-icon {
- size: 25px;
-}
-
-element selected {
- background-color: @selected-col ;
- text-color: @fg-col2 ;
-}
-
-mode-switcher {
- spacing: 0;
- }
-
-button {
- padding: 10px;
- background-color: @bg-col-light;
- text-color: @grey;
- vertical-align: 0.5;
- horizontal-align: 0.5;
-}
-
-button selected {
- background-color: @bg-col;
- text-color: @blue;
-}
-
-message {
- background-color: @bg-col-light;
- margin: 2px;
- padding: 2px;
- border-radius: 5px;
-}
-
-textbox {
- padding: 6px;
- margin: 20px 0px 0px 20px;
- text-color: @blue;
- background-color: @bg-col-light;
-}
diff --git a/src/.config/rofi/config.rasi b/src/.config/rofi/config.rasi
index 3a3a235..f15fe9f 100644
--- a/src/.config/rofi/config.rasi
+++ b/src/.config/rofi/config.rasi
@@ -4,14 +4,6 @@ configuration{
show-icons: true;
terminal: "alacritty";
drun-display-format: "{icon} {name}";
- location: 0;
- disable-history: false;
- hide-scrollbar: true;
- display-drun: " Apps ";
- display-run: " Run ";
- display-window: " Window";
- display-Network: " Network";
- sidebar-mode: true;
}
-@theme "catppuccin-macchiato"
\ No newline at end of file
+@theme "theme"
\ No newline at end of file
diff --git a/src/.config/rofi/theme.rasi b/src/.config/rofi/theme.rasi
new file mode 100644
index 0000000..e6abf8e
--- /dev/null
+++ b/src/.config/rofi/theme.rasi
@@ -0,0 +1,133 @@
+/*Dracula theme based on the Purple official rofi theme*/
+
+configuration {
+ show-icons: true;
+ display-drun: "";
+ disable-history: false;
+}
+
+* {
+ font: "Jetbrains Mono 12";
+ foreground: #f8f8f2;
+ background-color: #282a36;
+ active-background: #6272a4;
+ urgent-background: #ff5555;
+ urgent-foreground: #282a36;
+ selected-background: @active-background;
+ selected-urgent-background: @urgent-background;
+ selected-active-background: @active-background;
+ separatorcolor: @active-background;
+ bordercolor: @active-background;
+}
+
+#window {
+ background-color: @background-color;
+ border: 3;
+ border-radius: 6;
+ border-color: @bordercolor;
+ padding: 15;
+}
+#mainbox {
+ border: 0;
+ padding: 0;
+}
+#message {
+ border: 0px;
+ border-color: @separatorcolor;
+ padding: 1px;
+}
+#textbox {
+ text-color: @foreground;
+}
+#listview {
+ fixed-height: 0;
+ border: 0px;
+ border-color: @bordercolor;
+ spacing: 2px ;
+ scrollbar: false;
+ padding: 2px 0px 0px ;
+}
+#element {
+ border: 0;
+ padding: 3px ;
+}
+#element.normal.normal {
+ background-color: @background-color;
+ text-color: @foreground;
+}
+#element.normal.urgent {
+ background-color: @urgent-background;
+ text-color: @urgent-foreground;
+}
+#element.normal.active {
+ background-color: @active-background;
+ text-color: @foreground;
+}
+#element.selected.normal {
+ background-color: @selected-background;
+ text-color: @foreground;
+}
+#element.selected.urgent {
+ background-color: @selected-urgent-background;
+ text-color: @foreground;
+}
+#element.selected.active {
+ background-color: @selected-active-background;
+ text-color: @foreground;
+}
+#element.alternate.normal {
+ background-color: @background-color;
+ text-color: @foreground;
+}
+#element.alternate.urgent {
+ background-color: @urgent-background;
+ text-color: @foreground;
+}
+#element.alternate.active {
+ background-color: @active-background;
+ text-color: @foreground;
+}
+#scrollbar {
+ width: 2px ;
+ border: 0;
+ handle-width: 8px ;
+ padding: 0;
+}
+#sidebar {
+ border: 2px dash 0px 0px ;
+ border-color: @separatorcolor;
+}
+#button.selected {
+ background-color: @selected-background;
+ text-color: @foreground;
+}
+#inputbar {
+ spacing: 0;
+ text-color: @foreground;
+ padding: 1px ;
+}
+#case-indicator {
+ spacing: 0;
+ text-color: @foreground;
+}
+#entry {
+ spacing: 0;
+ text-color: @foreground;
+}
+#prompt {
+ spacing: 0;
+ text-color: @foreground;
+}
+#inputbar {
+ children: [ prompt,textbox-prompt-colon,entry,case-indicator ];
+}
+#textbox-prompt-colon {
+ expand: false;
+ str: ">";
+ margin: 0px 0.3em 0em 0em ;
+ text-color: @foreground;
+}
+element-text, element-icon {
+ background-color: inherit;
+ text-color: inherit;
+}
\ No newline at end of file
diff --git a/src/.config/waybar/config b/src/.config/waybar/config
index e64dbda..c795fe3 100644
--- a/src/.config/waybar/config
+++ b/src/.config/waybar/config
@@ -1,47 +1,39 @@
{
"layer": "top",
- "height": 30,
+ "position": "top",
+ "height": 24,
"spacing": 4,
- "modules-left": ["hyprland/workspaces", "custom/media"],
- "modules-right": [
- "battery",
- "pulseaudio",
- "clock",
- "tray"
+ "modules-left": [
+ "hyprland/workspaces",
+ "wlr/taskbar"
],
+ "modules-center": [
+ "hyprland/window"
+ ],
+ "modules-right": [
+ "tray",
+ "clock"
+ ],
+ "wlr/taskbar": {
+ "on-click": "activate",
+ "on-click-middle": "close",
+ "ignore-list": [
+ "foot"
+ ]
+ },
"hyprland/workspaces": {
- "format": "{icon}",
- "on-scroll-up": "hyprctl dispatch workspace e+1",
- "on-scroll-down": "hyprctl dispatch workspace e-1",
- "on-click": "activate"
+ "on-click": "activate",
+ "on-scroll-up": "hyprctl dispatch workspace e-1",
+ "on-scroll-down": "hyprctl dispatch workspace e+1"
+ },
+ "hyprland/window": {
+ "max-length": 128
+ },
+ "clock": {
+ "format": "{:%H:%M}",
+ "tooltip-format": "{:%Y %B}\n{calendar}"
},
"tray": {
- "spacing": 10
- },
- "network": {
- "format-wifi": "{essid} ({signalStrength}%) ",
- "format-ethernet": "{ipaddr}/{cidr} ",
- "tooltip-format": "{ifname} via {gwaddr} ",
- "format-linked": "{ifname} (No IP) ",
- "format-disconnected": "Disconnected ⚠",
- "format-alt": "{ifname}: {ipaddr}/{cidr}"
- },
- "pulseaudio": {
- "format": "{volume}% {icon} {format_source}",
- "format-bluetooth": "{volume}% {icon} {format_source}",
- "format-bluetooth-muted": " {icon} {format_source}",
- "format-muted": " {format_source}",
- "format-source": "{volume}% ",
- "format-source-muted": "",
- "format-icons": {
- "headphone": "",
- "hands-free": "",
- "headset": "",
- "phone": "",
- "portable": "",
- "car": "",
- "default": ["", "", ""]
- }
+ "spacing": 4
}
-}
-
+ }
\ No newline at end of file
diff --git a/src/.config/waybar/macchiato.css b/src/.config/waybar/macchiato.css
deleted file mode 100644
index 3659e5b..0000000
--- a/src/.config/waybar/macchiato.css
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-*
-* Catppuccin Macchiato palette
-* Maintainer: rubyowo
-*
-*/
-
-@define-color base #24273a;
-@define-color mantle #1e2030;
-@define-color crust #181926;
-
-@define-color text #cad3f5;
-@define-color subtext0 #a5adcb;
-@define-color subtext1 #b8c0e0;
-
-@define-color surface0 #363a4f;
-@define-color surface1 #494d64;
-@define-color surface2 #5b6078;
-
-@define-color overlay0 #6e738d;
-@define-color overlay1 #8087a2;
-@define-color overlay2 #939ab7;
-
-@define-color blue #8aadf4;
-@define-color lavender #b7bdf8;
-@define-color sapphire #7dc4e4;
-@define-color sky #91d7e3;
-@define-color teal #8bd5ca;
-@define-color green #a6da95;
-@define-color yellow #eed49f;
-@define-color peach #f5a97f;
-@define-color maroon #ee99a0;
-@define-color red #ed8796;
-@define-color mauve #c6a0f6;
-@define-color pink #f5bde6;
-@define-color flamingo #f0c6c6;
-@define-color rosewater #f4dbd6;
\ No newline at end of file
diff --git a/src/.config/waybar/style.css b/src/.config/waybar/style.css
index 5c4a194..d7a8d93 100644
--- a/src/.config/waybar/style.css
+++ b/src/.config/waybar/style.css
@@ -1,32 +1,34 @@
-@import "macchiato.css";
-
-#waybar {
- padding: 5px;
- background-color: @surface0;
- border-bottom: 1px solid @surface1;
- color: @pink;
+@import url("./theme.css");
+* {
+ border: none;
+ border-radius: 0;
+ font-family: Iosevka;
+ font-size: 11pt;
+ min-height: 0;
+}
+window#waybar {
+ opacity: 0.9;
+ background: @background-darker;
+ color: @foreground;
+ border-bottom: 2px solid @background;
}
-
#workspaces button {
- border-radius: 0;
- transition: 0.4s;
- background-color: @surface1;
+ padding: 0 10px;
+ background: @background;
+ color: @foreground;
}
-
-#workspaces button.active {
- background-color: @surface2;
-}
-
-#workspaces button.urgent {
- background-color: @red;
-}
-
#workspaces button:hover {
- background-color: @rosewater;
+ box-shadow: inherit;
+ text-shadow: inherit;
+ background-image: linear-gradient(0deg, @selection, @background-darker);
}
-
-#clock, #pulseaudio, #tray, #battery {
- background-color: @surface1;
- padding: 0px 10px 0px 10px;
- margin: 0px 3px 0px 3px;
+#workspaces button.active {
+ background-image: linear-gradient(0deg, @purple, @selection);
}
+#taskbar button.active {
+ background-image: linear-gradient(0deg, @selection, @background-darker);
+}
+#clock {
+ padding: 0 4px;
+ background: @background;
+}
\ No newline at end of file
diff --git a/src/.config/waybar/theme.css b/src/.config/waybar/theme.css
new file mode 100644
index 0000000..7931a03
--- /dev/null
+++ b/src/.config/waybar/theme.css
@@ -0,0 +1,12 @@
+@define-color background-darker rgba(30, 31, 41, 230);
+@define-color background #282a36;
+@define-color selection #44475a;
+@define-color foreground #f8f8f2;
+@define-color comment #6272a4;
+@define-color cyan #8be9fd;
+@define-color green #50fa7b;
+@define-color orange #ffb86c;
+@define-color pink #ff79c6;
+@define-color purple #bd93f9;
+@define-color red #ff5555;
+@define-color yellow #f1fa8c;
\ No newline at end of file
diff --git a/src/wallpaper.jpg b/src/wallpaper.jpg
deleted file mode 100644
index fe3def5..0000000
Binary files a/src/wallpaper.jpg and /dev/null differ
diff --git a/src/wallpaper.png b/src/wallpaper.png
new file mode 100644
index 0000000..789f02f
Binary files /dev/null and b/src/wallpaper.png differ