chore: clean spaces, tabs, useless CSS

This commit is contained in:
Valentin Nourdin
2022-01-24 13:10:55 +01:00
parent aab0148a1b
commit b4faca5739
9 changed files with 309 additions and 344 deletions

View File

@@ -1,4 +1,3 @@
VteTerminal, vte-terminal { VteTerminal, vte-terminal {
padding: 13px; padding: 13px;
} }

View File

@@ -28,15 +28,15 @@ exec swayidle -w\
# resumed. It will also lock your screen before your computer goes to sleep. # resumed. It will also lock your screen before your computer goes to sleep.
## Lock Screen ## Lock Screen
bindsym $mod+f1 exec ~/.config/sway/scripts/lockman.sh bindsym $mod+f1 exec ~/.config/sway/scripts/lockman.sh
### Key bindings ### Key bindings
# #
# Basics: # Basics:
# #
# Start a floating terminal # Start a floating terminal
bindsym $mod+Return exec $term-float bindsym $mod+Return exec $term-float
# Open the power menu # Open the power menu
bindsym $mod+Shift+e exec $powermenu bindsym $mod+Shift+e exec $powermenu
@@ -45,7 +45,7 @@ exec swayidle -w\
# Start your launcher # Start your launcher
bindsym $mod+d exec $menu bindsym $mod+d exec $menu
# Activities # Activities
bindsym $mod+p exec ~/.config/wofi/windows.py bindsym $mod+p exec ~/.config/wofi/windows.py
@@ -156,27 +156,28 @@ mode "resize" {
# up will shrink the containers height # up will shrink the containers height
# down will grow the containers height # down will grow the containers height
bindsym $left resize shrink width 10px 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 $right resize grow width 10px
bindsym $up resize shrink height 10px
bindsym $down resize grow height 10px
# Ditto, with arrow keys # Ditto, with arrow keys
bindsym Left resize shrink width 10px 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 Right resize grow width 10px
bindsym Up resize shrink height 10px
bindsym Down resize grow height 10px
# Return to default mode # Return to default mode
bindsym Return mode "default" bindsym Return mode "default"
bindsym Escape mode "default" bindsym Escape mode "default"
} }
bindsym $mod+r mode "resize" bindsym $mod+r mode "resize"
# Resize floating windows with mouse scroll: # 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+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+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+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+Shift+button5 resize grow width 5 px or 5 ppt
# #
# Volume # Volume
@@ -209,4 +210,4 @@ bindsym --whole-window --border $mod+shift+button5 resize grow width 5 px or 5 p
# #
# Keybindings List # Keybindings List
# #
bindsym $mod+t exec xed ~/.config/sway/cheatsheet bindsym $mod+t exec xed ~/.config/sway/cheatsheet

View File

