Small changes
This commit is contained in:
parent
734a8f02e2
commit
a73fa759eb
|
|
@ -31,9 +31,6 @@ Plug 'https://git.zx2c4.com/password-store', { 'rtp': 'contrib/vim/redact_pass.v
|
||||||
" Colorize color words
|
" Colorize color words
|
||||||
Plug 'norcalli/nvim-colorizer.lua'
|
Plug 'norcalli/nvim-colorizer.lua'
|
||||||
|
|
||||||
" Use neovim from firefox
|
|
||||||
Plug 'glacambre/firenvim', { 'do': { _ -> firenvim#install(0) } }
|
|
||||||
|
|
||||||
" Spelling
|
" Spelling
|
||||||
Plug 'vim-scripts/Vimchant'
|
Plug 'vim-scripts/Vimchant'
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,131 +1,127 @@
|
||||||
// vim: ft=jsonc
|
// vim: ft=json
|
||||||
{
|
{
|
||||||
"layer": "bottom", // Waybar at top layer
|
"layer": "top",
|
||||||
"height": 22, // Waybar height
|
"test": "asd",
|
||||||
"modules-left": ["sway/workspaces", "sway/mode", "custom/media"],
|
"height": 22,
|
||||||
"modules-center": ["sway/window"],
|
"modules-left": ["sway/workspaces", "sway/mode", "custom/media"],
|
||||||
"modules-right": [
|
"modules-center": ["sway/window"],
|
||||||
"idle_inhibitor",
|
"modules-right": [
|
||||||
"pulseaudio",
|
"idle_inhibitor",
|
||||||
"custom/yay",
|
"pulseaudio",
|
||||||
"network",
|
"custom/yay",
|
||||||
"temperature",
|
"network",
|
||||||
"battery",
|
"temperature",
|
||||||
"clock",
|
"battery",
|
||||||
"tray"
|
"clock",
|
||||||
],
|
"tray"
|
||||||
// Modules configuration
|
],
|
||||||
"sway/workspaces": {
|
"sway/workspaces": {
|
||||||
"disable-scroll": true,
|
"disable-scroll": true,
|
||||||
"all-outputs": true,
|
"all-outputs": true,
|
||||||
"format": "{icon}",
|
"format": "{icon}",
|
||||||
"format-icons": {
|
"format-icons": {
|
||||||
"1": "",
|
"1": "",
|
||||||
"2": "",
|
"2": "",
|
||||||
"3": "",
|
"3": "",
|
||||||
"4": "",
|
"4": "",
|
||||||
"5": "",
|
"5": "",
|
||||||
"urgent": "",
|
"urgent": "",
|
||||||
"focused": "",
|
"focused": "",
|
||||||
"default": ""
|
"default": ""
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"sway/mode": {
|
"sway/mode": {
|
||||||
"format": "<span style=\"italic\">{}</span>"
|
"format": "<span style=\"italic\">{}</span>"
|
||||||
},
|
},
|
||||||
"idle_inhibitor": {
|
"idle_inhibitor": {
|
||||||
"tooltip": false,
|
"tooltip": false,
|
||||||
"format": "{icon}",
|
"format": "{icon}",
|
||||||
"format-icons": {
|
"format-icons": {
|
||||||
"activated": "",
|
"activated": "",
|
||||||
"deactivated": ""
|
"deactivated": ""
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"network": {
|
"network": {
|
||||||
"format": "{ifname}",
|
"format": "{ifname}",
|
||||||
"format-wifi": "{essid} ({signalStrength}%) ",
|
"format-wifi": "{essid} ({signalStrength}%) ",
|
||||||
"format-ethernet": "{ipaddr} ",
|
"format-ethernet": "{ipaddr} ",
|
||||||
"format-disconnected": "Disconnected ", //An empty format will hide the module.
|
"format-disconnected": "Disconnected ",
|
||||||
"tooltip-format": "{ifname}",
|
"tooltip-format": "{ifname}",
|
||||||
"tooltip-format-wifi": "{ifname} {frequency}MHz ",
|
"tooltip-format-wifi": "{ifname} {frequency}MHz ",
|
||||||
"tooltip-format-ethernet": "{ifname} ",
|
"tooltip-format-ethernet": "{ifname} ",
|
||||||
"tooltip-format-disconnected": "Disconnected"
|
"tooltip-format-disconnected": "Disconnected"
|
||||||
},
|
},
|
||||||
"tray": {
|
"tray": {
|
||||||
// "icon-size": 21,
|
"spacing": 10
|
||||||
"spacing": 10
|
},
|
||||||
},
|
"clock": {
|
||||||
"clock": {
|
"tooltip": true,
|
||||||
"tooltip": false,
|
"tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
|
||||||
"format": "{:%Y-%m-%d %H:%M} "
|
"format": "{:%Y-%m-%d %H:%M} "
|
||||||
},
|
},
|
||||||
"cpu": {
|
"cpu": {
|
||||||
"tooltip": false,
|
"tooltip": false,
|
||||||
"format": "{usage}% "
|
"format": "{usage}% "
|
||||||
},
|
},
|
||||||
"memory": {
|
"memory": {
|
||||||
"tooltip": false,
|
"tooltip": false,
|
||||||
"format": "{}% "
|
"format": "{}% "
|
||||||
},
|
},
|
||||||
"backlight": {
|
"backlight": {
|
||||||
// "device": "acpi_video1",
|
"format": "{percent}% {icon}",
|
||||||
"format": "{percent}% {icon}",
|
"format-icons": ["", ""]
|
||||||
"format-icons": ["", ""]
|
},
|
||||||
},
|
"battery": {
|
||||||
"battery": {
|
"tooltip": true,
|
||||||
"tooltip": false,
|
"tooltip-format": "{time}",
|
||||||
"states": {
|
"states": {
|
||||||
// "good": 95,
|
"warning": 30,
|
||||||
"warning": 30,
|
"critical": 15
|
||||||
"critical": 15
|
},
|
||||||
},
|
"format": "{capacity}% {icon}",
|
||||||
"format": "{capacity}% {icon}",
|
"format-icons": ["", "", "", "", ""]
|
||||||
// "format-good": "", // An empty format will hide the module
|
},
|
||||||
// "format-full": "",
|
"battery#bat2": {
|
||||||
"format-icons": ["", "", "", "", ""]
|
"bat": "BAT2"
|
||||||
},
|
},
|
||||||
"battery#bat2": {
|
"pulseaudio": {
|
||||||
"bat": "BAT2"
|
"tooltip": false,
|
||||||
},
|
"format": "{volume}% {icon}",
|
||||||
"pulseaudio": {
|
"format-bluetooth": "{volume}% ",
|
||||||
"tooltip": false,
|
"format-muted": "",
|
||||||
//"scroll-step": 1,
|
"format-icons": {
|
||||||
"format": "{volume}% {icon}",
|
"headphones": "",
|
||||||
"format-bluetooth": "{volume}% ",
|
"handsfree": "",
|
||||||
"format-muted": "",
|
"headset": "",
|
||||||
"format-icons": {
|
"phone": "",
|
||||||
"headphones": "",
|
"portable": "",
|
||||||
"handsfree": "",
|
"car": "",
|
||||||
"headset": "",
|
"default": ["", ""]
|
||||||
"phone": "",
|
},
|
||||||
"portable": "",
|
"on-click": "pamixer --toggle-mute && ( pamixer --get-mute && echo 0 > $SWAYSOCK.wob ) || pamixer --get-volume > $SWAYSOCK.wob",
|
||||||
"car": "",
|
"on-click-right": "pavucontrol",
|
||||||
"default": ["", ""]
|
"on-scroll-up": "pamixer -ui 1 && pamixer --get-volume > $SWAYSOCK.wob",
|
||||||
},
|
"on-scroll-down": "pamixer -ud 1 && pamixer --get-volume > $SWAYSOCK.wob"
|
||||||
"on-click": "pamixer --toggle-mute && ( pamixer --get-mute && echo 0 > $SWAYSOCK.wob ) || pamixer --get-volume > $SWAYSOCK.wob",
|
},
|
||||||
"on-click-right": "pavucontrol",
|
"custom/media": {
|
||||||
"on-scroll-up": "pamixer -ui 1 && pamixer --get-volume > $SWAYSOCK.wob",
|
"tooltip": false,
|
||||||
"on-scroll-down": "pamixer -ud 1 && pamixer --get-volume > $SWAYSOCK.wob"
|
"format": "{}",
|
||||||
},
|
"return-type": "json",
|
||||||
"custom/media": {
|
"exec": "$HOME/Scripts/mediaplayer.py 2>/dev/null",
|
||||||
"tooltip": false,
|
"max-length": 50,
|
||||||
"format": "{}",
|
"on-click": "playerctl play-pause",
|
||||||
"return-type": "json",
|
"on-click-right": "playerctl next",
|
||||||
"exec": "$HOME/Scripts/mediaplayer.py 2>/dev/null",
|
"on-scroll-up": "playerctl volume 0.05+",
|
||||||
"max-length": 50,
|
"on-scroll-down": "playerctl volume 0.05-"
|
||||||
"on-click": "playerctl play-pause",
|
},
|
||||||
"on-click-right": "playerctl next",
|
"custom/yay": {
|
||||||
"on-scroll-up": "playerctl volume 0.05+",
|
"tooltip": false,
|
||||||
"on-scroll-down": "playerctl volume 0.05-"
|
"format": "{} ",
|
||||||
},
|
"exec": "yay -Qu | wc -l",
|
||||||
"custom/yay":{
|
"interval": 300,
|
||||||
"tooltip": false,
|
"on-click": "gnome-software --mode=updates"
|
||||||
"format": "{} ",
|
},
|
||||||
"exec": "yay -Qu | wc -l",
|
"temperature": {
|
||||||
"interval": 300,
|
"format": "{temperatureC}°C "
|
||||||
"on-click": "gnome-software --mode=updates"
|
}
|
||||||
},
|
|
||||||
"temperature": {
|
|
||||||
"format": "{temperatureC}°C "
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -19,9 +19,6 @@ export QT_WAYLAND_DISABLE_WINDOWDECORATION=1
|
||||||
# Fix redshift on wlroots
|
# Fix redshift on wlroots
|
||||||
export WLR_DRM_NO_ATOMIC=1
|
export WLR_DRM_NO_ATOMIC=1
|
||||||
|
|
||||||
# Use wayland in SDL2
|
|
||||||
export SDL_VIDEODRIVER=wayland
|
|
||||||
|
|
||||||
# Run sway
|
# Run sway
|
||||||
sway
|
sway
|
||||||
|
|
||||||
|
|
@ -35,4 +32,3 @@ unset QT_QPA_PLATFORMTHEME=qt5ct
|
||||||
unset QT_QPA_PLATFORM=wayland-egl
|
unset QT_QPA_PLATFORM=wayland-egl
|
||||||
unset QT_WAYLAND_DISABLE_WINDOWDECORATION=1
|
unset QT_WAYLAND_DISABLE_WINDOWDECORATION=1
|
||||||
unset WLR_DRM_NO_ATOMIC=1
|
unset WLR_DRM_NO_ATOMIC=1
|
||||||
unset SDL_VIDEODRIVER=wayland
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue