add roundedcorner to wayfire; polish waybar
This commit is contained in:
parent
10d900a9e4
commit
6ae4e96b74
3 changed files with 89 additions and 175 deletions
|
|
@ -1,20 +1,21 @@
|
|||
{
|
||||
"layer": "top",
|
||||
"position": "top",
|
||||
"height": 17,
|
||||
"spacing": 0,
|
||||
"margin-top": 5,
|
||||
"margin-bottom": 3,
|
||||
"height": 20,
|
||||
"spacing": 4,
|
||||
// "mode": "dock",
|
||||
// "margin-top": 5,
|
||||
// "margin-bottom": 3,
|
||||
|
||||
// Choose the order of the modules
|
||||
"modules-left":[ "custom/launcher", "cpu", "memory", "custom/update"],
|
||||
"modules-center": [ "wlr/taskbar"],
|
||||
"modules-right":[ "battery", "pulseaudio", "network", "bluetooth", "clock", "tray", "custom/power"],
|
||||
"modules-right":[ "tray", "battery", "pulseaudio", "network", "bluetooth", "clock", "custom/power"],
|
||||
|
||||
// Modules configuration
|
||||
"wlr/taskbar": {
|
||||
"format": "{icon}",
|
||||
"icon-size": 25,
|
||||
"icon-size": 20,
|
||||
"icon-theme": "Tela",
|
||||
"tooltip-format": "{title}",
|
||||
"on-click": "minimize",
|
||||
|
|
@ -45,12 +46,12 @@
|
|||
"format": "{:%Y-%m-%d %H:%M}"
|
||||
},
|
||||
"cpu": {
|
||||
"format": "{usage}% CPU",
|
||||
"format": "{usage:3}% CPU",
|
||||
"tooltip": false,
|
||||
"on-click": "tilix -e 'htop'"
|
||||
},
|
||||
"memory": {
|
||||
"format": "{}% RAM",
|
||||
"format": "{percentage:3}% RAM",
|
||||
"on-click": "tilix -e 'htop'"
|
||||
},
|
||||
"battery": {
|
||||
|
|
@ -67,10 +68,10 @@
|
|||
},
|
||||
"network": {
|
||||
// "interface": "wlp2*", // (Optional) To force the use of this interface
|
||||
"format-wifi": "{essid} ",
|
||||
"format-wifi": "{essid:5} ",
|
||||
"format-ethernet": "Connected ",
|
||||
// "tooltip-format": "{ifname} via {gwaddr} ",
|
||||
"format-linked": "{ifname} (No IP) ",
|
||||
"format-linked": "{ifname:5} (No IP) ",
|
||||
"format-disconnected": "Disconnected ⚠",
|
||||
// "format-alt": "{ifname}: {ipaddr}/{cidr}",
|
||||
"on-click": "tilix -e 'nmtui'"
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
border-radius: 0px;
|
||||
/* `otf-font-awesome` is required to be installed for icons */
|
||||
font-family: JetBrains Mono, Roboto, Helvetica, Arial, sans-serif;
|
||||
font-size: 13px;
|
||||
font-size: 14px;
|
||||
min-height: 0;
|
||||
}
|
||||
|
||||
|
|
@ -77,7 +77,7 @@ window#waybar.hidden {
|
|||
|
||||
#window,
|
||||
#workspaces {
|
||||
margin: 0px 0px;
|
||||
margin: 0px 4px;
|
||||
}
|
||||
|
||||
/* If workspaces is the leftmost module, omit left margin */
|
||||
|
|
@ -91,25 +91,21 @@ window#waybar.hidden {
|
|||
}
|
||||
|
||||
#clock {
|
||||
|
||||
color: white;
|
||||
}
|
||||
|
||||
#custom-power {
|
||||
|
||||
color: white;
|
||||
border-radius: 0px 20px 20px 0px;
|
||||
/* border-radius: 0px 20px 20px 0px;*/
|
||||
}
|
||||
|
||||
#bluetooth {
|
||||
|
||||
color: white;
|
||||
}
|
||||
|
||||
#battery {
|
||||
|
||||
color: white;
|
||||
border-radius: 20px 0px 0px 20px;
|
||||
/* border-radius: 20px 0px 0px 20px;*/
|
||||
}
|
||||
|
||||
#battery.charging, #battery.plugged {
|
||||
|
|
@ -125,7 +121,6 @@ window#waybar.hidden {
|
|||
}
|
||||
|
||||
#battery.critical:not(.charging) {
|
||||
|
||||
color: white;
|
||||
animation-name: blink;
|
||||
animation-duration: 0.5s;
|
||||
|
|
@ -139,66 +134,55 @@ label:focus {
|
|||
}
|
||||
|
||||
#cpu {
|
||||
|
||||
color: white;
|
||||
}
|
||||
|
||||
#memory {
|
||||
|
||||
color: white;
|
||||
}
|
||||
|
||||
#disk {
|
||||
|
||||
color: white;
|
||||
}
|
||||
|
||||
#network {
|
||||
|
||||
color: white;
|
||||
}
|
||||
|
||||
#network.disconnected {
|
||||
|
||||
color: white;
|
||||
}
|
||||
|
||||
#pulseaudio {
|
||||
|
||||
color: white;
|
||||
}
|
||||
|
||||
#pulseaudio.muted {
|
||||
|
||||
color: white;
|
||||
}
|
||||
|
||||
#custom-update{
|
||||
|
||||
color: white;
|
||||
font-size: 18px;
|
||||
border-radius: 0px 20px 20px 0px;
|
||||
/* border-radius: 0px 20px 20px 0px;*/
|
||||
}
|
||||
|
||||
#custom-launcher{
|
||||
|
||||
color: white;
|
||||
font-size: 25px;
|
||||
border-radius: 20px 0px 0px 20px;;
|
||||
/* border-radius: 20px 0px 0px 20px;;*/
|
||||
}
|
||||
|
||||
#taskbar {
|
||||
|
||||
border-radius: 20px 20px 20px 20px;
|
||||
/* border-radius: 20px 20px 20px 20px;*/
|
||||
}
|
||||
|
||||
#temperature {
|
||||
|
||||
color: white;
|
||||
}
|
||||
|
||||
#tray {
|
||||
|
||||
color: white;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,55 +1,23 @@
|
|||
# Default config for Wayfire
|
||||
#
|
||||
# Copy this to ~/.config/wayfire.ini and edit it to your liking.
|
||||
#
|
||||
# Take the tutorial to get started.
|
||||
# https://github.com/WayfireWM/wayfire/wiki/Tutorial
|
||||
#
|
||||
# Read the Configuration document for a complete reference.
|
||||
# https://github.com/WayfireWM/wayfire/wiki/Configuration
|
||||
|
||||
# Input configuration ──────────────────────────────────────────────────────────
|
||||
|
||||
# Example configuration:
|
||||
#
|
||||
### Input configuration
|
||||
[input]
|
||||
xkb_layout = us
|
||||
xkb_variant = dvorak,bepo
|
||||
natural_scroll = enabled
|
||||
#
|
||||
# See Input options for a complete reference.
|
||||
# https://github.com/WayfireWM/wayfire/wiki/Configuration#input
|
||||
|
||||
[input-device:Wacom One by Wacom S Pen]
|
||||
output = eDP-1
|
||||
#
|
||||
|
||||
# Output configuration ─────────────────────────────────────────────────────────
|
||||
|
||||
# Example configuration:
|
||||
#
|
||||
### Output configuration
|
||||
[output:eDP-1]
|
||||
# mode = 1920x1080@60000
|
||||
mode = 2400x1350@60000
|
||||
position = 0,0
|
||||
transform = normal
|
||||
scale = 1.00000
|
||||
#
|
||||
# You can get the names of your outputs with wlr-randr.
|
||||
# https://github.com/emersion/wlr-randr
|
||||
#
|
||||
# See also kanshi for configuring your outputs automatically.
|
||||
# https://wayland.emersion.fr/kanshi/
|
||||
#
|
||||
# See Output options for a complete reference.
|
||||
# https://github.com/WayfireWM/wayfire/wiki/Configuration#output
|
||||
|
||||
# Core options ─────────────────────────────────────────────────────────────────
|
||||
|
||||
### Core options
|
||||
[core]
|
||||
|
||||
# List of plugins to be enabled.
|
||||
# See the Configuration document for a complete list.
|
||||
plugins = \
|
||||
alpha \
|
||||
animate \
|
||||
|
|
@ -75,155 +43,120 @@ plugins = \
|
|||
wrot \
|
||||
zoom \
|
||||
spacing \
|
||||
wf-info
|
||||
wf-info \
|
||||
rounded-corners
|
||||
|
||||
# Note: [blur] is not enabled by default, because it can be resource-intensive.
|
||||
# Feel free to add it to the list if you want it.
|
||||
# You can find its documentation here:
|
||||
# https://github.com/WayfireWM/wayfire/wiki/Configuration#blur
|
||||
|
||||
# Close focused window.
|
||||
## Close focused window.
|
||||
close_top_view = <super> KEY_Q | <alt> KEY_F4
|
||||
|
||||
# Workspaces arranged into a grid: 3 × 3.
|
||||
## Workspaces arranged into a grid: 3 × 3.
|
||||
vwidth = 3
|
||||
vheight = 3
|
||||
|
||||
# Prefer client-side decoration or server-side decoration
|
||||
## Prefer client-side decoration or server-side decoration
|
||||
preferred_decoration_mode = server
|
||||
|
||||
# Mouse bindings ───────────────────────────────────────────────────────────────
|
||||
|
||||
# Drag windows by holding down Super and left mouse button.
|
||||
### Mouse bindings
|
||||
## Drag windows by holding down Super and left mouse button.
|
||||
[move]
|
||||
activate = <super> BTN_LEFT
|
||||
|
||||
# Resize them with right mouse button + Super.
|
||||
## Resize them with right mouse button + Super.
|
||||
[resize]
|
||||
activate = <super> BTN_RIGHT
|
||||
|
||||
# Zoom in the desktop by scrolling + Super.
|
||||
## Zoom in the desktop by scrolling + Super.
|
||||
[zoom]
|
||||
modifier = <super>
|
||||
|
||||
# Change opacity by scrolling with Super + Alt.
|
||||
## Change opacity by scrolling with Super + Alt.
|
||||
[alpha]
|
||||
modifier = <super> <alt>
|
||||
|
||||
# Rotate windows with the mouse.
|
||||
## Rotate windows with the mouse.
|
||||
[wrot]
|
||||
activate = <super> <ctrl> BTN_RIGHT
|
||||
|
||||
# Fisheye effect.
|
||||
## Fisheye effect.
|
||||
[fisheye]
|
||||
toggle = <super> <ctrl> KEY_F
|
||||
|
||||
# Startup commands ─────────────────────────────────────────────────────────────
|
||||
|
||||
### Startup commands
|
||||
[autostart]
|
||||
|
||||
# Automatically start background and panel.
|
||||
# Set to false if you want to override the default clients.
|
||||
## enviroment
|
||||
environment = dbus-update-activation-environment --systemd WAYLAND_DISPLAY DISPLAY XAUTHORITY
|
||||
autostart_wf_shell = false
|
||||
|
||||
# greetd
|
||||
#dm = gtkgreet -l && wayland-logout
|
||||
|
||||
# chromium screenshare
|
||||
## chromium screenshare
|
||||
0_0 = systemctl --user import-environment
|
||||
xdg = sleep 1 && (XDG_SESSION_TYPE=wayland XDG_CURRENT_DESKTOP=sway /usr/lib/xdg-desktop-portal --replace & /usr/lib/xdg-desktop-portal-wlr)
|
||||
|
||||
# Set the wallpaper, start a panel and dock if you want one.
|
||||
# https://github.com/WayfireWM/wf-shell
|
||||
#
|
||||
# These are started by the autostart_wf_shell option above.
|
||||
# background = wf-background
|
||||
## desktop widgets
|
||||
background = swaybg -i $HOME/.config/swaylock/bg.png
|
||||
# panel = wf-panel
|
||||
bar = waybar
|
||||
# dock = wf-dock
|
||||
# panel = wf-panel
|
||||
# background = wf-background
|
||||
|
||||
# Output configuration
|
||||
# https://wayland.emersion.fr/kanshi/
|
||||
# outputs = kanshi
|
||||
#email = geary
|
||||
# Notifications
|
||||
# https://wayland.emersion.fr/mako/
|
||||
## Notifications
|
||||
notifications = mako
|
||||
|
||||
# input
|
||||
## input
|
||||
fcitx5 = fcitx
|
||||
|
||||
# KDEConnect
|
||||
kdeconnect = kdeconnect-indicator
|
||||
## KDEConnect
|
||||
# kdeconnect = kdeconnect-indicator
|
||||
|
||||
# Keyring
|
||||
## Keyring
|
||||
keyring = gnome-keyring
|
||||
|
||||
# Screen color temperature
|
||||
# https://sr.ht/~kennylevinsen/wlsunset/
|
||||
# gamma = wlsunset
|
||||
|
||||
# Idle configuration
|
||||
# https://github.com/swaywm/swayidle
|
||||
# https://github.com/swaywm/swaylock
|
||||
# idle = swayidle before-sleep swaylock
|
||||
|
||||
# XDG desktop portal
|
||||
# Needed by some GTK applications
|
||||
## XDG desktop portal
|
||||
portal = /usr/libexec/xdg-desktop-portal
|
||||
|
||||
# Example configuration:
|
||||
#
|
||||
### desktop configure
|
||||
|
||||
[idle]
|
||||
# toggle = <super> KEY_Z
|
||||
screensaver_timeout = 360000
|
||||
dpms_timeout = 360000
|
||||
#
|
||||
# Disables the compositor going idle with Super + z.
|
||||
# This will lock your screen after 300 seconds of inactivity, then turn off
|
||||
# your displays after another 300 seconds.
|
||||
|
||||
# Applications ─────────────────────────────────────────────────────────────────
|
||||
### Applications ─────────────────────────────────────────────────────────────────
|
||||
|
||||
[command]
|
||||
|
||||
# Start a terminal
|
||||
# https://github.com/alacritty/alacritty
|
||||
## Terminal
|
||||
binding_terminal = <super> KEY_T
|
||||
command_terminal = tilix
|
||||
|
||||
# Start your launcher
|
||||
# https://hg.sr.ht/~scoopta/wofi
|
||||
# Note: Add mode=run or mode=drun to ~/.config/wofi/config.
|
||||
# You can also specify the mode with --show option.
|
||||
## Start your launcher
|
||||
binding_launcher = <super> KEY_ENTER
|
||||
command_launcher = wofi
|
||||
|
||||
# Screen locker
|
||||
## Screen locker
|
||||
# https://github.com/swaywm/swaylock
|
||||
binding_lock = <super> <shift> KEY_ESC
|
||||
command_lock = swaylock -C $HOME/.config/swaylock/conig
|
||||
|
||||
|
||||
# Logout
|
||||
## Logout
|
||||
# https://github.com/ArtsyMacaw/wlogout
|
||||
binding_logout = <super> KEY_ESC
|
||||
command_logout = nwgbar
|
||||
# command_logout = wlogout -p xdg
|
||||
|
||||
# Screenshots
|
||||
# https://wayland.emersion.fr/grim/
|
||||
# https://wayland.emersion.fr/slurp/
|
||||
binding_screenshot = <super> <shift> KEY_SYSRQ
|
||||
## Screenshots
|
||||
# select window, copy to clipboard
|
||||
binding_screenshot = <shift> KEY_SYSRQ
|
||||
command_screenshot = grim -g "$(wf-info | grep Geometry | awk '{print $2, $3}')" - - | wl-copy --type image/png
|
||||
binding_screenshot_interactive = <shift> KEY_SYSRQ
|
||||
# save to Pictures directory
|
||||
binding_screenshot_interactive = <super> <shift> KEY_SYSRQ
|
||||
command_screenshot_interactive = slurp | grim -g - ~/Pictures/$(date '+%F_%T').png
|
||||
# copy to clipboard
|
||||
binding_screenshot_clipboard = KEY_SYSRQ
|
||||
command_screenshot_clipboard = slurp -b ff00ff20 -B ff00ff20 -c ff00ff80 -o | grim -g - - | wl-copy --type image/png
|
||||
|
||||
# Screencast
|
||||
## Screencast
|
||||
# binding_screencast = <alt> KEY_SYSRQ
|
||||
# command_screencast = wf-recorder -g "$(wf-info | grep Geometry | awk '{print $2, $3}')" -f $HOME/Videos/$(date '+%F_%T').mp4
|
||||
binding_screencast_novoice = <alt> KEY_SYSRQ
|
||||
|
|
@ -232,12 +165,10 @@ command_screencast_novoice = wf-recorder -a -f $HOME/Videos/$(date '+%F_%T').mp4
|
|||
# command_screencast_voice = wf-recorder -a -f $HOME/Videos/$(data '+%F_%T').
|
||||
binding_screencast_stop = <ctrl> <alt> KEY_SYSRQ
|
||||
command_screencast_stop = killall -INT wf-recorder
|
||||
|
||||
# binding_kooha = <super> KEY_R
|
||||
# command_kooha = kooha
|
||||
|
||||
# Volume controls alias-utils
|
||||
# https://alsa-project.org
|
||||
## Volume controls alias-utils
|
||||
repeatable_binding_volume_up = KEY_F3
|
||||
command_volume_up = pulsemixer --change-volume +5
|
||||
repeatable_binding_volume_down = KEY_F2
|
||||
|
|
@ -246,25 +177,22 @@ binding_mute = KEY_F1
|
|||
command_mute = pulsemixer --mute
|
||||
binding_unmute = <alt> KEY_F1
|
||||
command_unmate = pulsemixer --unmute
|
||||
# Screen brightness
|
||||
|
||||
## Screen brightness
|
||||
# https://haikarainen.github.io/light/
|
||||
# repeatable_binding_light_up = KEY_F7
|
||||
# command_light_up = light -A 5
|
||||
# repeatable_binding_light_down = <shift> KEY_7
|
||||
# command_light_down = light -U 5
|
||||
|
||||
# Windows ──────────────────────────────────────────────────────────────────────
|
||||
|
||||
# Actions related to window management functionalities.
|
||||
#
|
||||
# Example configuration:
|
||||
#
|
||||
### Windows
|
||||
## Actions related to window management functionalities.
|
||||
[wm-actions]
|
||||
toggle_fullscreen = <super> KEY_F
|
||||
toggle_always_on_top = <super> KEY_X
|
||||
toggle_sticky = <super> <shift> KEY_X
|
||||
|
||||
# Position the windows in certain regions of the output.
|
||||
## Position the windows in certain regions of the output.
|
||||
[grid]
|
||||
#
|
||||
# ⇱ ↑ ⇲ │ 7 8 9
|
||||
|
|
@ -283,18 +211,18 @@ slot_tr = <super> KEY_F9
|
|||
# Restore default.
|
||||
restore = <super> KEY_F10
|
||||
|
||||
# Change active window with an animation.
|
||||
## Change active window with an animation.
|
||||
[switcher]
|
||||
next_view = <shift> <alt> KEY_TAB
|
||||
prev_view = <alt> KEY_TAB
|
||||
|
||||
# Simple active window switcher.
|
||||
## Simple active window switcher.
|
||||
[fast-switcher]
|
||||
activate = <alt> KEY_ESC
|
||||
activate = <super> KEY_TAB
|
||||
|
||||
# Workspaces ───────────────────────────────────────────────────────────────────
|
||||
### Workspaces
|
||||
|
||||
# Switch to workspace.
|
||||
## Switch to workspace.
|
||||
[vswitch]
|
||||
binding_left = <ctrl> KEY_LEFT
|
||||
binding_down = <ctrl> KEY_DOWN
|
||||
|
|
@ -306,14 +234,14 @@ binding_win_down = <ctrl> <super> KEY_DOWN
|
|||
binding_win_up = <ctrl> <super> KEY_UP
|
||||
binding_win_right = <ctrl> <super> KEY_RIGHT
|
||||
|
||||
# Show the current workspace row as a cube.
|
||||
## Show the current workspace row as a cube.
|
||||
[cube]
|
||||
activate = <ctrl> <alt> BTN_LEFT
|
||||
# Switch to the next or previous workspace.
|
||||
rotate_left = <super> <ctrl> KEY_R
|
||||
rotate_right = <super> <ctrl> KEY_L
|
||||
|
||||
# Show an overview of all workspaces.
|
||||
## Show an overview of all workspaces.
|
||||
[expo]
|
||||
toggle = <super>
|
||||
# Select a workspace.
|
||||
|
|
@ -335,31 +263,32 @@ select_workspace_7 = KEY_7
|
|||
select_workspace_8 = KEY_8
|
||||
select_workspace_9 = KEY_9
|
||||
|
||||
# Outputs ──────────────────────────────────────────────────────────────────────
|
||||
|
||||
# Change focused output.
|
||||
### Outputs
|
||||
## Change focused output.
|
||||
[oswitch]
|
||||
# Switch to the next output.
|
||||
next_output = <super> KEY_O
|
||||
# Same with the window.
|
||||
next_output_with_win = <super> <shift> KEY_O
|
||||
|
||||
# Invert the colors of the whole output.
|
||||
## Invert the colors of the whole output.
|
||||
[invert]
|
||||
toggle = <super> KEY_I
|
||||
|
||||
# Animate
|
||||
## Animate
|
||||
[animate]
|
||||
open_animation = fade
|
||||
close_animation = fade
|
||||
duration = 300
|
||||
duration = 400
|
||||
|
||||
[decoration]
|
||||
title_height = 0
|
||||
title_size = 0
|
||||
ignore_views = all
|
||||
#broder_size = 1
|
||||
#active_color = \#f9f06bAA
|
||||
#inactive_color = \#268bd2AA
|
||||
broder_size = 10
|
||||
active_color = \#ffffffAA
|
||||
inactive_color = \#ffffffAA
|
||||
|
||||
# Rules ────────────────────────────────────────────────────────────────────────
|
||||
|
||||
# Example configuration:
|
||||
|
|
|
|||
Loading…
Reference in a new issue