diff --git a/hypr/keybinds.conf b/hypr/keybinds.conf index 51b6eaa..8e51b9f 100644 --- a/hypr/keybinds.conf +++ b/hypr/keybinds.conf @@ -133,7 +133,7 @@ bindl = , XF86AudioPlay, exec, playerctl play-pause bindl = , XF86AudioPrev, exec, playerctl previous # Shut off laptop monitor when lid is closed and on when lid is open. -bindl = , switch:on:Lid Switch, exec, hyprctl dispatch dpms off -bindl = , switch:off:Lid Switch, exec, hyprctl dispatch dpms on +# bindl = , switch:on:Lid Switch, exec, hyprctl dispatch dpms off +# bindl = , switch:off:Lid Switch, exec, hyprctl dispatch dpms on diff --git a/hypr/windows.conf b/hypr/windows.conf index a143b02..e562340 100644 --- a/hypr/windows.conf +++ b/hypr/windows.conf @@ -4,16 +4,19 @@ # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more # See https://wiki.hyprland.org/Configuring/Workspace-Rules/ for workspace rules +# + +# Force bluetooth settings to be a floating window +windowrule = float, class:^(blueberry.py)$ + windowrule = float,class:^(float)$ -#windowrule = float,title:InstallWebApp windowrule = size 800 600,class:^(float)$,title:^(Install Web App)$ windowrule = center,class:^(float)$,title:^(Install Web App)$ # Ignore maximize requests from apps. You'll probably like this. windowrule = suppressevent maximize, class:.* - # Just a dash of opacity by default. windowrule = opacity 0.97 0.92, class:.* # No opacity on youtube. diff --git a/waybar/config.jsonc b/waybar/config.jsonc index 66bd6a3..c9fe016 100644 --- a/waybar/config.jsonc +++ b/waybar/config.jsonc @@ -18,14 +18,13 @@ "mpd", "idle_inhibitor", "pulseaudio", + "tray", "network", "cpu", "memory", "temperature", "backlight", "battery", - "battery#bat2", - "tray", "custom/power", ], "hyprland/workspaces": { @@ -52,13 +51,6 @@ // "5": [], // }, }, - "sway/scratchpad": { - "format": "{icon} {count}", - "show-empty": false, - "format-icons": ["", ""], - "tooltip": true, - "tooltip-format": "{app}: {title}", - }, "mpd": { "format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ⸨{songPosition}|{queueLength}⸩ {volume}% ", "format-disconnected": "Disconnected ", @@ -104,7 +96,7 @@ // "timezone": "America/New_York", "tooltip-format": "{calendar}", // "format-alt": "{:%Y-%m-%d}", - "format": "󰭦 {:%D - %H:%M}", + "format": "󰭦 {:%D - %H:%M}", "calendar": { "mode": "year", "mode-mon-col": 3, @@ -154,9 +146,6 @@ // "format-full": "", "format-icons": ["", "", "", "", ""], }, - "battery#bat2": { - "bat": "BAT2", - }, "power-profiles-daemon": { "format": "{icon}", "tooltip-format": "Power profile: {profile}\nDriver: {driver}", @@ -215,7 +204,7 @@ // "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name }, "custom/power": { - "format": "⏻ ", + "format": "⏻", "tooltip": false, "menu": "on-click", "menu-file": "$HOME/.config/waybar/power_menu.xml", // Menu file in resources folder diff --git a/waybar/style.css b/waybar/style.css index 9567f6d..eca3ef1 100644 --- a/waybar/style.css +++ b/waybar/style.css @@ -1,13 +1,7 @@ -/* --active-color: #f5e0dc; */ -/* --bg-color: rgba(24, 24, 37, 0.5); */ -/* --border-bottom-color: rgba(24, 24, 37, 0.9); */ -/* } */ -@define-color bg2 #504945; @define-color foreground #cdd6f4; -@define-color background #181824; +@define-color background rgba(24, 24, 37, 0.7); * { - /* `otf-font-awesome` is required to be installed for icons */ font-family: JetBrains Mono; font-size: 15px; border: none; @@ -19,86 +13,7 @@ text-shadow: none; icon-shadow: none; color: @foreground; - background-color: @background; -} - -window#waybar { - background-color: rgba(24, 24, 37, 0.5); - border-bottom: 3px solid rgba(24, 24, 37, 0.9); - color: #f5e0dc; - transition-property: background-color; - transition-duration: 0.5s; -} - -window#waybar.hidden { - opacity: 0.2; -} - -/* -window#waybar.empty { - background-color: transparent; -} -window#waybar.solo { - background-color: #FFFFFF; -} -*/ - -window#waybar.termite { - background-color: #3f3f3f; -} - -window#waybar.chromium { - background-color: #000000; - border: none; -} - -button { - /* Use box-shadow instead of border so the text isn't offset */ - box-shadow: inset 0 -3px transparent; - /* Avoid rounded borders under each button name */ - border: none; - border-radius: 0; -} - -/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */ -button:hover { - background: inherit; - box-shadow: inset 0 -3px #ffffff; -} - -/* you can set a style on hover for any module like this */ -#pulseaudio:hover { - background-color: #a37800; -} - -#workspaces button { - padding: 0 5px; background-color: transparent; - color: #f5e0dc; -} - -#workspaces button:hover { - background: rgba(0, 0, 0, 0.2); -} - -#workspaces button.focused { - background-color: #f38ba8; - box-shadow: inset 0 -3px #ffffff; -} -#workspaces button.active { - /* border: 1px solid #fab387; */ - /* border-radius: 8px; */ - color: #fab387; - /* background-color: rgb(24, 24, 37); */ -} - -#workspaces button.urgent { - background-color: #eb4d4b; -} - -#mode { - background-color: #64727d; - box-shadow: inset 0 -3px #ffffff; } #clock, @@ -119,32 +34,36 @@ button:hover { #power-profiles-daemon, #mpd { min-width: 12px; + min-height: 25px; margin: 0 7.5px; } -#window, -#workspaces { - margin: 0 4px; +.modules-left { + padding: 4px; + margin: 2px 8px; + background-color: @background; + border-radius: 10; } -/* If workspaces is the leftmost module, omit left margin */ -.modules-left > widget:first-child > #workspaces { - margin-left: 0; -} - -/* If workspaces is the rightmost module, omit right margin */ -.modules-right > widget:last-child > #workspaces { - margin-right: 0; +.modules-right { + margin: 0 2px; } #clock { - color: @foreground; - /* background-color: #64727d; */ + background-color: @background; + margin: 2px 8px; + border-radius: 10; + padding: 0 8px; +} + +#workspaces button { + padding: 0 5px; } #battery { - background-color: #ffffff; - color: #000000; + /* background-color: #ffffff; */ + /* color: #000000; */ + margin-right: 10px; } #battery.charging, @@ -171,57 +90,13 @@ button:hover { animation-direction: alternate; } -#power-profiles-daemon { - padding-right: 15px; -} - -#power-profiles-daemon.performance { - background-color: #f53c3c; - color: #ffffff; -} - -#power-profiles-daemon.balanced { - background-color: #2980b9; - color: #ffffff; -} - -#power-profiles-daemon.power-saver { - background-color: #2ecc71; - color: #000000; -} - -label:focus { - background-color: #000000; -} - -/* #cpu { */ -/* background-color: #2ecc71; */ -/* color: #000000; */ -/* } */ - -#memory { - background-color: #9b59b6; -} - -#disk { - background-color: #964b00; -} - -#backlight { - background-color: #90b1b1; -} - -#network { - /* background-color: #2980b9; */ -} - -#network.disconnected { - background-color: #f53c3c; +#custom-power { + font-size: 23px; } #pulseaudio { - background-color: #f1c40f; - color: #000000; + /* background-color: #f1c40f; */ + /* color: #000000; */ } #pulseaudio.muted { @@ -244,25 +119,9 @@ label:focus { min-width: 100px; } -#custom-media.custom-spotify { - background-color: #66cc99; -} - -#custom-media.custom-vlc { - background-color: #ffa000; -} - -#temperature { - background-color: #f0932b; -} - -#temperature.critical { - background-color: #eb4d4b; -} - -#tray { - background-color: #2980b9; -} +/* #tray { */ +/* background-color: red; */ +/* } */ #tray > .passive { -gtk-icon-effect: dim; @@ -273,15 +132,6 @@ label:focus { background-color: #eb4d4b; } -#idle_inhibitor { - background-color: #2d3436; -} - -#idle_inhibitor.activated { - background-color: #ecf0f1; - color: #2d3436; -} - #mpd { background-color: #66cc99; color: #2a5c45; @@ -299,38 +149,6 @@ label:focus { background-color: #51a37a; } -#language { - background: #00b093; - color: #740864; - padding: 0 5px; - margin: 0 5px; - min-width: 16px; -} - -#keyboard-state { - background: #97e1ad; - color: #000000; - padding: 0 0px; - margin: 0 5px; - min-width: 16px; -} - -#keyboard-state > label { - padding: 0 5px; -} - -#keyboard-state > label.locked { - background: rgba(0, 0, 0, 0.2); -} - -#scratchpad { - background: rgba(0, 0, 0, 0.2); -} - -#scratchpad.empty { - background-color: transparent; -} - #privacy { padding: 0; } @@ -341,13 +159,13 @@ label:focus { } #privacy-item.screenshare { - background-color: #cf5700; + /* background-color: #cf5700; */ } #privacy-item.audio-in { - background-color: #1ca000; + /* background-color: #1ca000; */ } #privacy-item.audio-out { - background-color: #0069d4; + /* background-color: #0069d4; */ }