jpm
/
.dotfiles
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove deprecated and update

This commit is contained in:
John Mertz 2024-10-15 16:32:40 -06:00
parent 40bfc077ad
commit 1d93b91375
2 changed files with 105 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
waybar/config.template
View File

@ -19,7 +19,7 @@
// Choose the order of the modules // Choose the order of the modules
"modules-left": ["sway/workspaces", "sway/window"], "modules-left": ["sway/workspaces", "sway/window"],
"modules-center": [], "modules-center": [],
"modules-right": ["sway/mode", "custom/weather", "backlight", "cpu", "memory", "custom/disk", "temperature", "custom/battery", "pulseaudio", "tray", "custom/wallpaper", "custom/todo", "custom/osk", "custom/pkg", "custom/bar", "custom/gammastep", "custom/idle_mode", "custom/nc", "custom/clock", "custom/power"], "modules-right": ["sway/mode", "custom/weather", "custom/keyboard", "backlight", "cpu", "memory", "custom/disk", "temperature", "pulseaudio", "custom/battery", "tray", "custom/wallpaper", "custom/pkg", "custom/idle_mode", "custom/clock", "custom/nc"],
// Modules configuration // Modules configuration
"sway/workspaces": { "sway/workspaces": {
// "disable-scroll": true, // "disable-scroll": true,
@ -86,7 +86,7 @@
}, },
"temperature": { "temperature": {
"critical-threshold": 80, "critical-threshold": 80,
"format": "{temperatureC}°C" "format": " {temperatureC}°C"
}, },
"backlight": { "backlight": {
"device": "acpi_video1", "device": "acpi_video1",
@ -127,7 +127,8 @@
}, },
"on-scroll-up": "${HOME}/scripts/waybar/waybar-volume.sh up", "on-scroll-up": "${HOME}/scripts/waybar/waybar-volume.sh up",
"on-scroll-down": "${HOME}/scripts/waybar/waybar-volume.sh down", "on-scroll-down": "${HOME}/scripts/waybar/waybar-volume.sh down",
"on-click": "${HOME}/scripts/waybar/waybar-volume.sh" "on-click": "pavucontrol",
"on-click-right": "${HOME}/scripts/waybar/waybar-volume.sh"
}, },
"tray": { "tray": {
"icon-size": 24, "icon-size": 24,
@ -138,28 +139,25 @@
"exec": "echo '✶\nRotate wallpaper\nactive'", "exec": "echo '✶\nRotate wallpaper\nactive'",
"on-click": "${HOME}/scripts/sway/rotate-wallpaper.sh" "on-click": "${HOME}/scripts/sway/rotate-wallpaper.sh"
}, },
"custom/todo": { //"custom/todo": {
"interval": 86400, //"interval": 86400,
"exec": "echo '☑\nTo-do list\n'", //"exec": "echo '☑\nTo-do list\n'",
"on-click": "${HOME}/scripts/waybar/waybar-todo.sh", //"on-click": "${HOME}/scripts/waybar/waybar-todo.sh",
}, //},
"custom/osk": { "custom/keyboard": {
"interval": 1, "interval": 1,
"on-click": "${HOME}/scripts/waybar/waybar-keyboard.sh", "on-click": "${HOME}/scripts/waybar/waybar-keyboard.sh layout",
"exec": "if [ -e $HOME/.local/state/onscreen-keyboard ]; then CLASS='activated'; else CLASS=''; fi; echo '\uf11c \nToggle onscreen keyboard\n'$CLASS", "on-click-right": "${HOME}/scripts/waybar/waybar-keyboard.sh osk",
"exec": "${HOME}/scripts/waybar/waybar-keyboard.sh bar",
"return-type": "json",
}, },
"custom/pkg": { "custom/pkg": {
"interval": 60, "interval": 360,
"tooltip-format": "<span font='Anonymous Pro 12'><big>{:%d %B}</big>\n<tt><small>{calendar}</small></tt></span>", "tooltip-format": "<span font='Anonymous Pro 12'><big>{:%d %B}</big>\n<tt><small>{calendar}</small></tt></span>",
"on-click": "${HOME}/scripts/waybar/waybar-pkg.sh upgrade", "on-click": "alacritty --config-file ~/.dotfiles/alacritty/host.toml --class Alacritty-grave -e ${HOME}/scripts/waybar/waybar-pkg.sh upgrade",
"return-type": "json", "return-type": "json",
"exec": "${HOME}/scripts/waybar/waybar-pkg.sh bar" "exec": "${HOME}/scripts/waybar/waybar-pkg.sh bar"
}, },
"custom/bar": {
"interval": 86400,
"exec": "echo '\u200a\nLock bar\n'",
"on-click": "${HOME}/scripts/waybar/toggle.sh"
},
"custom/idle_mode": { "custom/idle_mode": {
"interval": 1, "interval": 1,
"return-type": "json", "return-type": "json",
@ -174,9 +172,8 @@
"on-click": "${HOME}/scripts/waybar/waybar-gammastep.sh toggle" "on-click": "${HOME}/scripts/waybar/waybar-gammastep.sh toggle"
}, },
"custom/nc": { "custom/nc": {
"on-click": "swaync-client -t",
"tooltip": true, "tooltip": true,
"format": "{icon}", "format": "{icon} Test",
"format-icons": { "format-icons": {
"notification": " <span foreground=red><sup></sup></span>", "notification": " <span foreground=red><sup></sup></span>",
"none": "<span style='color: #928374'> </span>", "none": "<span style='color: #928374'> </span>",
@ -188,20 +185,16 @@
"dnd-inhibited-none": " " "dnd-inhibited-none": " "
}, },
"return-type": "json", "return-type": "json",
"exec-if": "which swaync-client",
"exec": "swaync-client -swb", "exec": "swaync-client -swb",
"on-click": "swaync-client -t -sw", "exec-if": "which swaync-client",
"on-click": "swaync-client -t",
"on-click-right": "swaync-client -d", "on-click-right": "swaync-client -d",
"escape": true "escape": true
}, },
"custom/clock": { "custom/clock": {
"interval": 60, "interval": 60,
"on-click": "${HOME}/.local/bin/firefox/firefox-bin https://papillon.john.me.tz/calendar.php", "on-click": "flatpak run org.mozilla.Firefox https://papillon.john.me.tz/calendar.php",
"return-type": "json", "return-type": "json",
"exec": "echo '{\"class\": \"clock\", \"text\": \"'$(date '+%H:%M')'\", \"tooltip\": \"'$(date '+%A, %B %d, %Y | %Y-%m-%d')'\"}'" "exec": "echo '{\"class\": \"clock\", \"text\": \"'$(date '+%H:%M')'\", \"tooltip\": \"'$(date '+%A, %B %d, %Y | %Y-%m-%d')'\"}'"
}, },
"custom/power": {
"format": "\u23FB",
"on-click": "if [ $(sudo pgrep -xc wofi) -gt 0 ]; then pkill wofi; else ${HOME}/scripts/sway/power-menu.sh; fi"
},
}] }]