@@ -5,9 +5,9 @@
# Put your touchpad's ID to replace "Touchpad-ID" (keep the quotation marks) # Put your touchpad's ID to replace "Touchpad-ID" (keep the quotation marks)
input type:touchpad { input type:touchpad {
dwt enabled dwt enabled
tap enabled tap enabled
natural_scroll enabled natural_scroll enabled
} }
# Read `man 5 sway-input` for more information about this section. # Read `man 5 sway-input` for more information about this section.
@@ -15,9 +15,6 @@ input type:touchpad {
input type:keyboard xkb_layout "us" input type:keyboard xkb_layout "us"
exec_always { exec_always {
'swaymsg input type:keyboard xkb_layout "$(localectl status | grep "X11 Layout" | sed -e "s/^.*X11 Layout://")"' '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_variant "$(localectl status | grep "X11 Variant" | sed -e "s/^.*X11 Variant://")"'
} }

View File

@@ -5,7 +5,7 @@
# output HDMI-A-1 resolution 1920x1080 position 1920,0 # output HDMI-A-1 resolution 1920x1080 position 1920,0
# #
# You can get the names of your outputs by running: swaymsg -t get_outputs # You can get the names of your outputs by running: swaymsg -t get_outputs
# #
# Wacom Tablet - Example # Wacom Tablet - Example
# input "1386:884:Wacom_Intuos_S_Pad" map_to_output HDMI-A-1 # 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 # input "1386:884:Wacom_Intuos_S_Pen" map_to_output HDMI-A-1

View File

@@ -5,7 +5,7 @@ exec_always ~/.config/sway/scripts/import-gsettings
gaps inner 2 gaps inner 2
gaps outer 0 gaps outer 0
# Hide titlebar on windows: # Hide titlebar on windows:
default_border pixel 1 default_border pixel 1
# Default Font # Default Font
@@ -34,5 +34,5 @@ client.background #F8F8F2
# #
# Read `man 5 sway-bar` for more information about this section. # Read `man 5 sway-bar` for more information about this section.
bar { bar {
swaybar_command waybar swaybar_command waybar
} }

View File

@@ -1,224 +1,219 @@
// Global // Global
{ {
"layer": "top", "layer": "top",
"position": "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
// If height property would be not present, it'd be calculated dynamically
"height": 30,
"width" : 10,
"idle_inhibitor": { "modules-left": [
"format": "{icon} ", "custom/launcher",
"format-icons":{ "sway/workspaces",
"activated": "", "sway/mode",
"deactivated": "" ],
"modules-center": [
],
} "modules-right": [
}, "network",
"idle_inhibitor",
"battery": { "memory",
"states": { "cpu",
// "good": 95, "pulseaudio",
"warning": 30, "custom/keyboard-layout",
"critical": 15 "battery",
}, //"custom/PBPbattery",
"format": "{capacity}% {icon}", "backlight#icon",
"format-charging": "{capacity}% ", "backlight#value",
"format-plugged": "{capacity}% ", "clock",
// "format-good": "", // An empty format will hide the module "tray",
// "format-full": "", "custom/weather",
"format-icons": ["", "", "", "", ""] "custom/power",
}, ],
"custom/PBPbattery": { // Modules
"exec": "~/.config/waybar/scripts/PBPbattery.sh",
"format": "{}", "idle_inhibitor": {
}, "format": "{icon} ",
"format-icons":{
"activated": "",
"clock": { "deactivated": ""
"interval": 10, }
"format-alt": " {:%e %b %Y}", // Icon: calendar-alt },
"format": "{:%H:%M}",
"tooltip-format": "{:%e %B %Y}" "battery": {
}, "states": {
// "good": 95,
"cpu": { "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, "interval": 5,
"format": " {usage}% ({load})", // Icon: microchip "format": " {usage}% ({load})", // Icon: microchip
"states": { "states": {
"warning": 70, "warning": 70,
"critical": 90, "critical": 90,
}, },
"on-click": "xfce4-terminal -e 'htop'", "on-click": "xfce4-terminal -e 'htop'",
}, },
"custom/keyboard-layout": { "custom/keyboard-layout": {
"exec": "swaymsg -t get_inputs | grep -m1 'xkb_active_layout_name' | cut -d '\"' -f4", "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 set only as a fallback, as the value is updated by signal
"interval": 30, "interval": 30,
"format": " {}", // Icon: keyboard "format": " {}", // Icon: keyboard
// Signal sent by Sway key binding (~/.config/sway/key-bindings) // Signal sent by Sway key binding (~/.config/sway/key-bindings)
"signal": 1, // SIGHUP "signal": 1, // SIGHUP
"tooltip": false, "tooltip": false,
"on-click": "~/.config/waybar/scripts/keyhint.sh", "on-click": "~/.config/waybar/scripts/keyhint.sh",
}, },
"memory": { "memory": {
"interval": 5, "interval": 5,
"format": " {}%", // Icon: memory "format": " {}%", // Icon: memory
"on-click": "xfce4-terminal -e 'htop'", "on-click": "xfce4-terminal -e 'htop'",
"states": { "states": {
"warning": 70, "warning": 70,
"critical": 90 "critical": 90
} }
}, },
"network": { "network": {
"interval": 5, "interval": 5,
"format-wifi": " {essid} ({signalStrength}%)", // Icon: wifi "format-wifi": " {essid} ({signalStrength}%)", // Icon: wifi
"format-ethernet": " {ifname}: {ipaddr}/{cidr}", // Icon: ethernet "format-ethernet": " {ifname}: {ipaddr}/{cidr}", // Icon: ethernet
"format-disconnected": "⚠ Disconnected", "format-disconnected": "⚠ Disconnected",
"tooltip-format": "{ifname}: {ipaddr}", "tooltip-format": "{ifname}: {ipaddr}",
"on-click": "xfce4-terminal -e 'nmtui'", "on-click": "xfce4-terminal -e 'nmtui'",
}, },
"network#vpn": { "network#vpn": {
"interface": "tun0", "interface": "tun0",
"format": " {essid} ({signalStrength}%)", "format": " {essid} ({signalStrength}%)",
"format-disconnected": "⚠ Disconnected", "format-disconnected": "⚠ Disconnected",
"tooltip-format": "{ifname}: {ipaddr}/{cidr}", "tooltip-format": "{ifname}: {ipaddr}/{cidr}",
}, },
"sway/mode": { "sway/mode": {
"format": "{}", "format": "{}",
"tooltip": false "tooltip": false
}, },
"sway/window": { "sway/window": {
"format": "{}", "format": "{}",
"max-length": 120 "max-length": 120
}, },
"sway/workspaces": { "sway/workspaces": {
"disable-scroll": true, "disable-scroll": true,
"disable-markup" : false, "disable-markup" : false,
"all-outputs": true, "all-outputs": true,
"format": " {icon} ", "format": " {icon} ",
//"format":"{icon}", //"format":"{icon}",
"format-icons": { "format-icons": {
"1": "", "1": "",
"2": "", "2": "",
"3": "", "3": "",
"4": "", "4": "",
} }
}, },
"pulseaudio": {
"scroll-step": 1, // %, can be a float "pulseaudio": {
"format": "{volume}% {icon}", "scroll-step": 1, // %, can be a float
"format-bluetooth": "{volume}% {icon}  {format_source}", "format": "{volume}% {icon}",
"format-bluetooth-muted": " {icon}  {format_source}", "format-bluetooth": "{volume}% {icon}  {format_source}",
"format-muted": "婢 {format_source}", "format-bluetooth-muted": " {icon}  {format_source}",
"format-source": "{volume}% ", "format-muted": "婢 {format_source}",
"format-source-muted": "", "format-source": "{volume}% ",
"format-icons": { "format-source-muted": "",
"headphone": "", "format-icons": {
"hands-free": "", "headphone": "",
"headset": "", "hands-free": "",
"phone": "", "headset": "",
"portable": "", "phone": "",
"car": "", "portable": "",
"default": [""] "car": "",
}, "default": [""]
"on-click": "pavucontrol", },
"on-scroll-up": "pamixer -ui 2", "on-click": "pavucontrol",
"on-scroll-down": "pamixer -ud 2", "on-scroll-up": "pamixer -ui 2",
}, "on-scroll-down": "pamixer -ud 2",
},
"custom/weather": {
"exec": "~/.config/waybar/scripts/weather.sh", "custom/weather": {
"format": "{text} {icon}", "exec": "~/.config/waybar/scripts/weather.sh",
"return-type": "json", "format": "{text} {icon}",
"interval": 600, "return-type": "json",
"interval": 600,
"tooltip-format": "{tooltip}" "tooltip-format": "{tooltip}"
}, },
"tray": { "tray": {
"icon-size": 18, "icon-size": 18,
"spacing":10, "spacing":10,
}, },
"backlight#icon": {
"format": "{icon}",
"format-icons": [""],
"on-scroll-down": "brightnessctl -c backlight set 1%-",
"on-scroll-up": "brightnessctl -c backlight set +1%"
},
"backlight#value" :{ "backlight#icon": {
"format": "{percent}%", "format": "{icon}",
"on-scroll-down": "brightnessctl -c backlight set 1%-", "format-icons": [""],
"on-scroll-up": "brightnessctl -c backlight set +1%" "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": { "custom/firefox": {
"format": " ", "format": " ",
"on-click": "exec firefox", "on-click": "exec firefox",
"tooltip": false "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/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,
},
} }

View File

@@ -5,46 +5,43 @@
* Configuration reference: https://github.com/Alexays/Waybar/wiki/Configuration * Configuration reference: https://github.com/Alexays/Waybar/wiki/Configuration
* *
* =========================================================================== */ * =========================================================================== */
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
* Keyframes * Keyframes
* -------------------------------------------------------------------------- */ * -------------------------------------------------------------------------- */
/*
/*
Arc-Dark Color Scheme Arc-Dark Color Scheme
*/ */
@define-color highlight #5294e2 ; @define-color highlight #5294e2 ;
@define-color base1 #404552 ; @define-color base1 #404552 ;
@keyframes blink-warning { @keyframes blink-warning {
70% { 70% {
color: white; color: white;
} }
to { to {
color: white; color: white;
background-color: orange; background-color: orange;
} }
} }
@keyframes blink-critical { @keyframes blink-critical {
70% { 70% {
color: white; color: white;
} }
to { to {
color: white; color: white;
background-color: red; background-color: red;
} }
} }
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
* Base styles * Base styles
* -------------------------------------------------------------------------- */ * -------------------------------------------------------------------------- */
/* Reset all styles */ /* Reset all styles */
* { * {
border: none; border: none;
@@ -63,7 +60,7 @@ Arc-Dark Color Scheme
font-size: 14px; font-size: 14px;
} }
/* Each module */ /* Every modules */
#battery, #battery,
#clock, #clock,
#backlight, #backlight,
@@ -77,134 +74,127 @@ Arc-Dark Color Scheme
#temperature, #temperature,
#tray, #tray,
#idle_inhibitor, #idle_inhibitor,
#custom-PBPbattery{ #custom-PBPbattery {
padding:0.5rem 0.6rem; padding:0.5rem 0.6rem;
margin: 1px 0px; margin: 1px 0px;
} }
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
* Module styles * Modules styles
* -------------------------------------------------------------------------- */ * -------------------------------------------------------------------------- */
#battery { #battery {
animation-timing-function: linear;
animation-timing-function: linear; animation-iteration-count: infinite;
animation-iteration-count: infinite; animation-direction: alternate;
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;
} }
#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 { #cpu.warning {
color: orange; color: orange;
} }
#cpu.critical { #cpu.critical {
color: red; color: red;
} }
#memory { #memory {
animation-timing-function: linear; animation-timing-function: linear;
animation-iteration-count: infinite; animation-iteration-count: infinite;
animation-direction: alternate; animation-direction: alternate;
} }
#memory.warning { #memory.warning {
color: orange; color: orange;
} }
#memory.critical { #memory.critical {
color: red; color: red;
animation-name: blink-critical; animation-name: blink-critical;
animation-duration: 2s; animation-duration: 2s;
padding-left:5px; padding-left:5px;
padding-right:5px; padding-right:5px;
} }
#mode { #mode {
background: @highlight; background: @highlight;
border-bottom: 3px transparent; border-bottom: 3px transparent;
color:white; color:white;
margin-left: 5px; margin-left: 5px;
padding:7; padding:7;
}
#network.disconnected {
color: orange;
} }
#pulseaudio{ #network.disconnected {
padding-top:6px; color: orange;
} }
#pulseaudio {
padding-top:6px;
}
#pulseaudio.muted { #pulseaudio.muted {
color: @highlight; color: @highlight;
} }
#temperature.critical { #temperature.critical {
color: red; color: red;
} }
#window { #window {
font-weight: bold; font-weight: bold;
} }
#workspaces{ #workspaces {
font-size:13px; font-size:13px;
} }
#workspaces button { #workspaces button {
border-bottom: 3px solid transparent; border-bottom: 3px solid transparent;
margin-bottom: 0px; margin-bottom: 0px;
padding:0px; padding:0px;
} }
#workspaces button.focused { #workspaces button.focused {
border-bottom: 3px solid @highlight; border-bottom: 3px solid @highlight;
margin-bottom: 1px; margin-bottom: 1px;
padding-left:0; padding-left:0;
} }
#workspaces button.urgent { #workspaces button.urgent {
border-color: #c9545d; border-color: #c9545d;
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;
} }
#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;
}

