diff --git a/config/hypr/scripts/ChangeLayoutMenu.sh b/config/hypr/scripts/ChangeLayoutMenu.sh index a1ca30c..4c04c15 100755 --- a/config/hypr/scripts/ChangeLayoutMenu.sh +++ b/config/hypr/scripts/ChangeLayoutMenu.sh @@ -31,15 +31,16 @@ printf "1. default\n" printf "2. plasma-style\n" printf "3. gnome-style\n" printf "4. simple panel\n" -printf "5. top & bot panel\n" -printf "6. left panel\n" -printf "7. right panel\n" -printf "8. top & left panel\n" -printf "9. top & right panel\n" -printf "10. bottom & left panel\n" -printf "11. bottom & right panel\n" -printf "12. all sides\n" -printf "13. no panel" +printf "5. simple 2 panel\n" +printf "6. top & bot panel\n" +printf "7. left panel\n" +printf "8. right panel\n" +printf "9. top & left panel\n" +printf "10. top & right panel\n" +printf "11. bottom & left panel\n" +printf "12. bottom & right panel\n" +printf "13. all sides\n" +printf "14. no panel" } main() { @@ -62,38 +63,42 @@ main() { ln -sf "$WOFICONFIGS/config-default" "$WOFICONFIG" ;; 5) - ln -sf "$CONFIG/config-dual" "$WCONFIG" + ln -sf "$CONFIG/config-simple2" "$WCONFIG" ln -sf "$WOFICONFIGS/config-default" "$WOFICONFIG" ;; 6) - ln -sf "$CONFIG/config-left" "$WCONFIG" + ln -sf "$CONFIG/config-dual" "$WCONFIG" ln -sf "$WOFICONFIGS/config-default" "$WOFICONFIG" ;; 7) - ln -sf "$CONFIG/config-right" "$WCONFIG" + ln -sf "$CONFIG/config-left" "$WCONFIG" ln -sf "$WOFICONFIGS/config-default" "$WOFICONFIG" ;; 8) - ln -sf "$CONFIG/config-dual-TL" "$WCONFIG" + ln -sf "$CONFIG/config-right" "$WCONFIG" ln -sf "$WOFICONFIGS/config-default" "$WOFICONFIG" ;; 9) - ln -sf "$CONFIG/config-dual-TR" "$WCONFIG" + ln -sf "$CONFIG/config-dual-TL" "$WCONFIG" ln -sf "$WOFICONFIGS/config-default" "$WOFICONFIG" ;; 10) - ln -sf "$CONFIG/config-dual-BL" "$WCONFIG" + ln -sf "$CONFIG/config-dual-TR" "$WCONFIG" ln -sf "$WOFICONFIGS/config-default" "$WOFICONFIG" ;; 11) - ln -sf "$CONFIG/config-dual-BR" "$WCONFIG" + ln -sf "$CONFIG/config-dual-BL" "$WCONFIG" ln -sf "$WOFICONFIGS/config-default" "$WOFICONFIG" ;; 12) + ln -sf "$CONFIG/config-dual-BR" "$WCONFIG" + ln -sf "$WOFICONFIGS/config-default" "$WOFICONFIG" + ;; + 13) ln -sf "$CONFIG/config-all" "$WCONFIG" ln -sf "$WOFICONFIGS/config-default" "$WOFICONFIG" ;; - 13) + 14) if pgrep -x "waybar" >/dev/null; then killall waybar exit diff --git a/config/waybar/modules b/config/waybar/modules index 99cb60d..09256cc 100644 --- a/config/waybar/modules +++ b/config/waybar/modules @@ -3,8 +3,11 @@ "interval": 2, "align": 0, "rotate": 0, - "format": "{icon} {percent}%", - "format-icons": ["󰃞", "󰃟", "󰃠"], + //"format": "{icon} {percent}%", + //"format-icons": ["󰃞", "󰃟", "󰃠"], + "format": "{icon}", + "format-icons": ["󰛩", "󱩎", "󱩏", "󱩑", "󱩒", "󱩓", "󱩔", "󱩕", "󰛨"], + "tooltip-format": "{percent}%", "icon-size": 10, "on-click": "", "on-click-middle": "", @@ -75,8 +78,9 @@ }, "clock": { + "interval": 1, //"format": " {:%I:%M %p}", - "format": " {:%H:%M}", + "format": " {:%H:%M:%S}", "format-alt": " {:%H:%M  %Y, %d %B, %A}", "tooltip-format": "{calendar}", "calendar": { @@ -164,7 +168,20 @@ "on-scroll-up": "hyprctl dispatch workspace e+1", "on-scroll-down": "hyprctl dispatch workspace e-1", }, - + +"hyprland/workspaces#2": { + "format": "{icon}", + "on-click": "activate", + "on-scroll-up": "hyprctl dispatch workspace e+1", + "on-scroll-down": "hyprctl dispatch workspace e-1", + "format-icons": { + "active": "", + "default": "", + }, + "active-only": false, + "all-outputs": true +}, + "idle_inhibitor": { "format": "{icon}", "format-icons": { @@ -207,6 +224,7 @@ "tooltip-format-ethernet": "{ifname} 󰈁", "tooltip-format-disconnected": "󰈂 Disconnected", "max-length": 50, + "format-icons": ["󰤯","󰤟","󰤢","󰤥","󰤨"] }, "pulseaudio": { @@ -315,6 +333,16 @@ "on-click-right": "$HOME/.config/hypr/scripts/ChangeLayoutMenu.sh", "on-click-middle": "~/.config/hypr/scripts/Wallpaper.sh swaybg", }, + +"custom/playerctl": { + "format": "{}", + "return-type": "json", + "max-length": 35, + "exec": "playerctl -a metadata --format '{\"text\": \"{{artist}} ~ {{markup_escape(title)}}\", \"tooltip\": \"{{playerName}} : {{markup_escape(title)}}\", \"alt\": \"{{status}}\", \"class\": \"{{status}}\"}' -F", + "on-click-middle": "playerctl play-pause", + "on-click": "playerctl previous", + "on-click-right": "playerctl next" +}, "custom/power": { "format": "⏻ ", diff --git a/config/waybar/style/style-simple.css b/config/waybar/style/style-simple.css deleted file mode 100644 index 80c6441..0000000 --- a/config/waybar/style/style-simple.css +++ /dev/null @@ -1,83 +0,0 @@ -*{ -font-family: "JetBrainsMono Nerd Font"; -font-weight: bold; -min-height: 0; -/* set font-size to 100% if font scaling is set to 1.00 using nwg-look */ -font-size: 98%; -font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"'; -padding: 0px; -margin-top: 1px; -margin-bottom: 1px; -} - -window#waybar { - background: rgba(0, 0, 0, 0.7); - border-radius: 10px; -} -window#waybar.empty { - background-color: transparent; -} -window#waybar.empty #window { - padding: 0px; - margin: 0px; - border: 0px; - /* background-color: rgba(66,66,66,0.5); */ /* transparent */ - background-color: transparent; -} - -#custom-menu, #workspaces { - border-radius: 10px; - /*background-color: #11111b;*/ - color: #b4befe; - margin-right: 15px; - padding-left: 10px; - padding-right: 10px; -} - -#workspaces button { - /*background: #11111b;*/ - color: #b4befe; -} - - -#clock, #backlight, #pulseaudio, #bluetooth, #network, #battery { - border-radius: 10px; - /*background-color: #11111b;*/ - color: #cdd6f4; - padding-left: 10px; - padding-right: 10px; - margin-right: 15px; -} - -#backlight, #bluetooth { - border-top-right-radius: 0; - border-bottom-right-radius: 0; - padding-right: 5px; - margin-right: 0 -} - -#pulseaudio, #network { - border-top-left-radius: 0; - border-bottom-left-radius: 0; - padding-left: 5px; -} - -#clock, #custom-light_dark { - margin-right: 0; -} - -@keyframes blink { - to { - color: #000000; - } -} - -#battery.critical:not(.charging) { - background-color: #f38ba8; - color: #f38ba8; - animation-name: blink; - animation-duration: 0.5s; - animation-timing-function: linear; - animation-iteration-count: infinite; - animation-direction: alternate; -} \ No newline at end of file diff --git a/config/waybar/style/style-simple2.css b/config/waybar/style/style-simple2.css new file mode 100644 index 0000000..adfb1fd --- /dev/null +++ b/config/waybar/style/style-simple2.css @@ -0,0 +1,174 @@ +@define-color foreground #FBF1C7; +@define-color dim_foreground1 #504945; +@define-color dim_foreground2 #3C3836; +@define-color background #282828; +@define-color green #B8BB26; +@define-color red #eb6f92; +@define-color blue #31748f; + +window#waybar { + background: @background; + border-radius: 15px 15px 15px 15px; + border: 1px solid @foreground; + color: @foreground; + font-family: JetBrainsMono Nerd Font; + font-weight: bold; + font-size: 98%; +} + +.modules-left { + margin-left: 10px; +} + +.modules-right { + margin-right: 10px; +} + +#workspaces button { + color: @dim_foreground1; + transition: color 0.3s ease-in; + padding-left: 5px; +} + +#workspaces button.active { + color: @foreground; +} + +#workspaces button.focused { + color: @foreground; +} + +#workspace button.urgent { + color: @foreground; +} + +button:hover { + font-size: inherit; + box-shadow: inherit; + text-shadow: inherit; + background: transparent; + border-color: transparent; +} + +#clock, +#battery, +#backlight, +#pulseaudio, +#tray, +#language, +#workspaces, +#network, +#bluetooth, +#custom-playerctl, +#custom-launcher, +#custom-weather, +#custom-hyprpicker, +#custom-power { + margin: 12px 0px 12px 0px; +} + + +#clock, +#battery, +#backlight, +#pulseaudio, +#tray, +#language, +#workspaces, +#network, +#bluetooth, +#custom-playerctl { + background: @dim_foreground1; + color: @foreground; + border-radius: 10px; +} + +#tray, +#workspaces { + background: @dim_foreground2; +} + +#network, +#battery, +#language, +#backlight, +#pulseaudio, +#bluetooth { + border-radius: 0px; + padding: 0px 8px 0px 5px; + font-size: 16px; +} + +#network { + border-radius: 10px 0px 0px 10px; +} + +#battery { + border-radius: 0px 10px 10px 0px; +} + +#custom-menu, +#custom-launcher { + margin-left: 12px; + color: @green; +} + +#custom-power { + margin-right: 12px; + color: @red; +} + +#workspaces, +#custom-weather, +#clock { + margin-left: 8px; +} + +#clock { + margin-left: 3px; +} + +#custom-hyprpicker, +#tray, +#custom-launcher, +#battery { + margin-right: 8px; +} + +#battery { + margin-right: 3px; +} + +#network { + padding-left: 12px; +} + +#language { + padding: 0px 2px 0px 2px; +} + +#clock, +#tray, +#custom-playerctl { + padding: 0px 8px 0px 8px; +} + +#custom-power-menu, +#custom-hyprpicker, +#custom-launcher { + font-size: 17px; +} + +#custom-hyprpicker { + margin-right: 12px; + color: @blue; + font-size: 20px; +} + +tooltip { + border-radius: 15px; + border: 4px solid @dim_foreground1; + padding: 15px; + background-color: @background; + color: @foreground; +} \ No newline at end of file