From a73fa759ebbb412274d8e83ee8693d73521ea20f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Apr 2020 12:37:19 +0300 Subject: [PATCH] Small changes --- home/.config/nvim/conf.d/01-plugins.vim | 3 - home/.config/waybar/config | 254 ++++++++++++------------ home/Scripts/sway-run.sh | 4 - 3 files changed, 125 insertions(+), 136 deletions(-) diff --git a/home/.config/nvim/conf.d/01-plugins.vim b/home/.config/nvim/conf.d/01-plugins.vim index e951fdc..650e855 100644 --- a/home/.config/nvim/conf.d/01-plugins.vim +++ b/home/.config/nvim/conf.d/01-plugins.vim @@ -31,9 +31,6 @@ Plug 'https://git.zx2c4.com/password-store', { 'rtp': 'contrib/vim/redact_pass.v " Colorize color words Plug 'norcalli/nvim-colorizer.lua' -" Use neovim from firefox -Plug 'glacambre/firenvim', { 'do': { _ -> firenvim#install(0) } } - " Spelling Plug 'vim-scripts/Vimchant' diff --git a/home/.config/waybar/config b/home/.config/waybar/config index 359ea57..11b6c18 100644 --- a/home/.config/waybar/config +++ b/home/.config/waybar/config @@ -1,131 +1,127 @@ -// vim: ft=jsonc +// vim: ft=json { - "layer": "bottom", // Waybar at top layer - "height": 22, // Waybar height - "modules-left": ["sway/workspaces", "sway/mode", "custom/media"], - "modules-center": ["sway/window"], - "modules-right": [ - "idle_inhibitor", - "pulseaudio", - "custom/yay", - "network", - "temperature", - "battery", - "clock", - "tray" - ], - // Modules configuration - "sway/workspaces": { - "disable-scroll": true, - "all-outputs": true, - "format": "{icon}", - "format-icons": { - "1": "", - "2": "", - "3": "", - "4": "", - "5": "", - "urgent": "", - "focused": "", - "default": "" - } - }, - "sway/mode": { - "format": "{}" - }, - "idle_inhibitor": { - "tooltip": false, - "format": "{icon}", - "format-icons": { - "activated": "", - "deactivated": "" - } - }, - "network": { - "format": "{ifname}", - "format-wifi": "{essid} ({signalStrength}%) ", - "format-ethernet": "{ipaddr} ", - "format-disconnected": "Disconnected ", //An empty format will hide the module. - "tooltip-format": "{ifname}", - "tooltip-format-wifi": "{ifname} {frequency}MHz ", - "tooltip-format-ethernet": "{ifname} ", - "tooltip-format-disconnected": "Disconnected" - }, - "tray": { - // "icon-size": 21, - "spacing": 10 - }, - "clock": { - "tooltip": false, - "format": "{:%Y-%m-%d %H:%M} " - }, - "cpu": { - "tooltip": false, - "format": "{usage}% " - }, - "memory": { - "tooltip": false, - "format": "{}% " - }, - "backlight": { - // "device": "acpi_video1", - "format": "{percent}% {icon}", - "format-icons": ["", ""] - }, - "battery": { - "tooltip": false, - "states": { - // "good": 95, - "warning": 30, - "critical": 15 - }, - "format": "{capacity}% {icon}", - // "format-good": "", // An empty format will hide the module - // "format-full": "", - "format-icons": ["", "", "", "", ""] - }, - "battery#bat2": { - "bat": "BAT2" - }, - "pulseaudio": { - "tooltip": false, - //"scroll-step": 1, - "format": "{volume}% {icon}", - "format-bluetooth": "{volume}% ", - "format-muted": "", - "format-icons": { - "headphones": "", - "handsfree": "", - "headset": "", - "phone": "", - "portable": "", - "car": "", - "default": ["", ""] - }, - "on-click": "pamixer --toggle-mute && ( pamixer --get-mute && echo 0 > $SWAYSOCK.wob ) || pamixer --get-volume > $SWAYSOCK.wob", - "on-click-right": "pavucontrol", - "on-scroll-up": "pamixer -ui 1 && pamixer --get-volume > $SWAYSOCK.wob", - "on-scroll-down": "pamixer -ud 1 && pamixer --get-volume > $SWAYSOCK.wob" - }, - "custom/media": { - "tooltip": false, - "format": "{}", - "return-type": "json", - "exec": "$HOME/Scripts/mediaplayer.py 2>/dev/null", - "max-length": 50, - "on-click": "playerctl play-pause", - "on-click-right": "playerctl next", - "on-scroll-up": "playerctl volume 0.05+", - "on-scroll-down": "playerctl volume 0.05-" - }, - "custom/yay":{ - "tooltip": false, - "format": "{} ", - "exec": "yay -Qu | wc -l", - "interval": 300, - "on-click": "gnome-software --mode=updates" - }, - "temperature": { - "format": "{temperatureC}°C " - } + "layer": "top", + "test": "asd", + "height": 22, + "modules-left": ["sway/workspaces", "sway/mode", "custom/media"], + "modules-center": ["sway/window"], + "modules-right": [ + "idle_inhibitor", + "pulseaudio", + "custom/yay", + "network", + "temperature", + "battery", + "clock", + "tray" + ], + "sway/workspaces": { + "disable-scroll": true, + "all-outputs": true, + "format": "{icon}", + "format-icons": { + "1": "", + "2": "", + "3": "", + "4": "", + "5": "", + "urgent": "", + "focused": "", + "default": "" + } + }, + "sway/mode": { + "format": "{}" + }, + "idle_inhibitor": { + "tooltip": false, + "format": "{icon}", + "format-icons": { + "activated": "", + "deactivated": "" + } + }, + "network": { + "format": "{ifname}", + "format-wifi": "{essid} ({signalStrength}%) ", + "format-ethernet": "{ipaddr} ", + "format-disconnected": "Disconnected ", + "tooltip-format": "{ifname}", + "tooltip-format-wifi": "{ifname} {frequency}MHz ", + "tooltip-format-ethernet": "{ifname} ", + "tooltip-format-disconnected": "Disconnected" + }, + "tray": { + "spacing": 10 + }, + "clock": { + "tooltip": true, + "tooltip-format": "{:%Y %B}\n{calendar}", + "format": "{:%Y-%m-%d %H:%M} " + }, + "cpu": { + "tooltip": false, + "format": "{usage}% " + }, + "memory": { + "tooltip": false, + "format": "{}% " + }, + "backlight": { + "format": "{percent}% {icon}", + "format-icons": ["", ""] + }, + "battery": { + "tooltip": true, + "tooltip-format": "{time}", + "states": { + "warning": 30, + "critical": 15 + }, + "format": "{capacity}% {icon}", + "format-icons": ["", "", "", "", ""] + }, + "battery#bat2": { + "bat": "BAT2" + }, + "pulseaudio": { + "tooltip": false, + "format": "{volume}% {icon}", + "format-bluetooth": "{volume}% ", + "format-muted": "", + "format-icons": { + "headphones": "", + "handsfree": "", + "headset": "", + "phone": "", + "portable": "", + "car": "", + "default": ["", ""] + }, + "on-click": "pamixer --toggle-mute && ( pamixer --get-mute && echo 0 > $SWAYSOCK.wob ) || pamixer --get-volume > $SWAYSOCK.wob", + "on-click-right": "pavucontrol", + "on-scroll-up": "pamixer -ui 1 && pamixer --get-volume > $SWAYSOCK.wob", + "on-scroll-down": "pamixer -ud 1 && pamixer --get-volume > $SWAYSOCK.wob" + }, + "custom/media": { + "tooltip": false, + "format": "{}", + "return-type": "json", + "exec": "$HOME/Scripts/mediaplayer.py 2>/dev/null", + "max-length": 50, + "on-click": "playerctl play-pause", + "on-click-right": "playerctl next", + "on-scroll-up": "playerctl volume 0.05+", + "on-scroll-down": "playerctl volume 0.05-" + }, + "custom/yay": { + "tooltip": false, + "format": "{} ", + "exec": "yay -Qu | wc -l", + "interval": 300, + "on-click": "gnome-software --mode=updates" + }, + "temperature": { + "format": "{temperatureC}°C " + } } diff --git a/home/Scripts/sway-run.sh b/home/Scripts/sway-run.sh index cff3e15..445a352 100755 --- a/home/Scripts/sway-run.sh +++ b/home/Scripts/sway-run.sh @@ -19,9 +19,6 @@ export QT_WAYLAND_DISABLE_WINDOWDECORATION=1 # Fix redshift on wlroots export WLR_DRM_NO_ATOMIC=1 -# Use wayland in SDL2 -export SDL_VIDEODRIVER=wayland - # Run sway sway @@ -35,4 +32,3 @@ unset QT_QPA_PLATFORMTHEME=qt5ct unset QT_QPA_PLATFORM=wayland-egl unset QT_WAYLAND_DISABLE_WINDOWDECORATION=1 unset WLR_DRM_NO_ATOMIC=1 -unset SDL_VIDEODRIVER=wayland