170
waybar/style.css
View File

@ -57,7 +57,7 @@ window#waybar {
color: @fg; color: @fg;
} }
#window, #mode, #custom-weather, #mpd, #cpu, #memory, #custom-disk, #temperature, #custom-battery, #pulseaudio, #tray, #custom-wallpaper, #custom-todo, #custom-osk, #custom-pkg, #custom-bar, #custom-idle_mode, #custom-clock, #custom-power { #window, #mode, #custom-weather, #mpd, #cpu, #memory, #custom-disk, #temperature, #custom-battery, #pulseaudio, #tray, #custom-todo, #custom-keyboard, #custom-pkg, #custom-clock {
color: @grey06; color: @grey06;
padding: 0px 2px; padding: 0px 2px;
margin: 0px; margin: 0px;
@ -65,16 +65,11 @@ window#waybar {
/* Tray */ /* Tray */
#custom-wallpaper, #custom-todo, #custom-osk { #tray, #custom-wallpaper, #custom-pkg, #custom-clock, #custom-idle_mode {
font-size: 22px; background: @grey03;
margin-top: -8px; border-bottom: 1px solid @fg;
margin-bottom: -8px;
margin-left: 2px;
margin-right: 2px;
}
#tray, #custom-wallpaper, #custom-todo, #custom-osk, #custom-pkg, #custom-bar, #custom-clock, #custom-power {
color: @bluehi; color: @bluehi;
margin: 0px;
} }
/* Workspaces */ /* Workspaces */
@ -113,7 +108,7 @@ window#waybar {
/* MPD */ /* MPD */
#mpd { #mpd {
color: @bg; color: @fg;
} }
/* Weather */ /* Weather */
@ -123,36 +118,16 @@ window#waybar {
margin-bottom: -2px; margin-bottom: -2px;
} }
/* CPU */ /* Keyboard */
#cpu { #custom-keyboard {
color: @fg; color: @bluehi;
color: @greenhi; margin-right: -2px;
margin-top: -1px;
} }
/* Memory */ #custom-keyboard.alternate {
color: @orange;
#memory {
color: @fg;
color: @purplehi;
}
/* Disk */
#custom-disk {
color: @fg;
color: @purple;
}
/* Temperature */
#temperature {
color: @fg;
color: @yellowhi;
}
#temperature.critical {
color: @redhi;
} }
/* Backlight */ /* Backlight */
@ -160,18 +135,74 @@ window#waybar {
#backlight { #backlight {
margin-left: 5px; margin-left: 5px;
margin-right: 2px; margin-right: 2px;
color: @fg; color: @yellowhi;
}
/* CPU */
#cpu {
color: @greenhi; color: @greenhi;
} }
/* Memory */
#memory {
color: @purplehi;
}
/* Disk */
#custom-disk {
color: @orangehi;
}
/*
* green
* blue
* purple
* orange
*
* red
* yellow
* aqua
* redhi
* greenhi
* yellowhi
* bluehi
* purple hi
* aquahi
* orangehi
*/
/* Temperature */
#temperature {
color: @yellowhi;
}
#temperature.critical {
color: @redhi;
}
/* Pulseaudio */
#pulseaudio {
color: @bluehi;
}
#pulseaudio.muted {
color: @grey06;
}
/* Battery */ /* Battery */
#custom-battery { #custom-battery {
color: @green; color: @green;
margin-top: -1px;
} }
#custom-battery.charging { #custom-battery.charging {
color: @green; margin-top: 2px;
} }
#custom-battery.discharging { #custom-battery.discharging {
@ -191,16 +222,6 @@ window#waybar {
color: @redhi; color: @redhi;
} }
/* Pulseaudio */
#pulseaudio {
color: @bluehi;
}
#pulseaudio.muted {
color: @grey06;
}
/* Tray */ /* Tray */
#tray { #tray {
@ -210,22 +231,8 @@ window#waybar {
/* Wallpaper rotation */ /* Wallpaper rotation */
#custom-wallpaper { #custom-wallpaper {
margin-left: -4px; font-size: 22px;
margin-top: -10px; margin-top: -4px;
}
/* Todo-txt */
#custom-todo {
}
/* On-Screen Keyboard */
#custom-osk {
}
#custom-osk.activated {
color: @white;
} }
/* Package upgrades */ /* Package upgrades */
@ -238,36 +245,29 @@ window#waybar {
color: @orange; color: @orange;
} }
/* Bar locker */
#custom-bar {
margin-right: 6px;
}
/* Notifications */
#custom-nc {
margin-left: 5px;
padding-right: 5px;
font-family: "NotoSansMono Nerd Font";
}
/* Idle Mode */ /* Idle Mode */
#custom-idle_mode { #custom-idle_mode {
font-family: "Font Awesome 6 Brands", "Font Awesome 6 Free"; font-family: "Font Awesome 6 Brands", "Font Awesome 6 Free";
padding-right: 3px;
}
#custom-idle_mode.none {
color: @red;
} }
/* Clock */ /* Clock */
#custom-clock { #custom-clock {
color: @fg; color: @fg;
font-weight: bold;
margin: 0px;
} }
/* Power button */ /* Notifications */
#custom-power { #custom-nc {
margin-right: 0px; font-family: "NotoSansMono Nerd Font";
margin-top: 1px; background: @grey06;
color: @red; margin: 0px;
} }