Merge pull request #73 from BluishHumility/main

merge bluish fork: housekeeping fixes, updates to waybar
This commit is contained in:
Johannes Kamprad
2024-07-31 08:46:08 +02:00
committed by GitHub
6 changed files with 204 additions and 444 deletions

View File

@@ -8,7 +8,7 @@
# title=foot
# locked-title=no
font=JetBrainsMono-Regular:size=13
font=JetBrainsMono-Regular:size=11
# font-bold=<bold variant of regular font>
# font-italic=<italic variant of regular font>
# font-bold-italic=<bold+italic variant of regular font>

View File

@@ -24,8 +24,7 @@
"pulseaudio",
"custom/keyboard-layout",
"battery",
"backlight#icon",
"backlight#value",
"backlight",
"clock",
"tray",
//"custom/weather",
@@ -34,83 +33,10 @@
// Modules
"idle_inhibitor": {
"format": "{icon} ",
"format-icons":{
"activated": "",
"deactivated": ""
}
},
"battery": {
"states": {
"warning": 30,
"critical": 15
},
"format": "{icon} {capacity}%",
"format-icons": ["", "", "", "", ""]
},
"clock": {
"interval": 10,
"format-alt": " {:%e %b %Y}", // Icon: calendar-alt
"format": "{:%H:%M}",
"tooltip-format": "{:%e %B %Y}"
},
"cpu": {
"interval": 5,
"format": " {usage}% ({load})", // Icon: microchip
"states": {
"warning": 70,
"critical": 90,
},
"on-click": "footclient -T waybar_htop -e htop",
},
"custom/keyboard-layout": {
"exec": "i=$(swaymsg -t get_inputs); echo \"\"; echo \"$i\" | grep -m1 'xkb_active_layout_name' | cut -d '\"' -f4",
"format": "",
// Interval set only as a fallback; use signal to update the module more immediately
"interval": 30,
// See example config for sending signal to Waybar in ~/.config/sway/config.d/input
"signal": 1,
"on-click": "~/.config/waybar/scripts/keyhint.sh",
},
"memory": {
"interval": 5,
"format": " {}%", // Icon: memory
"on-click": "footclient -T waybar_htop -e htop",
"states": {
"warning": 70,
"critical": 90
}
},
"network": {
"interval": 5,
"format-wifi": " {essid} ({signalStrength}%)", // Icon: wifi
"format-ethernet": " {ifname}: {ipaddr}/{cidr}", // Icon: ethernet
"format-disconnected": "⚠ Disconnected",
"tooltip-format": "{ifname}: {ipaddr}",
"on-click": "footclient -T waybar_nmtui -e nmtui",
},
"network#vpn": {
"interface": "tun0",
"format": " {essid} ({signalStrength}%)",
"format-disconnected": "⚠ Disconnected",
"tooltip-format": "{ifname}: {ipaddr}/{cidr}",
},
"sway/mode": {
"format": "{}",
"tooltip": false
},
"sway/window": {
"format": "{}",
"max-length": 120
"custom/launcher": {
"format":"<span size='x-large'></span>",
"on-click": "exec wofi -c ~/.config/wofi/config -I",
"tooltip": false,
},
"sway/workspaces": {
@@ -127,6 +53,57 @@
}
},
"sway/mode": {
"format": "{}",
"tooltip": false
},
"sway/window": {
"format": "{}",
"max-length": 120
},
"network": {
"format-disabled": " Disabled ",
"format-wifi": " {bandwidthDownBits:>} 󰶡 {bandwidthUpBits:>} 󰶣 ",
"tooltip-format-wifi": "{essid}",
"format-ethernet": " {bandwidthDownBits:>} 󰶡 {bandwidthUpBits:>} 󰶣 ",
"tooltip-format-ethernet": "{ifname}: {ipaddr}/{cidr}",
"format-disconnected": " Disconnected ",
"on-click": "footclient -T waybar_nmtui -e nmtui",
"interval": 2,
},
"idle_inhibitor": {
"format": "{icon} ",
"format-icons": {
"activated": "",
"deactivated": ""
},
"tooltip-format-activated": "Idle Inhibitor Activated",
"tooltip-format-deactivated": "Idle Inhibitor Deactivated"
},
"memory": {
"interval": 5,
"format": "{:>3}% ",
"on-click": "footclient -T waybar_htop -e htop",
"states": {
"warning": 70,
"critical": 90
}
},
"cpu": {
"interval": 5,
"format": "{usage:>3}% ",
"states": {
"warning": 70,
"critical": 90,
},
"on-click": "footclient -T waybar_htop -e htop",
},
"pulseaudio": {
"scroll-step": 2,
"format": "{icon} {volume}% ",
@@ -143,6 +120,59 @@
"on-click": "pavucontrol"
},
"custom/keyboard-layout": {
"exec": "i=$(swaymsg -t get_inputs); echo \"\"; echo \"$i\" | grep -m1 'xkb_active_layout_name' | cut -d '\"' -f4",
"format": " ",
// Interval set only as a fallback; use signal to update the module more immediately
"interval": 30,
// See example config for sending signal to Waybar in ~/.config/sway/config.d/input
"signal": 1,
"on-click": "~/.config/waybar/scripts/keyhint.sh",
},
"battery": {
"states": {
"warning": 30,
"critical": 15
},
"format": "{icon} {capacity}% ",
"format-icons": ["", "", "", "", ""]
},
"backlight": {
"format": "{icon} {percent}% ",
"format-icons": ["󰄰", "󰪞", "󰪟", "󰪠", "󰪡", "󰪢", "󰪣", "󰪤", "󰪥"],
"tooltip-format": "Backlight (Scroll): {percent:}%",
"on-scroll-down": "brightnessctl -c backlight set 5%-",
"on-scroll-up": "brightnessctl -c backlight set +5%"
},
"clock": {
"interval": 10,
"format": "󰅐 {:%H:%M}",
"format-alt": "󰅐 {:%OI:%M %p}",
"tooltip-format": " {:%A %m/%d}\n\n<tt><small>{calendar}</small></tt>",
"calendar": {
"on-scroll": 1,
"format": {
"months": "<span color='#ffead3'><b>{}</b></span>",
"days": "<span color='#ecc6d9'><b>{}</b></span>",
"weeks": "<span color='#99ffdd'><b>W{}</b></span>",
"weekdays": "<span color='#ffcc66'><b>{}</b></span>",
"today": "<span color='#ff6699'><b><u>{}</u></b></span>"
},
},
"actions": {
"on-scroll-up": "shift_up",
"on-scroll-down": "shift_down"
},
},
"tray": {
"icon-size": 18,
"spacing":10,
},
// to use the weather module replace <your_location> with your city or town
// note: do not use spaces: new york would be newyork
"custom/weather": {
@@ -151,48 +181,6 @@
"interval": 600,
},
"tray": {
"icon-size": 18,
"spacing":10,
},
"backlight#icon": {
"format": "{icon}",
"format-icons": [""],
"on-scroll-down": "brightnessctl -c backlight set 1%-",
"on-scroll-up": "brightnessctl -c backlight set +1%"
},
"backlight#value" :{
"format": "{percent}%",
"on-scroll-down": "brightnessctl -c backlight set 1%-",
"on-scroll-up": "brightnessctl -c backlight set +1%"
},
"custom/firefox": {
"format": " ",
"on-click": "exec firefox",
"tooltip": false
},
"custom/terminal": {
"format": " ",
"on-click": "exec xfce4-terminal",
"tooltip": false
},
"custom/files": {
"format": " ",
"on-click": "exec thunar",
"tooltip": false
},
"custom/launcher": {
"format":"<span size='x-large'></span>",
"on-click": "exec wofi -c ~/.config/wofi/config -I",
"tooltip": false,
},
"custom/power": {
"format":"⏻",
"on-click": "exec ~/.config/waybar/scripts/power-menu.sh",

View File

@@ -54,23 +54,23 @@
color: #e3e3ea;
background-color: @base1;
font-family: JetBrainsMono;
font-size: 14px;
font-size: 13px;
}
/* Every modules */
#battery,
#clock,
#backlight,
#cpu,
#custom-keyboard-layout,
#memory,
#mode,
#custom-weather,
#network,
#idle_inhibitor,
#memory,
#cpu,
#pulseaudio,
#custom-keyboard-layout,
#battery,
#backlight,
#clock,
#temperature,
#tray,
#idle_inhibitor {
#custom-weather,
#tray {
padding:0.5rem 0.6rem;
margin: 1px 0px;
}
@@ -79,6 +79,83 @@
* Modules styles
* -------------------------------------------------------------------------- */
#custom-launcher {
font-size:15px;
margin-left:15px;
margin-right:10px;
}
#workspaces {
font-size:13px;
}
#workspaces button {
border-bottom: 3px solid transparent;
margin-bottom: 0px;
padding:0px;
}
#workspaces button.focused {
border-bottom: 3px solid @highlight;
margin-bottom: 1px;
padding-left:0;
}
#workspaces button.urgent {
border-color: #c9545d;
color: #c9545d;
}
#mode {
background: @highlight;
border-bottom: 3px transparent;
color:white;
margin-left: 5px;
padding: 7px;
}
#window {
font-weight: bold;
}
#network.disconnected {
color: orange;
}
#memory {
animation-timing-function: linear;
animation-iteration-count: infinite;
animation-direction: alternate;
}
#memory.warning {
color: orange;
}
#memory.critical {
color: red;
animation-name: blink-critical;
animation-duration: 2s;
padding-left:5px;
padding-right:5px;
}
#cpu.warning {
color: orange;
}
#cpu.critical {
color: red;
}
#pulseaudio {
padding-top:6px;
}
#pulseaudio.muted {
color: @highlight;
}
#battery {
animation-timing-function: linear;
animation-iteration-count: infinite;
@@ -103,94 +180,17 @@
animation-duration: 2s;
}
#cpu.warning {
color: orange;
}
#cpu.critical {
color: red;
}
#memory {
animation-timing-function: linear;
animation-iteration-count: infinite;
animation-direction: alternate;
}
#memory.warning {
color: orange;
}
#memory.critical {
color: red;
animation-name: blink-critical;
animation-duration: 2s;
padding-left:5px;
padding-right:5px;
}
#mode {
background: @highlight;
border-bottom: 3px transparent;
color:white;
margin-left: 5px;
padding: 7px;
}
#network.disconnected {
color: orange;
}
#pulseaudio {
padding-top:6px;
}
#pulseaudio.muted {
color: @highlight;
#backlight.icon {
padding-right:1px;
font-size: 13px;
}
#temperature.critical {
color: red;
}
#window {
font-weight: bold;
}
#workspaces {
font-size:13px;
}
#workspaces button {
border-bottom: 3px solid transparent;
margin-bottom: 0px;
padding:0px;
}
#workspaces button.focused {
border-bottom: 3px solid @highlight;
margin-bottom: 1px;
padding-left:0;
}
#workspaces button.urgent {
border-color: #c9545d;
color: #c9545d;
}
#custom-power {
margin-left:15px;
margin-right:15px;
font-size:15px;
}
#custom-launcher {
font-size:15px;
margin-left:15px;
margin-right:10px;
}
#backlight.icon {
padding-right:1px;
font-size: 13px;
}

