From b4faca57394a9ed676f64f0939bb8b9595687a84 Mon Sep 17 00:00:00 2001 From: Valentin Nourdin Date: Mon, 24 Jan 2022 13:10:55 +0100 Subject: [PATCH] chore: clean spaces, tabs, useless CSS --- .config/gtk-3.0/gtk.css | 1 - .config/sway/config.d/default | 27 +-- .config/sway/config.d/input | 13 +- .config/sway/config.d/output | 2 +- .config/sway/config.d/theme | 4 +- .config/waybar/config | 379 ++++++++++++++++----------------- .config/waybar/style.css | 186 ++++++++-------- .config/wofi/style.css | 16 +- .config/wofi/style.widgets.css | 25 +-- 9 files changed, 309 insertions(+), 344 deletions(-) diff --git a/.config/gtk-3.0/gtk.css b/.config/gtk-3.0/gtk.css index 512becb..f0a975a 100644 --- a/.config/gtk-3.0/gtk.css +++ b/.config/gtk-3.0/gtk.css @@ -1,4 +1,3 @@ VteTerminal, vte-terminal { padding: 13px; - } diff --git a/.config/sway/config.d/default b/.config/sway/config.d/default index 1fd327e..367df5e 100644 --- a/.config/sway/config.d/default +++ b/.config/sway/config.d/default @@ -28,15 +28,15 @@ exec swayidle -w\ # resumed. It will also lock your screen before your computer goes to sleep. ## Lock Screen - bindsym $mod+f1 exec ~/.config/sway/scripts/lockman.sh + bindsym $mod+f1 exec ~/.config/sway/scripts/lockman.sh ### Key bindings # # Basics: # # Start a floating terminal - bindsym $mod+Return exec $term-float - + bindsym $mod+Return exec $term-float + # Open the power menu bindsym $mod+Shift+e exec $powermenu @@ -45,7 +45,7 @@ exec swayidle -w\ # Start your launcher bindsym $mod+d exec $menu - + # Activities bindsym $mod+p exec ~/.config/wofi/windows.py @@ -156,27 +156,28 @@ mode "resize" { # up will shrink the containers height # down will grow the containers height bindsym $left resize shrink width 10px - bindsym $down resize grow height 10px - bindsym $up resize shrink height 10px bindsym $right resize grow width 10px + bindsym $up resize shrink height 10px + bindsym $down resize grow height 10px # Ditto, with arrow keys bindsym Left resize shrink width 10px - bindsym Down resize grow height 10px - bindsym Up resize shrink height 10px bindsym Right resize grow width 10px + bindsym Up resize shrink height 10px + bindsym Down resize grow height 10px # Return to default mode bindsym Return mode "default" bindsym Escape mode "default" } + bindsym $mod+r mode "resize" # Resize floating windows with mouse scroll: -bindsym --whole-window --border $mod+button4 resize shrink height 5 px or 5 ppt -bindsym --whole-window --border $mod+button5 resize grow height 5 px or 5 ppt -bindsym --whole-window --border $mod+shift+button4 resize shrink width 5 px or 5 ppt -bindsym --whole-window --border $mod+shift+button5 resize grow width 5 px or 5 ppt + bindsym --whole-window --border $mod+button4 resize shrink height 5 px or 5 ppt + bindsym --whole-window --border $mod+button5 resize grow height 5 px or 5 ppt + bindsym --whole-window --border $mod+Shift+button4 resize shrink width 5 px or 5 ppt + bindsym --whole-window --border $mod+Shift+button5 resize grow width 5 px or 5 ppt # # Volume @@ -209,4 +210,4 @@ bindsym --whole-window --border $mod+shift+button5 resize grow width 5 px or 5 p # # Keybindings List # - bindsym $mod+t exec xed ~/.config/sway/cheatsheet + bindsym $mod+t exec xed ~/.config/sway/cheatsheet diff --git a/.config/sway/config.d/input b/.config/sway/config.d/input index 9eb77ff..53f0ad9 100644 --- a/.config/sway/config.d/input +++ b/.config/sway/config.d/input @@ -5,9 +5,9 @@ # Put your touchpad's ID to replace "Touchpad-ID" (keep the quotation marks) input type:touchpad { - dwt enabled - tap enabled - natural_scroll enabled + dwt enabled + tap enabled + natural_scroll enabled } # Read `man 5 sway-input` for more information about this section. @@ -15,9 +15,6 @@ input type:touchpad { input type:keyboard xkb_layout "us" exec_always { - 'swaymsg input type:keyboard xkb_layout "$(localectl status | grep "X11 Layout" | sed -e "s/^.*X11 Layout://")"' - 'swaymsg input type:keyboard xkb_variant "$(localectl status | grep "X11 Variant" | sed -e "s/^.*X11 Variant://")"' + 'swaymsg input type:keyboard xkb_layout "$(localectl status | grep "X11 Layout" | sed -e "s/^.*X11 Layout://")"' + 'swaymsg input type:keyboard xkb_variant "$(localectl status | grep "X11 Variant" | sed -e "s/^.*X11 Variant://")"' } - - - diff --git a/.config/sway/config.d/output b/.config/sway/config.d/output index fbc1ba5..828880b 100644 --- a/.config/sway/config.d/output +++ b/.config/sway/config.d/output @@ -5,7 +5,7 @@ # output HDMI-A-1 resolution 1920x1080 position 1920,0 # # You can get the names of your outputs by running: swaymsg -t get_outputs -# +# # Wacom Tablet - Example # input "1386:884:Wacom_Intuos_S_Pad" map_to_output HDMI-A-1 # input "1386:884:Wacom_Intuos_S_Pen" map_to_output HDMI-A-1 diff --git a/.config/sway/config.d/theme b/.config/sway/config.d/theme index 78d6d25..b596028 100644 --- a/.config/sway/config.d/theme +++ b/.config/sway/config.d/theme @@ -5,7 +5,7 @@ exec_always ~/.config/sway/scripts/import-gsettings gaps inner 2 gaps outer 0 -# Hide titlebar on windows: +# Hide titlebar on windows: default_border pixel 1 # Default Font @@ -34,5 +34,5 @@ client.background #F8F8F2 # # Read `man 5 sway-bar` for more information about this section. bar { - swaybar_command waybar + swaybar_command waybar } diff --git a/.config/waybar/config b/.config/waybar/config index 04a79c4..8d872cc 100644 --- a/.config/waybar/config +++ b/.config/waybar/config @@ -1,224 +1,219 @@ // Global { - "layer": "top", - "position": "top", - // If height property would be not present, it'd be calculated dynamically - "height": 30, - "width" : 10, - - "modules-left": [ - "custom/launcher", - "sway/workspaces", - "sway/mode", - ], - - "modules-center": [ - ], - - "modules-right": [ - "network", - "idle_inhibitor", - "memory", - "cpu", - // "custom/weather", - "pulseaudio", - "custom/keyboard-layout", - "battery", - //"custom/PBPbattery", - "backlight#icon", - "backlight#value", - "clock", - "tray", - "custom/weather", - "custom/power", - ], - -// Modules + "layer": "top", + "position": "top", + // If height property would be not present, it'd be calculated dynamically + "height": 30, + "width" : 10, -"idle_inhibitor": { - "format": "{icon} ", - "format-icons":{ - "activated": "", - "deactivated": "" + "modules-left": [ + "custom/launcher", + "sway/workspaces", + "sway/mode", + ], + + "modules-center": [ + ], - } -}, - -"battery": { - "states": { - // "good": 95, - "warning": 30, - "critical": 15 - }, - "format": "{capacity}% {icon}", - "format-charging": "{capacity}% ", - "format-plugged": "{capacity}% ", - // "format-good": "", // An empty format will hide the module - // "format-full": "", - "format-icons": ["", "", "", "", ""] -}, + "modules-right": [ + "network", + "idle_inhibitor", + "memory", + "cpu", + "pulseaudio", + "custom/keyboard-layout", + "battery", + //"custom/PBPbattery", + "backlight#icon", + "backlight#value", + "clock", + "tray", + "custom/weather", + "custom/power", + ], -"custom/PBPbattery": { - "exec": "~/.config/waybar/scripts/PBPbattery.sh", - "format": "{}", -}, - - -"clock": { - "interval": 10, - "format-alt": " {:%e %b %Y}", // Icon: calendar-alt - "format": "{:%H:%M}", - "tooltip-format": "{:%e %B %Y}" -}, - -"cpu": { + // Modules + + "idle_inhibitor": { + "format": "{icon} ", + "format-icons":{ + "activated": "", + "deactivated": "" + } + }, + + "battery": { + "states": { + // "good": 95, + "warning": 30, + "critical": 15 + }, + "format": "{capacity}% {icon}", + "format-charging": "{capacity}% ", + "format-plugged": "{capacity}% ", + // "format-good": "", // An empty format will hide the module + // "format-full": "", + "format-icons": ["", "", "", "", ""] + }, + + "custom/PBPbattery": { + "exec": "~/.config/waybar/scripts/PBPbattery.sh", + "format": "{}", + }, + + "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, + "warning": 70, + "critical": 90, }, "on-click": "xfce4-terminal -e 'htop'", -}, - -"custom/keyboard-layout": { - "exec": "swaymsg -t get_inputs | grep -m1 'xkb_active_layout_name' | cut -d '\"' -f4", - // Interval set only as a fallback, as the value is updated by signal - "interval": 30, - "format": " {}", // Icon: keyboard - // Signal sent by Sway key binding (~/.config/sway/key-bindings) - "signal": 1, // SIGHUP - "tooltip": false, + }, + + "custom/keyboard-layout": { + "exec": "swaymsg -t get_inputs | grep -m1 'xkb_active_layout_name' | cut -d '\"' -f4", + // Interval set only as a fallback, as the value is updated by signal + "interval": 30, + "format": " {}", // Icon: keyboard + // Signal sent by Sway key binding (~/.config/sway/key-bindings) + "signal": 1, // SIGHUP + "tooltip": false, "on-click": "~/.config/waybar/scripts/keyhint.sh", -}, - -"memory": { + }, + + "memory": { "interval": 5, "format": " {}%", // Icon: memory "on-click": "xfce4-terminal -e 'htop'", "states": { - "warning": 70, - "critical": 90 + "warning": 70, + "critical": 90 } -}, - -"network": { - "interval": 5, + }, + + "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": "xfce4-terminal -e 'nmtui'", -}, -"network#vpn": { - "interface": "tun0", - "format": " {essid} ({signalStrength}%)", - "format-disconnected": "⚠ Disconnected", - "tooltip-format": "{ifname}: {ipaddr}/{cidr}", -}, - -"sway/mode": { - "format": "{}", + }, + "network#vpn": { + "interface": "tun0", + "format": " {essid} ({signalStrength}%)", + "format-disconnected": "⚠ Disconnected", + "tooltip-format": "{ifname}: {ipaddr}/{cidr}", + }, + + "sway/mode": { + "format": "{}", "tooltip": false -}, - -"sway/window": { + }, + + "sway/window": { "format": "{}", "max-length": 120 -}, - -"sway/workspaces": { - "disable-scroll": true, - "disable-markup" : false, - "all-outputs": true, - "format": " {icon} ", - //"format":"{icon}", - "format-icons": { - "1": "", - "2": "", - "3": "", - "4": "", - } - }, -"pulseaudio": { - "scroll-step": 1, // %, can be a float - "format": "{volume}% {icon}", - "format-bluetooth": "{volume}% {icon}  {format_source}", - "format-bluetooth-muted": " {icon}  {format_source}", - "format-muted": "婢 {format_source}", - "format-source": "{volume}% ", - "format-source-muted": "", - "format-icons": { - "headphone": "", - "hands-free": "וֹ", - "headset": "  ", - "phone": "", - "portable": "", - "car": "", - "default": [""] - }, - "on-click": "pavucontrol", - "on-scroll-up": "pamixer -ui 2", - "on-scroll-down": "pamixer -ud 2", -}, - -"custom/weather": { - "exec": "~/.config/waybar/scripts/weather.sh", - "format": "{text} {icon}", - "return-type": "json", - "interval": 600, + }, + + "sway/workspaces": { + "disable-scroll": true, + "disable-markup" : false, + "all-outputs": true, + "format": " {icon} ", + //"format":"{icon}", + "format-icons": { + "1": "", + "2": "", + "3": "", + "4": "", + } + }, + + "pulseaudio": { + "scroll-step": 1, // %, can be a float + "format": "{volume}% {icon}", + "format-bluetooth": "{volume}% {icon}  {format_source}", + "format-bluetooth-muted": " {icon}  {format_source}", + "format-muted": "婢 {format_source}", + "format-source": "{volume}% ", + "format-source-muted": "", + "format-icons": { + "headphone": "", + "hands-free": "וֹ", + "headset": "  ", + "phone": "", + "portable": "", + "car": "", + "default": [""] + }, + "on-click": "pavucontrol", + "on-scroll-up": "pamixer -ui 2", + "on-scroll-down": "pamixer -ud 2", + }, + + "custom/weather": { + "exec": "~/.config/waybar/scripts/weather.sh", + "format": "{text} {icon}", + "return-type": "json", + "interval": 600, "tooltip-format": "{tooltip}" -}, + }, -"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%" -}, + "tray": { + "icon-size": 18, + "spacing":10, + }, -"backlight#value" :{ - "format": "{percent}%", - "on-scroll-down": "brightnessctl -c backlight set 1%-", - "on-scroll-up": "brightnessctl -c backlight set +1%" + "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 alacritty", - "tooltip": false -}, - -"custom/files": { - "format": " ", - "on-click": "exec thunar", - "tooltip": false -}, - -"custom/launcher": { - "format":" ", - "on-click": "exec wofi -c ~/.config/wofi/config -I", - "tooltip": false, -}, - -"custom/power": { - "format":"⏻", - "on-click": "exec ~/.config/waybar/scripts/power-menu.sh", - "tooltip": false, - }, + "custom/firefox": { + "format": " ", + "on-click": "exec firefox", + "tooltip": false + }, + "custom/terminal": { + "format": " ", + "on-click": "exec alacritty", + "tooltip": false + }, + + "custom/files": { + "format": " ", + "on-click": "exec thunar", + "tooltip": false + }, + + "custom/launcher": { + "format":" ", + "on-click": "exec wofi -c ~/.config/wofi/config -I", + "tooltip": false, + }, + + "custom/power": { + "format":"⏻", + "on-click": "exec ~/.config/waybar/scripts/power-menu.sh", + "tooltip": false, + }, } - diff --git a/.config/waybar/style.css b/.config/waybar/style.css index dc91d8f..664ed30 100644 --- a/.config/waybar/style.css +++ b/.config/waybar/style.css @@ -5,46 +5,43 @@ * Configuration reference: https://github.com/Alexays/Waybar/wiki/Configuration * * =========================================================================== */ - + /* ----------------------------------------------------------------------------- * Keyframes * -------------------------------------------------------------------------- */ - /* + +/* Arc-Dark Color Scheme */ - @define-color highlight #5294e2 ; @define-color base1 #404552 ; - - @keyframes blink-warning { 70% { color: white; } - + to { color: white; background-color: orange; } } - + @keyframes blink-critical { 70% { color: white; } - + to { color: white; background-color: red; } } - - + /* ----------------------------------------------------------------------------- * Base styles * -------------------------------------------------------------------------- */ - + /* Reset all styles */ * { border: none; @@ -63,7 +60,7 @@ Arc-Dark Color Scheme font-size: 14px; } -/* Each module */ +/* Every modules */ #battery, #clock, #backlight, @@ -77,134 +74,127 @@ Arc-Dark Color Scheme #temperature, #tray, #idle_inhibitor, -#custom-PBPbattery{ - padding:0.5rem 0.6rem; - margin: 1px 0px; +#custom-PBPbattery { + padding:0.5rem 0.6rem; + margin: 1px 0px; } - - - /* ----------------------------------------------------------------------------- - * Module styles + * Modules styles * -------------------------------------------------------------------------- */ - + #battery { - - animation-timing-function: linear; - animation-iteration-count: infinite; - animation-direction: alternate; -} - -#battery.warning { - color: orange; -} - -#battery.critical { - color: red; -} - -#battery.warning.discharging { - animation-name: blink-warning; - animation-duration: 3s; -} - -#battery.critical.discharging { - animation-name: blink-critical; - animation-duration: 2s; + animation-timing-function: linear; + animation-iteration-count: infinite; + animation-direction: alternate; } -#cpu{ - +#battery.warning { + color: orange; } + +#battery.critical { + color: red; +} + +#battery.warning.discharging { + animation-name: blink-warning; + animation-duration: 3s; +} + +#battery.critical.discharging { + animation-name: blink-critical; + animation-duration: 2s; +} + #cpu.warning { - color: orange; + color: orange; } - + #cpu.critical { - color: red; + color: red; } - + #memory { - animation-timing-function: linear; - animation-iteration-count: infinite; - animation-direction: alternate; + animation-timing-function: linear; + animation-iteration-count: infinite; + animation-direction: alternate; } - + #memory.warning { - color: orange; + color: orange; } - + #memory.critical { - color: red; - animation-name: blink-critical; - animation-duration: 2s; - padding-left:5px; - padding-right:5px; + 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:7; - } - -#network.disconnected { - color: orange; } -#pulseaudio{ -padding-top:6px; -} +#network.disconnected { + color: orange; +} + +#pulseaudio { + padding-top:6px; +} + #pulseaudio.muted { - color: @highlight; + color: @highlight; } - + #temperature.critical { - color: red; + color: red; } - + #window { - font-weight: bold; + font-weight: bold; } - -#workspaces{ -font-size:13px; + +#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; - } + 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; + 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; +} diff --git a/.config/wofi/style.css b/.config/wofi/style.css index c616d5f..3a18d9a 100644 --- a/.config/wofi/style.css +++ b/.config/wofi/style.css @@ -7,13 +7,12 @@ Arc-Dark Color Scheme @define-color base2 #40455; @define-color base3 #4b5160; - *{ font-family: UbuntuMono; } window { - border: 1px solid @highlight; + border: 1px solid @highlight; } #input { @@ -26,7 +25,6 @@ window { #inner-box { background-color: @base3; - } #outer-box { @@ -35,21 +33,15 @@ window { background-color: @base2; } -#scroll { -} - #text { -padding: 5px; -color: white; + padding: 5px; + color: white; } -#entry:nth-child(even){ +#entry:nth-child(even) { background-color: @base1; } #entry:selected { background-color: @highlight; } - -#text:selected { -} diff --git a/.config/wofi/style.widgets.css b/.config/wofi/style.widgets.css index be10ba4..7718255 100644 --- a/.config/wofi/style.widgets.css +++ b/.config/wofi/style.widgets.css @@ -7,38 +7,32 @@ Arc-Dark Color Scheme @define-color base2 #40455; @define-color base3 #4b5160; - *{ font-family: UbuntuMono; } #window { - border: 1px solid @highlight; + border: 1px solid @highlight; margin: 0px 5px 0px 5px; - } #inner-box { background-color: @base2; - } #outer-box { - margin: 5px; - padding:10px; - background-color: @base2; - margin-top: -22px; -} - -#scroll { + margin: 5px; + padding:10px; + background-color: @base2; + margin-top: -22px; } #text { -padding: 5px; -color: white; + padding: 5px; + color: white; } -#entry:nth-child(even){ +#entry:nth-child(even) { background-color: @base1; } @@ -49,6 +43,3 @@ color: white; #entry:selected { background-color: @highlight; } - -#text:selected { -}