diff --git a/hypr/.config/hypr/extends/general.conf b/hypr/.config/hypr/extends/general.conf index 43d945ffa..520761f0f 100644 --- a/hypr/.config/hypr/extends/general.conf +++ b/hypr/.config/hypr/extends/general.conf @@ -3,8 +3,8 @@ general { gaps_in = 5 gaps_out = 10 - border_size = 2 - col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg + border_size = 3 + col.active_border = rgba(33ccffee) rgba(00ff99ee) 90deg col.inactive_border = rgba(595959aa) layout = dwindle diff --git a/hypr/.config/hypr/extends/rules.conf b/hypr/.config/hypr/extends/rules.conf index 8c3b803d8..e330ddd14 100644 --- a/hypr/.config/hypr/extends/rules.conf +++ b/hypr/.config/hypr/extends/rules.conf @@ -4,40 +4,40 @@ # windowrulev2 = float,class:^(kitty)$,title:^(kitty)$ # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more -windowrulev2 = float,class:^(blueman-manager)$ -windowrulev2 = float,class:^(xdg-desktop-portal-gtk$) +windowrulev2 = float,class:^([bB]lueman-[mM]anager)$ +windowrulev2 = float,class:^(xdg-desktop-portal-gtk)$ # Set workspaces here ## Workspace 1 -windowrule = workspace 1,^(kitty)$ -windowrule = workspace 1,^(Alacritty)$ +windowrule = workspace 1,^([kK]itty)$ +windowrule = workspace 1,^([Aa]lacritty)$ ## Workspace 2 -windowrule = workspace 2,^(Code)$ -windowrule = workspace 2,^(nvim)$ -windowrule = workspace 2,^(jetbrains-studio)$ +windowrule = workspace 2,^([cC]ode)$ +windowrule = workspace 2,^([nN]vim)$ +windowrule = workspace 2,^([jJ]etbrains-[sS]tudio)$ ## Workspace 3 -windowrule = workspace 3,^(nemo)$ +windowrule = workspace 3,^([nN]emo)$ ## Workspace 4 -windowrule = workspace 4,^(Gimp)$ +windowrule = workspace 4,^([gG]imp)$ ## Workspace 5 ## Workspace 6 -windowrule = workspace 6,^(firefox)$ +windowrule = workspace 6,^([fF]irefox)$ ## Workspace 7 ## Workspace 8 -windowrule = workspace 8,^(Steam)$ -windowrule = workspace 8,^(RuneScape)$ +windowrule = workspace 8,^([sS]team)$ +windowrule = workspace 8,^([rR]uneScape)$ ## Workspace 9 -windowrule = workspace 9,^(discord)$ -windowrule = workspace 9,^(Hexchat)$ +windowrule = workspace 9,^([dD]iscord)$ +windowrule = workspace 9,^([hH]exchat)$ ## Workspace 10 -windowrule = workspace 10,^(pkgbrowser)$ \ No newline at end of file +windowrule = workspace 10,^([pP]kg[bB]rowser)$ \ No newline at end of file diff --git a/hypr/.config/waybar/config b/hypr/.config/waybar/config index bde902c3a..a8242ac6b 100644 --- a/hypr/.config/waybar/config +++ b/hypr/.config/waybar/config @@ -1,136 +1,278 @@ -{ - "layer": "top", - "position": "top", - "mod": "dock", - "exclusive": true, - "passtrough": false, - "gtk-layer-shell": true, - "height": 0, +[ + { + "layer": "top", + "position": "top", + "mod": "dock", + "exclusive": true, + "passtrough": false, + "gtk-layer-shell": true, + "height": 0, + "output": ["eDP-1"], - "modules-left": ["wlr/workspaces", "hyprland/window"], + "modules-left": ["wlr/workspaces", "hyprland/window"], - "modules-center": ["cpu", "memory", "temperature", "disk"], + "modules-center": ["cpu", "memory", "temperature", "disk"], - "modules-right": ["hyprland/language", "backlight", "pulseaudio", "battery", "clock#time", "clock#date", "tray"], + "modules-right": ["tray", "hyprland/language", "backlight", "pulseaudio", "battery", "clock#time", "clock#date"], - "wlr/workspaces": { - "on-scroll-up": "hyprctl dispatch workspace e+1", - "on-scroll-down": "hyprctl dispatch workspace e-1", - "all-outputs": true, - "on-click": "activate", - "format": "{icon}", - "format-icons": { - "1": "一", - "2": "二", - "3": "三", - "4": "四", - "5": "五", - "6": "六", - "7": "七", - "8": "八", - "9": "九", - "10": "零" + "wlr/workspaces": { + "on-scroll-up": "hyprctl dispatch workspace e+1", + "on-scroll-down": "hyprctl dispatch workspace e-1", + "all-outputs": true, + "on-click": "activate", + "format": "{icon}", + "format-icons": { + "1": "一", + "2": "二", + "3": "三", + "4": "四", + "5": "五", + "6": "六", + "7": "七", + "8": "八", + "9": "九", + "10": "零" + }, + "persistent_workspaces": { + "1": [], + "2": [], + "3": [], + "4": [], + "5": [], + "6": [], + "7": [], + "8": [], + "9": [], + "10": [] + } }, - "persistent_workspaces": { - "1": [], - "2": [], - "3": [], - "4": [], - "5": [], - "6": [], - "7": [], - "8": [], - "9": [], - "10": [] + + "tray": { + "icon-size": 16, + "tooltip": false, + "show-passive-items": true, + "spacing": 10 + }, + + "clock#time": { + "format": "{:%H:%M}", + "tooltip-format": "{:%Y %B}\n\n{calendar}" + }, + + "clock#date": { + "format": "{:%a %b %d}", + "tooltip-format": "{:%Y %B}\n\n{calendar}" + }, + + "backlight": { + "device": "intel_backlight", + "format": "{icon} {percent}%", + "format-icons": ["󰃞", "󰃟", "󰃠"], + "on-scroll-up": "brightnessctl set 2%+", + "on-scroll-down": "brightnessctl set 2%-", + "min-length": 6 + }, + + "pulseaudio": { + "format": "{icon} {volume}%", + "format-muted": " Muted", + "tooltip": false, + "on-click": "pavucontrol &", + "scroll-step": 5, + "format-icons": { + "headphone": "", + "hands-free": "", + "headset": "", + "phone": "", + "portable": "", + "car": "", + "default": ["", "", ""] + } + }, + + "battery": { + "interval": 5, + "states": { + "good": 95, + "warning": 30, + "critical": 20 + }, + "format": "{icon} {capacity}%", + "format-charging": " {capacity}%", + "format-plugged": " {capacity}%", + "format-alt": "{icon} {time}", + "format-icons": ["󰂎", "󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"] + }, + + "cpu": { + "interval": 10, + "format": " {usage}%", + "max-length": 10, + "on-click": "kitty --start-as=fullscreen --title btop sh -c 'btop'" + }, + + "disk": { + "interval": 30, + "format": "󰋊 {percentage_used}%", + "path": "/", + "tooltip": true, + "tooltip-format": "HDD - {used} used out of {total} on {path} ({percentage_used}%)", + "on-click": "kitty --start-as=fullscreen --title btop sh -c 'btop'" + }, + + "memory": { + "interval": 30, + "format": "󰍛 {}%", + "max-length": 10, + "tooltip": true, + "tooltip-format": "Memory - {used:0.1f}GB used", + "on-click": "kitty --start-as=fullscreen --title btop sh -c 'btop'" + }, + + "temperature": { + "thermal-zone": 1, + "format": " {temperatureC}°C", + "critical-threshold": 70, + "format-critical": " {temperatureF}°F", + "on-click": "kitty --start-as=fullscreen --title btop sh -c 'btop'" } }, + { + "layer": "top", + "position": "bottom", + "mod": "dock", + "exclusive": true, + "passtrough": false, + "gtk-layer-shell": true, + "height": 0, + "output": ["eDP-1"], - "tray": { - "icon-size": 12, - "tooltip": false, - "spacing": 10 - }, + // "modules-left": ["wlr/workspaces", "hyprland/window"], - "clock#time": { - "format": "{:%H:%M}", - "tooltip-format": "{:%Y %B}\n\n{calendar}" - }, + // "modules-center": ["cpu", "memory", "temperature", "disk"], - "clock#date": { - "format": "{:%a %b %d}", - "tooltip-format": "{:%Y %B}\n\n{calendar}" - }, + // "modules-right": ["hyprland/language", "backlight", "pulseaudio", "battery", "clock#time", "clock#date"], - "backlight": { - "device": "intel_backlight", - "format": "{icon} {percent}%", - "format-icons": ["󰃞", "󰃟", "󰃠"], - "on-scroll-up": "brightnessctl set 2%+", - "on-scroll-down": "brightnessctl set 2%-", - "min-length": 6 - }, - - "pulseaudio": { - "format": "{icon} {volume}%", - "format-muted": " Muted", - "tooltip": false, - "on-click": "pavucontrol &", - "scroll-step": 5, - "format-icons": { - "headphone": "", - "hands-free": "", - "headset": "", - "phone": "", - "portable": "", - "car": "", - "default": ["", "", ""] - } - }, - - "battery": { - "interval": 5, - "states": { - "good": 95, - "warning": 30, - "critical": 20 + "wlr/workspaces": { + "on-scroll-up": "hyprctl dispatch workspace e+1", + "on-scroll-down": "hyprctl dispatch workspace e-1", + "all-outputs": true, + "on-click": "activate", + "format": "{icon}", + "format-icons": { + "1": "一", + "2": "二", + "3": "三", + "4": "四", + "5": "五", + "6": "六", + "7": "七", + "8": "八", + "9": "九", + "10": "零" + }, + "persistent_workspaces": { + "1": [], + "2": [], + "3": [], + "4": [], + "5": [], + "6": [], + "7": [], + "8": [], + "9": [], + "10": [] + } }, - "format": "{icon} {capacity}%", - "format-charging": " {capacity}%", - "format-plugged": " {capacity}%", - "format-alt": "{icon} {time}", - "format-icons": ["󰂎", "󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"] - }, - "cpu": { - "interval": 10, - "format": " {usage}%", - "max-length": 10, - "on-click": "kitty --start-as=fullscreen --title btop sh -c 'btop'" - }, + "tray": { + "icon-size": 16, + "tooltip": false, + "show-passive-items": true, + "spacing": 10 + }, - "disk": { - "interval": 30, - "format": "󰋊 {percentage_used}%", - "path": "/", - "tooltip": true, - "tooltip-format": "HDD - {used} used out of {total} on {path} ({percentage_used}%)", - "on-click": "kitty --start-as=fullscreen --title btop sh -c 'btop'" - }, + "clock#time": { + "format": "{:%H:%M}", + "tooltip-format": "{:%Y %B}\n\n{calendar}" + }, - "memory": { - "interval": 30, - "format": "󰍛 {}%", - "max-length": 10, - "tooltip": true, - "tooltip-format": "Memory - {used:0.1f}GB used", - "on-click": "kitty --start-as=fullscreen --title btop sh -c 'btop'" - }, + "clock#date": { + "format": "{:%a %b %d}", + "tooltip-format": "{:%Y %B}\n\n{calendar}" + }, - "temperature": { - "thermal-zone": 1, - "format": " {temperatureC}°C", - "critical-threshold": 70, - "format-critical": " {temperatureF}°F", - "on-click": "kitty --start-as=fullscreen --title btop sh -c 'btop'" + "backlight": { + "device": "intel_backlight", + "format": "{icon} {percent}%", + "format-icons": ["󰃞", "󰃟", "󰃠"], + "on-scroll-up": "brightnessctl set 2%+", + "on-scroll-down": "brightnessctl set 2%-", + "min-length": 6 + }, + + "pulseaudio": { + "format": "{icon} {volume}%", + "format-muted": " Muted", + "tooltip": false, + "on-click": "pavucontrol &", + "scroll-step": 5, + "format-icons": { + "headphone": "", + "hands-free": "", + "headset": "", + "phone": "", + "portable": "", + "car": "", + "default": ["", "", ""] + } + }, + + "battery": { + "interval": 5, + "states": { + "good": 95, + "warning": 30, + "critical": 20 + }, + "format": "{icon} {capacity}%", + "format-charging": " {capacity}%", + "format-plugged": " {capacity}%", + "format-alt": "{icon} {time}", + "format-icons": ["󰂎", "󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"] + }, + + "cpu": { + "interval": 10, + "format": " {usage}%", + "max-length": 10, + "on-click": "kitty --start-as=fullscreen --title btop sh -c 'btop'" + }, + + "disk": { + "interval": 30, + "format": "󰋊 {percentage_used}%", + "path": "/", + "tooltip": true, + "tooltip-format": "HDD - {used} used out of {total} on {path} ({percentage_used}%)", + "on-click": "kitty --start-as=fullscreen --title btop sh -c 'btop'" + }, + + "memory": { + "interval": 30, + "format": "󰍛 {}%", + "max-length": 10, + "tooltip": true, + "tooltip-format": "Memory - {used:0.1f}GB used", + "on-click": "kitty --start-as=fullscreen --title btop sh -c 'btop'" + }, + + "temperature": { + "thermal-zone": 1, + "format": " {temperatureC}°C", + "critical-threshold": 70, + "format-critical": " {temperatureF}°F", + "on-click": "kitty --start-as=fullscreen --title btop sh -c 'btop'" + } } -} +] diff --git a/hypr/.config/waybar/style.css b/hypr/.config/waybar/style.css index a31c21ea5..3c6892fcc 100644 --- a/hypr/.config/waybar/style.css +++ b/hypr/.config/waybar/style.css @@ -10,6 +10,8 @@ window#waybar { background: #283036; color: #e5e9f0; + border: #59ff59 2px solid; + border-radius: 15px; } tooltip { @@ -59,45 +61,27 @@ tooltip { #network, #workspaces, #temperature, -#tray, #language, #backlight { background: #ffff59; color: #283036; padding: 0px 5px; - margin: 0px; + margin: 5px 0px; } #tray { - margin-right: 0px; + margin-right: 10px; } #workspaces { background: #ff9c59; color: #283036; - margin-left: 0px; padding-right: 0px; padding-left: 0px; + margin-left: 5px; } -#custom-caffeine { - color: #283036; - border-right: 0px; - margin-left: 10px; -} - -#custom-language { - color: #283036; - border-left: 0px; - border-right: 0px; -} - -#custom-updates { - color: #283036; - border-left: 0px; - border-right: 0px; -} - +#clock.date, #window, #disk { color: #283036; @@ -111,6 +95,10 @@ tooltip { border-right: 0px; } +#clock.date { + margin-right: 5px; +} + #network { color: #283036; border-left: 0px; @@ -140,6 +128,7 @@ tooltip { margin-left: 0px; } +#workspaces, #language, #cpu { color: #283036;