diff --git a/CHANGELOG.md b/CHANGELOG.md index 64de9e7..afd9290 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ ## CHANGES +### 28-Oct-2023 +- Various fixes / cleanup on waybar and modules +- added simple layout 2 (can be summoned with SUPER ALT W) +

+ + + ### 26-Oct-2023 - Automatic nvidia gpu detection and setting WLR_NO_CURSORS of ENVariables.conf automatically diff --git a/config/hypr/HelpFile.md b/config/hypr/HelpFile.md index 7d0e096..abec965 100644 --- a/config/hypr/HelpFile.md +++ b/config/hypr/HelpFile.md @@ -25,7 +25,6 @@ - right click on update  waybar module *wallpaper cycle using swaybg* (no animations) - To change permanently the wallpaper edit the file in *~/.config/hypr/configs/Execs.conf* - - For a persistent wallpaper after dark-light mode, edit your Execs.conf. Either delete or put # before exec-once=swww query | swww init and delete the # before exec-once = swww init (Lines 6 and 7 on Execs.conf ) - for the wallpaper styles and configurations, you can watch my video about it *https://youtu.be/6ZGzOjMJBe4* @@ -64,12 +63,12 @@ Super Tab *cycle through workspaces* # waybar customizations - - waybar font too big or too small. Edit the font-size in waybar styles located in ~/.config/hypr/waybar/styles/ . By default, it is set to 100%. After adjusting the GTK font scaling to your liking, edit all the waybar styles. Reduce or increase according to your needs. NOTE that its on percent %. You can also change to px whichever suits you. + - waybar font too big or too small. Edit the font-size in waybar styles located in ~/.config/waybar/styles/ . By default, it is set to 100%. After adjusting the GTK font scaling to your liking, edit all the waybar styles. Reduce or increase according to your needs. NOTE that its on percent %. You can also change to px whichever suits you. - - if you want 12h format instead of 24H format, edit the ~/.config/hypr/waybar/modules look for clock. delete the // and add // or delete the previous one + - if you want 12h format instead of 24H format, edit the ~/.config/waybar/modules look for clock. delete the // and add // or delete the previous one - CPU Temperature: - - a.) to change from deg C to deg F , edit the ~/.config/hypr/waybar/modules look for "temperature". Change the format to "format": "{temperatureF}°F {icon}", + - a.) to change from deg C to deg F , edit the ~/.config/waybar/modules look for "temperature". Change the format to "format": "{temperatureF}°F {icon}", - b.) to fix the temperature if not showing correctly, comment "thermal zone": 0 by putting // before. Delete the // on the "hwmon path". Refresh waybar by pressing CTRL SHIFT w. If still not showing correctly, navigate to /sys/class/hwmon/ and open each hwmon. Look for k10temp for amd. Not sure about intel cpu. and edit accordingly the hwmon path in the "temperature" waybar module. - b.1) use this function to easily identify the hwmon path. Ran this in your terminal ``` for i in /sys/class/hwmon/hwmon*/temp*_input; do echo "$(<$(dirname $i)/name): $(cat ${i%_*}_label 2>/dev/null || echo $(basename ${i%_*})) $(readlink -f $i)"; done ``` 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/configs/config-left b/config/waybar/configs/config-left index bb718a0..b7bac1f 100644 --- a/config/waybar/configs/config-left +++ b/config/waybar/configs/config-left @@ -14,20 +14,21 @@ //"gtk-layer-shell": true, "modules-left": [ - "clock#vertical", - "custom/light_dark", + "clock#vertical", + "custom/light_dark", ], "modules-center": [ - "hyprland/workspaces", + "hyprland/workspaces", ], "modules-right": [ - "tray", - "backlight#vertical", - "pulseaudio#microphone_vertical", - "pulseaudio#vertical", - "custom/power_vertical", - "custom/menu", + "tray", + "network", + "backlight#vertical", + "pulseaudio#microphone_vertical", + "pulseaudio", + "custom/power_vertical", + "custom/menu", ], } diff --git a/config/waybar/configs/config-right b/config/waybar/configs/config-right index 8a23eaa..64a2c60 100644 --- a/config/waybar/configs/config-right +++ b/config/waybar/configs/config-right @@ -24,9 +24,10 @@ "modules-right": [ "tray", + "network", "backlight#vertical", "pulseaudio#microphone_vertical", - "pulseaudio#vertical", + "pulseaudio", "custom/power_vertical", "custom/menu", ], diff --git a/config/waybar/configs/config-simple2 b/config/waybar/configs/config-simple2 new file mode 100644 index 0000000..ca62a5a --- /dev/null +++ b/config/waybar/configs/config-simple2 @@ -0,0 +1,27 @@ +{ +"include": "~/.config/waybar/modules", +"layer": "top", +"position": "top", +"width": 1050, +"margin-bottom": 5, +"margin-top": 5, + +"modules-left": [ + "clock", + "custom/weather", + ], + +"modules-center": [ + "hyprland/workspaces#2" + ], + +"modules-right": [ + "custom/menu", + "tray", + "network", + "bluetooth", + "backlight", + "pulseaudio", + "battery", + "custom/power"], +} diff --git a/config/waybar/modules b/config/waybar/modules index 99cb60d..7ec2b2a 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": { @@ -198,21 +215,22 @@ "network": { "format": "{ifname}", - "format-wifi": " {signalStrength}%", - "format-ethernet": "󰈁 Wired", - "format-disconnected": "", //An empty format will hide the module. + "format-wifi": "{icon}", + "format-ethernet": "󰌘", + "format-disconnected": "󰌙", "tooltip-format": "{ipaddr}  {bandwidthUpBytes}  {bandwidthDownBytes}", "format-linked": "󰈁 {ifname} (No IP)", - "tooltip-format-wifi": "{essid}  ({signalStrength}%)", - "tooltip-format-ethernet": "{ifname} 󰈁", - "tooltip-format-disconnected": "󰈂 Disconnected", + "tooltip-format-wifi": "{essid} {icon} {signalStrength}%", + "tooltip-format-ethernet": "{ifname} 󰌘", + "tooltip-format-disconnected": "󰌙 Disconnected", "max-length": 50, + "format-icons": ["󰤯","󰤟","󰤢","󰤥","󰤨"] }, "pulseaudio": { - "format": "{icon} {volume} %", + "format": "{icon}", "format-bluetooth": "{icon}  {volume} %", - "format-muted": "", + "format-muted": "󰖁", "format-icons": { "headphone": "", "hands-free": "", @@ -233,7 +251,7 @@ "pulseaudio#microphone": { "format": "{format_source}", - "format-source": " {volume} %", + "format-source": " {volume}%", "format-source-muted": "", "on-click": "~/.config/hypr/scripts/Volume.sh --toggle-mic", "on-click-right": "pavucontrol -t 4", @@ -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": "⏻ ", @@ -372,7 +400,10 @@ "align": 0, "rotate": 0, "format": "{icon}", - "format-icons": ["󰃞", "󰃟", "󰃠"], + "format-icons": ["󰛩", "󱩎", "󱩏", "󱩑", "󱩒", "󱩓", "󱩔", "󱩕", "󰛨"], + "tooltip-format": "{percent}%", + "icon-size": 10, + "on-update": "", "icon-size": 10, "on-click": "", "on-click-middle": "", @@ -384,7 +415,7 @@ }, "clock#vertical": { - "format": "{:\n%H\n%M\n\n \n%d\n%m\n%y}", + "format": "{:\n%H\n%M\n%S\n\n \n%d\n%m\n%y}", "interval": 1, //"format": "{:\n%I\n%M\n%p\n\n \n%d\n%m\n%y}", "tooltip": true, @@ -413,27 +444,6 @@ "on-click-right": "foot --title btop sh -c 'btop'", }, -"pulseaudio#vertical": { - "format": "{icon}", - "format-bluetooth": "\n{icon}", - "format-bluetooth-muted": "\n󰖁", - "format-muted": "󰖁", - "format-icons": { - "headphone": "󰋋", - "hands-free": "󰋋", - "headset": "󰋋", - "phone": "", - "portable": "", - "car": "", - "default": ["", "", "󰕾", ""], - }, - "on-click-right": "pavucontrol", - "on-click": "~/.config/hypr/scripts/Volume.sh --toggle", - "on-scroll-up": "~/.config/hypr/scripts/Volume.sh --inc", - "on-scroll-down": "~/.config/hypr/scripts/Volume.sh --dec", - "tooltip": true, -}, - "pulseaudio#microphone_vertical": { "format": "{format_source}", "format-source": "󰍬", 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