diff --git a/hyprland/.config/hypr/autostart.sh b/hyprland/.config/hypr/autostart.sh
index 99daa3f..bee9b22 100755
--- a/hyprland/.config/hypr/autostart.sh
+++ b/hyprland/.config/hypr/autostart.sh
@@ -4,4 +4,5 @@ swww init;
flameshot & disown;
/usr/lib/mate-polkit/polkit-mate-authentication-agent-1 &
wayvnc & disown;
+touchegg & disown;
$HOME/.config/waybar/launcher.sh
diff --git a/hyprland/.config/hypr/hyprland.conf b/hyprland/.config/hypr/hyprland.conf
index 4013ee0..26587ce 100644
--- a/hyprland/.config/hypr/hyprland.conf
+++ b/hyprland/.config/hypr/hyprland.conf
@@ -77,14 +77,20 @@ bind=SUPER,Z,exec,alacritty
bind=SUPERSHIFT,Z,exec,kitty
bind=SUPER,X,killactive,
bind=SUPER_SHIFT,Q,exit,
+
bind=SUPER,E,exec,nemo
+bind=SUPERSHIFT,E,exec,kitty ranger
+
bind=SUPER,F,fullscreen,1
bind=SUPERSHIFT,F,fullscreen,0
-bind=SUPERSHIFT,L,exec,gtklock
+
+bind=SUPERSHIFT,L,exec,hyprlock
+
bind=SUPER,T,togglefloating,
bind=SUPER,R,exec,wofi --show drun -o DP-3
bind=SUPER,P,pseudo,
bind=SUPER,SPACE,exec,rofi -modi drun,run,window,calc -show drun
+bind=SUPER,C,pin
bind=SUPERSHIFT,R,hyprload,reload
bind=SUPERSHIFT,U,hyprload,update
@@ -147,6 +153,22 @@ windowrulev2 = noinitialfocus,class:^(xwaylandvideobridge)$
windowrulev2 = pin,class:^(scrcpy)$
windowrulev2 = move onscreen 100%-30,class:^(scrcpy)$
+windowrulev2 = float,class:^(flameshot)$
+windowrulev2 = pin,class:^(flameshot)$
+
+windowrulev2 = opacity 0.0 override 0.0 override,title:^(Espanso Sync Tool)$
+windowrulev2 = float,title:^(Espanso Sync Tool)$
+windowrulev2 = size 0.1 0.1,title:^(Espanso Sync Tool)$
+windowrulev2 = move 100% 100%,title:^(Espanso Sync Tool)$
+
+# Envars; to play along with wayland nicely
+
+env = QT_QPA_PLATFORM,wayland;xcb
+env = CLUTTER_BACKEND,wayland
+env = GDK_BACKEND,wayland,x11
+env = QT_AUTO_SCREEN_SCALE_FACTOR,1
+env = QT_QPA_PLATFORMTHEME,qt5ct
+
plugin:hyprfocus {
enabled = yes
diff --git a/waybar/.config/waybar/config b/waybar/.config/waybar/config
index 81d0bac..728cb40 100644
--- a/waybar/.config/waybar/config
+++ b/waybar/.config/waybar/config
@@ -5,7 +5,7 @@
// "width": 1280, // Waybar width
"spacing": 4, // Gaps between modules (4px)
// Choose the order of the modules
- "modules-left": ["custom/archicon","hyprland/workspaces", "sway/mode", "sway/scratchpad", "custom/media"],
+ "modules-left": ["custom/archicon","hyprland/workspaces", "custom/media", ],
"modules-center": ["hyprland/window"],
"modules-right": ["mpd", "idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "temperature", "backlight", "keyboard-state", "sway/language", "battery", "clock", "tray"],
// Modules configuration
@@ -80,8 +80,8 @@
"idle_inhibitor": {
"format": "{icon}",
"format-icons": {
- "activated": "",
- "deactivated": ""
+ "activated": "",
+ "deactivated": ""
}
},
"tray": {
@@ -90,8 +90,8 @@
},
"clock": {
// "timezone": "America/New_York",
- "tooltip-format": "{:%Y %B}\n{calendar}",
- "format-alt": "{:%Y-%m-%d}"
+ "tooltip-format": "{:%d %B %Y}\n{calendar}",
+ "format-alt": "{:%Y-%m-%d}",
},
"cpu": {
"format": "{usage}% ",
@@ -146,9 +146,9 @@
"format-source": "{volume}% ",
"format-source-muted": "",
"format-icons": {
- "headphone": "",
- "hands-free": "",
- "headset": "",
+ "headphone": "",
+ "hands-free": "",
+ "headset": "",
"phone": "",
"portable": "",
"car": "",
diff --git a/waybar/.config/waybar/macchiato.css b/waybar/.config/waybar/macchiato.css
new file mode 100644
index 0000000..cfcd0dc
--- /dev/null
+++ b/waybar/.config/waybar/macchiato.css
@@ -0,0 +1,38 @@
+/*
+*
+* 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;
+
diff --git a/waybar/.config/waybar/style.css b/waybar/.config/waybar/style.css
index 2c3c38e..4d40909 100644
--- a/waybar/.config/waybar/style.css
+++ b/waybar/.config/waybar/style.css
@@ -1,12 +1,13 @@
+@import "macchiato.css";
* {
/* `otf-font-awesome` is required to be installed for icons */
- font-family: "NotoSans NFP", FontAwesome, Roboto, Helvetica, Arial, sans-serif;
+ font-family: "NotoSans Nerd Font Propo", FontAwesome, Roboto, Helvetica, Arial, sans-serif;
font-size: 13px;
}
window#waybar {
- background-color: rgba(43, 48, 59, 0.5);
- border-bottom: 3px solid rgba(100, 114, 125, 0.5);
+ background-color: shade(@base, 1);/* rgba(43, 48, 59, 0.5);*/
+ border-bottom: 3px solid shade(@overlay2, 0.5);
color: #ffffff;
transition-property: background-color;
transition-duration: .5s;
@@ -30,10 +31,9 @@ window#waybar.termite {
}
window#waybar.chromium {
- background-color: #000000;
+ background-color: @base;
border: none;
}
-
button {
/* Use box-shadow instead of border so the text isn't offset */
box-shadow: inset 0 -3px transparent;
@@ -59,19 +59,19 @@ button:hover {
}
#workspaces button.active {
- background-color: #64727D;
+ background-color: @overlay1;
box-shadow: inset 0 -3px #ffffff;
}
#workspaces button.urgent {
- background-color: #eb4d4b;
+ background-color: @red;
}
#mode {
background-color: #64727D;
border-bottom: 3px solid #ffffff;
}
-
+#cava,
#clock,
#battery,
#cpu,
@@ -89,7 +89,7 @@ button:hover {
#scratchpad,
#mpd {
padding: 0 10px;
- color: #ffffff;
+ color: @text;
}
#window,
@@ -108,23 +108,23 @@ button:hover {
}
#clock {
- background-color: #64727D;
+ background-color: inherit;
}
#battery {
background-color: #ffffff;
- color: #000000;
+ color: @base;
}
#battery.charging, #battery.plugged {
- color: #ffffff;
- background-color: #26A65B;
+ color: @base;
+ background-color: @green;
}
@keyframes blink {
to {
background-color: #ffffff;
- color: #000000;
+ color: @base;
}
}
@@ -139,16 +139,17 @@ button:hover {
}
label:focus {
- background-color: #000000;
+ background-color: @base;
}
#cpu {
- background-color: #2ecc71;
- color: #000000;
+ background-color: @teal;
+ color: @surface0;
}
#memory {
- background-color: #9b59b6;
+ background-color: @mauve;
+ color: @surface0;
}
#disk {
@@ -156,34 +157,36 @@ label:focus {
}
#backlight {
- background-color: #90b1b1;
+ background-color: @teal;
+ color: @base;
}
#network {
- background-color: #2980b9;
+ background-color: @sky;
+ color: @base;
}
#network.disconnected {
- background-color: #f53c3c;
+ background-color: @red;
}
#pulseaudio {
- background-color: #f1c40f;
- color: #000000;
+ background-color: @yellow;
+ color: @base;
}
#pulseaudio.muted {
- background-color: #90b1b1;
- color: #2a5c45;
+ background-color: @peach;
+ color: @base;
}
#wireplumber {
- background-color: #fff0f5;
- color: #000000;
+ background-color: @yellow;
+ color: @base;
}
#wireplumber.muted {
- background-color: #f53c3c;
+ background-color: @peach;
}
#custom-media {
@@ -202,6 +205,7 @@ label:focus {
#temperature {
background-color: #f0932b;
+ color: @base;
}
#temperature.critical {
@@ -209,7 +213,7 @@ label:focus {
}
#tray {
- background-color: #2980b9;
+ /*background-color: @crust;*/
}
#tray > .passive {
@@ -218,7 +222,7 @@ label:focus {
#tray > .needs-attention {
-gtk-icon-effect: highlight;
- background-color: #eb4d4b;
+ background-color: @maroon;
}
#idle_inhibitor {
@@ -256,8 +260,8 @@ label:focus {
}
#keyboard-state {
- background: #97e1ad;
- color: #000000;
+ background: @sky;
+ color: @base;
padding: 0 0px;
margin: 0 5px;
min-width: 16px;