View File

@@ -7,13 +7,12 @@ Arc-Dark Color Scheme
@define-color base2 #40455; @define-color base2 #40455;
@define-color base3 #4b5160; @define-color base3 #4b5160;
*{ *{
font-family: UbuntuMono; font-family: UbuntuMono;
} }
window { window {
border: 1px solid @highlight; border: 1px solid @highlight;
} }
#input { #input {
@@ -26,7 +25,6 @@ window {
#inner-box { #inner-box {
background-color: @base3; background-color: @base3;
} }
#outer-box { #outer-box {
@@ -35,21 +33,15 @@ window {
background-color: @base2; background-color: @base2;
} }
#scroll {
}
#text { #text {
padding: 5px; padding: 5px;
color: white; color: white;
} }
#entry:nth-child(even){ #entry:nth-child(even) {
background-color: @base1; background-color: @base1;
} }
#entry:selected { #entry:selected {
background-color: @highlight; background-color: @highlight;
} }
#text:selected {
}

View File

@@ -7,38 +7,32 @@ Arc-Dark Color Scheme
@define-color base2 #40455; @define-color base2 #40455;
@define-color base3 #4b5160; @define-color base3 #4b5160;
*{ *{
font-family: UbuntuMono; font-family: UbuntuMono;
} }
#window { #window {
border: 1px solid @highlight; border: 1px solid @highlight;
margin: 0px 5px 0px 5px; margin: 0px 5px 0px 5px;
} }
#inner-box { #inner-box {
background-color: @base2; background-color: @base2;
} }
#outer-box { #outer-box {
margin: 5px; margin: 5px;
padding:10px; padding:10px;
background-color: @base2; background-color: @base2;
margin-top: -22px; margin-top: -22px;
}
#scroll {
} }
#text { #text {
padding: 5px; padding: 5px;
color: white; color: white;
} }
#entry:nth-child(even){ #entry:nth-child(even) {
background-color: @base1; background-color: @base1;
} }
@@ -49,6 +43,3 @@ color: white;
#entry:selected { #entry:selected {
background-color: @highlight; background-color: @highlight;
} }
#text:selected {
}