diff --git a/home/.config/hypr/hyprland.conf b/home/.config/hypr/hyprland.conf index 057c5b1..e27b417 100644 --- a/home/.config/hypr/hyprland.conf +++ b/home/.config/hypr/hyprland.conf @@ -197,16 +197,14 @@ submap=reset bind = $mainMod CTRL, T, exec, pypr toggle term $dropterm = ^(wezterm_dropdown)$ windowrule = float, $dropterm -windowrule = workspace special:scratch_term silent, $dropterm bind = $mainMod CTRL, V, exec, pypr toggle volume $volume_sidemenu = ^(pavucontrol)$ windowrule = float, $volume_sidemenu -windowrule = workspace special:scratch_volume silent, $volume_sidemenu # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more bind = $mainMod CTRL, M, togglespecialworkspace, minimized -bind = $mainMod, M, exec, pypr toggle_minimized +bind = $mainMod, M, exec, pypr toggle_special minimized bind = $mainMod CTRL, E, exec, pypr expose bind = $mainMod, Z, exec, pypr zoom @@ -233,6 +231,7 @@ bind = $mainMod, U, exec, fish -c bookmark_to_type bind = $mainMod SHIFT, U, exec, fish -c bookmark_add bind = $mainMod CTRL, U, exec, fish -c bookmark_delete bind = $mainMod, C, exec, hyprpicker -a +bind = $mainMod SHIFT, C, exec, pypr menu "Color picker" bind = $mainMod SHIFT, Q, killactive bind = $mainMod SHIFT, F, togglefloating, bind = $mainMod CTRL, F, fullscreen, 0 diff --git a/home/.config/hypr/pyprland.toml b/home/.config/hypr/pyprland.toml index df33177..632b1c2 100644 --- a/home/.config/hypr/pyprland.toml +++ b/home/.config/hypr/pyprland.toml @@ -3,20 +3,32 @@ plugins = [ "scratchpads", "magnify", "expose", + "shortcuts_menu", + "toggle_special", ] [scratchpads.term] -command = "wezterm start --class wezterm_dropdown" +command = "wezterm start --always-new-process --class wezterm_dropdown" animation = "fromTop" unfocus = "hide" excludes = "*" lazy = true +multi = false [scratchpads.volume] command = "pavucontrol --class volume_sidemenu" -animation = "fromRight" +animation = "fromLeft" class = "volume_sidemenu" size = "40% 70%" unfocus = "hide" excludes = "*" lazy = true +margin = 90 +multi = false + +[shortcuts_menu.entries] + +"Color picker" = [ + {name="format", options=["hex", "rgb", "hsv", "hsl", "cmyk"]}, + "sleep 0.2; hyprpicker --format [format] -a" # sleep to let the menu close before the picker opens +] diff --git a/home/.config/waybar/config b/home/.config/waybar/config index ad73aa2..163d771 100644 --- a/home/.config/waybar/config +++ b/home/.config/waybar/config @@ -164,8 +164,8 @@ "group/misc": { "orientation": "horizontal", "modules": [ - "pulseaudio#microphone_indicator", "custom/webcam", + "privacy", "custom/recording", "custom/geo", "custom/media", @@ -176,19 +176,26 @@ ], }, - "pulseaudio#microphone_indicator": { - "format": "{format_source}", - "format-source": "󰍬", - "format-source-muted": "", - "tooltip-format": "microphone on", - }, - "custom/webcam": { "interval": 1, "exec": "fish -c check_webcam", "return-type": "json", }, + "privacy": { + "icon-spacing": 1, + "icon-size": 12, + "transition-duration": 250, + "modules": [ + { + "type": "audio-in", + }, + { + "type": "screenshare", + }, + ] + }, + "custom/recording": { "interval": 1, "exec-if": "pgrep wl-screenrec", @@ -267,6 +274,7 @@ "format-en": "πŸ‡ΊπŸ‡Έ ENG (US)", "format-uk": "πŸ‡ΊπŸ‡¦ UKR", "format-ru": "πŸ‡·πŸ‡Ί RUS", + "keyboard-name": "at-translated-set-2-keyboard", "on-click": "hyprctl switchxkblayout at-translated-set-2-keyboard next", }, @@ -298,7 +306,7 @@ "margin-top": 10, "margin-bottom": 10, "modules-left": ["wlr/taskbar"], - "modules-center": ["cpu", "memory", "disk", "temperature", "battery", "backlight", "pulseaudio"], + "modules-center": ["cpu", "memory", "disk", "temperature", "battery", "backlight", "pulseaudio", "systemd-failed-units"], "modules-right": ["tray"], // Modules Config @@ -445,5 +453,9 @@ "reverse-mouse-scrolling": true, "on-click": "pavucontrol", }, + + "systemd-failed-units": { + "format": "βœ— {nr_failed}", + }, }, ] diff --git a/home/.config/waybar/style.css b/home/.config/waybar/style.css index 904d3a3..a21a196 100644 --- a/home/.config/waybar/style.css +++ b/home/.config/waybar/style.css @@ -202,19 +202,22 @@ window.top_bar .modules-center { margin-right: 2; } -#custom-media {} - #custom-media.Paused { color: @subtext0; } -#pulseaudio.microphone_indicator { - color: @pink; - margin-right: 4; -} - #custom-webcam { color: @maroon; + margin-right: 3; +} + +#privacy-item.screenshare { + color: @peach; + margin-right: 5; +} + +#privacy-item.audio-in { + color: @pink; margin-right: 4; } @@ -428,4 +431,8 @@ window.left_bar .modules-center { #pulseaudio.high { color: @subtext1; +} + +#systemd-failed-units { + color: @red; } \ No newline at end of file