From 9103b0c0b096dc6c2e3f27ac237c1a4dd2857288 Mon Sep 17 00:00:00 2001 From: natemaia Date: Fri, 31 Dec 2021 14:02:59 -0800 Subject: [PATCH] Update nwg-panel default --- sway-home/.config/nwg-panel/archlabs.json | 457 +++++++++------------- sway-home/.config/sway/config | 21 +- 2 files changed, 202 insertions(+), 276 deletions(-) diff --git a/sway-home/.config/nwg-panel/archlabs.json b/sway-home/.config/nwg-panel/archlabs.json index ef2f8342..69a77de8 100644 --- a/sway-home/.config/nwg-panel/archlabs.json +++ b/sway-home/.config/nwg-panel/archlabs.json @@ -1,278 +1,197 @@ [ -{ - "name": "top", - "output": "", - "layer": "bottom", - "position": "top", - "width": "auto", - "height": 30, - "homogeneous": true, - "margin-top": 0, - "margin-bottom": 0, - "padding-horizontal": 0, - "padding-vertical": 0, - "spacing": 2, - "items-padding": 0, - "css-name": "panel-top", - "icons": "light", - "menu-start": "off", - "modules-left": [ - "playerctl" - ], - "modules-center": [ - "clock" - ], - "modules-right": [ - "scratchpad", - "executor-arch" - ], - "controls": "right", - "controls-settings": { - "alignment": "right", - "components": [ - "brightness", - "battery", - "volume", - "bluetooth", - "net" + { + "name": "top", + "output": "", + "layer": "bottom", + "position": "top", + "width": "auto", + "height": 30, + "homogeneous": true, + "margin-top": 0, + "margin-bottom": 0, + "padding-horizontal": 0, + "padding-vertical": 0, + "spacing": 2, + "items-padding": 0, + "css-name": "panel-top", + "icons": "light", + "menu-start": "off", + "modules-left": [ + "sway-workspaces" ], - "commands": { - "battery": "", - "net": "", - "bluetooth": "blueman-manager" - }, - "custom-items": [ - { - "name": "Wallpapers", - "icon": "azote", - "cmd": "azote" - }, - { - "name": "Look & Feel", - "icon": "preferences-desktop-theme", - "cmd": "lxappearance" - }, - { - "name": "Outputs", - "icon": "wdisplays", - "cmd": "wdisplays && sway-save-outputs" - }, - { - "name": "Panel settings", - "icon": "nwg-panel", - "cmd": "nwg-panel-config" - } + "modules-center": [ + "clock" ], - "menu": { - "name": "Exit", - "icon": "system-shutdown-symbolic", - "items": [ - { - "name": "Lock", - "cmd": "swaylock -f -c 000000" + "modules-right": [ + "executor-updates", + "executor-cpuav", + "executor-cpubar", + "executor-temp", + "executor-memory" + ], + "controls": "right", + "controls-settings": { + "alignment": "right", + "components": [ + "brightness", + "battery", + "volume", + "bluetooth", + "net" + ], + "commands": { + "battery": "", + "net": "", + "bluetooth": "blueman-manager" }, - { - "name": "Logout", - "cmd": "swaymsg exit" + "custom-items": [ + { + "name": "Wallpapers", + "icon": "azote", + "cmd": "azote" + }, + { + "name": "Look & Feel", + "icon": "preferences-desktop-theme", + "cmd": "lxappearance" + }, + { + "name": "Outputs", + "icon": "wdisplays", + "cmd": "wdisplays && sway-save-outputs" + }, + { + "name": "Panel settings", + "icon": "nwg-panel", + "cmd": "nwg-panel-config" + } + ], + "menu": { + "name": "Exit", + "icon": "system-shutdown-symbolic", + "items": [ + { + "name": "Lock", + "cmd": "swaylock -f -c 000000" + }, + { + "name": "Logout", + "cmd": "swaymsg exit" + }, + { + "name": "Restart", + "cmd": "systemctl reboot" + }, + { + "name": "Shutdown", + "cmd": "systemctl -i poweroff" + } + ] }, - { - "name": "Restart", - "cmd": "systemctl reboot" - }, - { - "name": "Shutdown", - "cmd": "systemctl -i poweroff" - } + "show-values": false, + "interval": 1, + "icon-size": 18, + "hover-opens": false, + "leave-closes": true, + "css-name": "panel-top", + "net-interface": "wlan0", + "Exit": "Exittt", + "system-shutdown-symbolic": "system-shutdown", + "output-switcher": true, + "window-width": 320, + "window-margin": 0, + "root-css-name": "controls-overview" + }, + "sway-workspaces": { + "show-layout": false, + "numbers": [ + "1", + "2", + "3", + "4", + "5", + "6", + "7", + "8" ] }, - "show-values": false, - "interval": 1, - "icon-size": 18, - "hover-opens": false, - "leave-closes": true, - "css-name": "controls-window", - "net-interface": "wlan0", - "Exit": "Exittt", - "system-shutdown-symbolic": "system-shutdown", - "output-switcher": true, - "window-width": 320, - "window-margin": 0, - "root-css-name": "controls-overview" - }, - "playerctl": { - "interval": 1, - "buttons": true, - "buttons-position": "left", - "chars": 50, - "css-name": "button-grid", - "icon-size": 16, - "button-css-name": "button-custom", - "label-css-name": "panel-top" - }, - "clock": { - "format": "%a, %d. %b %H:%M:%S", - "interval": 1, - "on-right-click": "", - "tooltip-text": "", - "on-left-click": "/home/piotr/PycharmProjects/swayinfo/calendar.py", - "on-middle-click": "", - "on-scroll-up": "", - "on-scroll-down": "", - "css-name": "clock", - "root-css-name": "root-clock" - }, - "executor-arch": { - "script": "baph -c", - "interval": 900, - "icon-size": 16, - "on-left-click": "foot baph -unN", - "tooltip-text": "", - "on-middle-click": "", - "on-right-click": "", - "on-scroll-up": "", - "on-scroll-down": "", - "css-name": "", - "root-css-name": "", - "icon-placement": "left" - }, - "sway-taskbar": {}, - "sway-workspaces": {}, - "scratchpad": {} -}, -{ - "name": "bottom", - "output": "", - "layer": "bottom", - "position": "bottom", - "height": 30, - "margin-top": 0, - "margin-bottom": 0, - "padding-horizontal": 6, - "padding-vertical": 0, - "spacing": 10, - "items-padding": 0, - "css-name": "panel-bottom", - "icons": "", - "menu-start": "off", - "width": "auto", - "controls": "off", - "controls-settings": {}, - "scratchpad": {}, - "clock": {}, - "menu-start-settings": {}, - "playerctl": {}, - "sway-workspaces": {}, - "modules-left": [ - "sway-taskbar" - ], - "modules-center": [], - "modules-right": [ - "executor-cpuav", - "executor-cpubar", - "executor-temp", - "executor-memory", - "executor-drives", - "executor-uptime" - ], - "sway-taskbar": { - "workspace-buttons": false, - "show-app-icon": true, - "show-layout": true, - "show-app-name": true, - "name-max-len": 10, - "workspaces-spacing": 0, - "task-padding": 0, - "all-outputs": false, - "image-size": 16, - "workspace-menu": [ - "1", - "2", - "3", - "4", - "5", - "6", - "7", - "8" - ], - "all-workspaces": true - }, - "executor-cpubar": { - "script": "gopsuinfo -c g", - "interval": 2, - "tooltip-text": "", - "on-left-click": "", - "on-middle-click": "", - "on-right-click": "", - "on-scroll-up": "", - "on-scroll-down": "", - "css-name": "", - "icon-size": 16, - "icon-placement": "left" - }, - "executor-cpuav": { - "script": "gopsuinfo -i a", - "interval": 2, - "tooltip-text": "CPU average load", - "on-left-click": "alacritty -e htop", - "on-middle-click": "", - "on-right-click": "", - "on-scroll-up": "", - "on-scroll-down": "", - "css-name": "", - "icon-size": 16, - "icon-placement": "right" - }, - "executor-temp": { - "script": "gopsuinfo -i t", - "interval": 5, - "tooltip-text": "", - "on-left-click": "", - "on-middle-click": "", - "on-right-click": "", - "on-scroll-up": "", - "on-scroll-down": "", - "css-name": "", - "icon-size": 16, - "icon-placement": "left" - }, - "executor-memory": { - "script": "gopsuinfo -i m", - "interval": 5, - "tooltip-text": "", - "on-left-click": "", - "on-middle-click": "", - "on-right-click": "", - "on-scroll-up": "", - "on-scroll-down": "", - "css-name": "", - "icon-size": 16, - "icon-placement": "left" - }, - "executor-drives": { - "script": "gopsuinfo -i n", - "interval": 15, - "tooltip-text": "", - "on-left-click": "", - "on-middle-click": "", - "on-right-click": "", - "on-scroll-up": "", - "on-scroll-down": "", - "css-name": "", - "icon-size": 16, - "icon-placement": "left" - }, - "executor-uptime": { - "script": "gopsuinfo -i u", - "interval": 60, - "tooltip-text": "", - "on-left-click": "", - "on-middle-click": "", - "on-right-click": "", - "on-scroll-up": "", - "on-scroll-down": "", - "css-name": "", - "icon-size": 16, - "icon-placement": "left" + "clock": { + "format": "%a, %d. %b %H:%M:%S", + "interval": 1, + "on-right-click": "", + "tooltip-text": "", + "on-left-click": "gsimplecal", + "on-middle-click": "", + "on-scroll-up": "", + "on-scroll-down": "", + "css-name": "clock", + "root-css-name": "root-clock" + }, + "executor-updates": { + "script": "baph -c", + "interval": 900, + "icon-size": 16, + "on-left-click": "foot bash -c 'baph -unN ; read -p \"Press Enter to finish\"'", + "tooltip-text": "", + "on-middle-click": "", + "on-right-click": "", + "on-scroll-up": "", + "on-scroll-down": "", + "css-name": "", + "root-css-name": "", + "icon-placement": "left" + }, + "executor-cpubar": { + "script": "gopsuinfo -c g", + "interval": 2, + "tooltip-text": "", + "on-left-click": "", + "on-middle-click": "", + "on-right-click": "", + "on-scroll-up": "", + "on-scroll-down": "", + "css-name": "", + "icon-size": 16, + "icon-placement": "left" + }, + "executor-cpuav": { + "script": "gopsuinfo -i a", + "interval": 2, + "tooltip-text": "CPU average load", + "on-left-click": "foot htop", + "on-middle-click": "", + "on-right-click": "", + "on-scroll-up": "", + "on-scroll-down": "", + "css-name": "", + "icon-size": 16, + "icon-placement": "right" + }, + "executor-temp": { + "script": "gopsuinfo -i t", + "interval": 5, + "tooltip-text": "", + "on-left-click": "", + "on-middle-click": "", + "on-right-click": "", + "on-scroll-up": "", + "on-scroll-down": "", + "css-name": "", + "icon-size": 16, + "icon-placement": "left" + }, + "executor-memory": { + "script": "gopsuinfo -i m", + "interval": 5, + "tooltip-text": "", + "on-left-click": "", + "on-middle-click": "", + "on-right-click": "", + "on-scroll-up": "", + "on-scroll-down": "", + "css-name": "", + "icon-size": 16, + "icon-placement": "left" + } } -} ] diff --git a/sway-home/.config/sway/config b/sway-home/.config/sway/config index 10ddcd23..23f4a2a1 100644 --- a/sway-home/.config/sway/config +++ b/sway-home/.config/sway/config @@ -4,6 +4,7 @@ # border & title for_window [class="^.*"] border pixel 1, title_format " %class >> %title " +default_border pixel 1 # gaps gaps inner 8 @@ -64,10 +65,10 @@ bindswitch lid:off output $laptop enable ### Idle configuration exec swayidle -w \ - timeout 3000 'swaylock -f -c 000000' \ + timeout 3000 'swaylock -f -c 212121' \ timeout 3300 'swaymsg "output * dpms off"' \ resume 'swaymsg "output * dpms on"' \ - before-sleep 'swaylock -f -c 000000' + before-sleep 'swaylock -f -c 212121' # # This will lock your screen after 3000 seconds of inactivity, then turn off # your displays after another 3300 seconds, and turn your screens back on when @@ -85,18 +86,26 @@ exec swayidle -w \ # You can get the names of your inputs by running: swaymsg -t get_inputs # Read `man 5 sway-input` for more information about this section. +# enable touchpad speed and features input "type:touchpad" { tap enabled dwt enabled drag enabled scroll_factor 0.7 - pointer_accel 0.5 + pointer_accel 0.2 + accel_profile adaptive +} + +# disable acceleration for mice +input "type:mouse" { accel_profile flat } -# keyboard layout +# keyboard layout and repeat settings input "type:keyboard" { xkb_layout $lang + repeat_delay 300 + repeat_rate 70 } # numlock on/off @@ -115,7 +124,7 @@ bindsym Mod1+F1 exec $launcher # core bindsym $Mod+Return exec $term -bindsym Mod4+Shift+Return exec $term +bindsym Mod1+Shift+Return exec $term bindsym Control+Shift+t exec $term bindsym $Mod+t exec $term bindsym $Mod+w exec $browser @@ -294,8 +303,6 @@ bindsym $Mod+Shift+f fullscreen ############### Border & Gaps ############### -hide_edge_borders both - # changing border style bindsym $Mod+n border normal bindsym $Mod+y border pixel 1