View File

@@ -53,7 +53,7 @@ https://forum.endeavouros.com/t/sway-edition-general-conversation
- Background handled by swaybg
- Gtk3 theme handled by lxappearance
- Filebrowser = Thunar
- Default Terminal-Emulator = XFCE4-Terminal and/or Termite
- Default Terminal-Emulator = Foot
- Text-Editor = xed/nano
- Bar = Waybar
- Sound = Pulseaudio
@@ -63,7 +63,7 @@ Main shortcuts: `~/.config/sway/cheatsheet`
<kbd>MOD</kbd> key is set to the <kbd>WINKEY</kbd>/<kbd>LINKEY</kbd>
- <kbd>MOD</kbd>+<kbd>Return</kbd> = open floating terminal (XFCE4-Terminal)
- <kbd>MOD</kbd>+<kbd>Return</kbd> = open floating terminal (Foot)
- <kbd>MOD</kbd>+<kbd>O</kbd> = open Browser (firefox)
- <kbd>MOD</kbd>+<kbd>N</kbd> = open File Manager (thunar)
- <kbd>MOD</kbd>+<kbd>D</kbd>= app menu (wofi)

View File

@@ -1,227 +0,0 @@
- name: "Base-devel + Common packages"
description: "Recommended. Don't change unless you know what you're doing. Base-devel group and some other commom utilities (generic)"
hidden: false
selected: true
critical: false
packages:
- base-devel
- yay
- linux-headers
- linux-firmware
- pacman-contrib
- xf86-video-vesa
- xf86-input-libinput
- xf86-video-amdgpu
- xf86-video-ati
- xf86-video-fbdev
- xf86-video-intel
- xorg-server
- xdg-utils
- xdg-user-dirs
- gvfs
- gvfs-mtp
- gvfs-afc
- gvfs-goa
- gvfs-google
- gvfs-gphoto2
- gvfs-nfs
- gvfs-smb
- accountsservice
- smartmontools
- libwnck3
- b43-fwcutter
- broadcom-wl-dkms
- r8168
- dnsutils
- ipw2100-fw
- ipw2200-fw
- modemmanager
- netctl
- net-tools
- ntfs-3g
- networkmanager
- networkmanager-openvpn
- nss-mdns
- usb_modeswitch
- whois
- dhclient
- ethtool
- openconnect
- openvpn
- rp-pppoe
- wireless-regdb
- wireless_tools
- wpa_supplicant
- wvdial
- gnu-netcat
- iwd
- linux-atm
- ndisc6
- ppp
- pptpclient
- vpnc
- xl2tpd
- dialog
- dnsmasq
- upower
- hwinfo
- gtop
- python
- solid
- mlocate
- ttf-dejavu
- ttf-liberation
- ttf-bitstream-vera
- cantarell-fonts
- noto-fonts
- adobe-source-han-sans-jp-fonts
- adobe-source-han-sans-kr-fonts
- adobe-source-han-sans-cn-fonts
- opendesktop-fonts
- ttf-opensans
- firefox
- ttf-croscore
- ttf-carlito
- ttf-caladea
- alsa-utils
- alsa-plugins
- alsa-firmware
- hardinfo
- glances
- htop
- neofetch
- pulseaudio
- pavucontrol
- paprefs
- ffmpegthumbnailer
- poppler-glib
- libgsf
- libopenraw
- freetype2
- gst-libav
- gst-plugins-bad
- gst-plugins-ugly
- libdvdcss
- efibootmgr
- dosfstools
- mtools
- openssh
- intel-ucode
- amd-ucode
- os-prober
- grub-tools
- wget
- bash-completion
- lsb-release
- s-tui
- tlp
- yad-eos
- reflector
- endeavouros-theming
- reflector-simple
- welcome
- eos-update-notifier
- eos-hooks
- nvidia-installer-dkms
- mkinitcpio-openswap
- pcurses
- eos-log-tool
- keyserver-rank
- inxi
- wayland-protocols
- xorg-xwayland
- egl-wayland
- name: "sway tiling on wayland"
description: "Sway is a tiling Wayland compositor and a drop-in replacement for the i3 window manager."
hidden: false
selected: true
critical: false
packages:
- acpi
- arc-gtk-theme-eos
- archlinux-xdg-menu
- arc-x-icons-theme
- bluez-utils
- brightnessctl
- celluloid
- dex
- diffuse
- file-roller
- foot
- grim
- gtk-engine-murrine
- gtk-layer-shell
- htop
- imv
- lxappearance
- mako
- network-manager-applet
- otf-font-awesome
- paprefs
- pavucontrol
- polkit-gnome
- pulseaudio
- slurp
- swappy
- sway
- swaybg
- swayidle
- swaylock
- sysstat
- thunar
- thunar-archive-plugin
- thunar-volman
- ttf-jetbrains-mono
- ttf-nerd-fonts-symbols
- ttf-ubuntu-font-family
- waybar
- wofi
- xdg-desktop-portal-wlr
- xed
- xorg-xhost
- name: "Zen Kernel"
description: "https://github.com/zen-kernel/zen-kernel"
hidden: false
selected: false
critical: false
packages:
- linux-zen
- linux-zen-headers
- name: "Printing-Support"
description: "Support for printing (Cups)"
hidden: false
selected: false
critical: false
packages:
- cups
- cups-filters
- cups-pdf
- ghostscript
- gsfonts
- foomatic-db-engine
- foomatic-db
- foomatic-db-ppds
- foomatic-db-nonfree
- foomatic-db-nonfree-ppds
- gutenprint
- foomatic-db-gutenprint-ppds
- splix
- system-config-printer
- name: "Support for HP Printer/Scanner"
description: "Extra Packages for HP Printer/Scanner"
hidden: false
selected: false
critical: false
packages:
- hplip
- python-pyqt5
- python-reportlab
- xsane
- name: "Accessibility Tools"
description: "Screen reader and mouse tweak"
hidden: false
selected: false
critical: false
packages:
- orca
- mousetweaks

View File

@@ -38,5 +38,4 @@ wl-clipboard
wofi
xdg-desktop-portal-wlr
xed
xfce4-terminal
xorg-xwayland