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,7 +28,7 @@ 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
# #
@@ -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

@@ -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": [ // If height property would be not present, it'd be calculated dynamically
"custom/launcher", "height": 30,
"sway/workspaces", "width" : 10,
"sway/mode",
],
"modules-center": [ "modules-left": [
], "custom/launcher",
"sway/workspaces",
"sway/mode",
],
"modules-right": [ "modules-center": [
"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 "modules-right": [
"network",
"idle_inhibitor",
"memory",
"cpu",
"pulseaudio",
"custom/keyboard-layout",
"battery",
//"custom/PBPbattery",
"backlight#icon",
"backlight#value",
"clock",
"tray",
"custom/weather",
"custom/power",
],
// Modules
"idle_inhibitor": { "idle_inhibitor": {
"format": "{icon} ", "format": "{icon} ",
"format-icons":{ "format-icons":{
"activated": "", "activated": "",
"deactivated": "" "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": ["", "", "", "", ""]
},
"battery": { "custom/PBPbattery": {
"states": { "exec": "~/.config/waybar/scripts/PBPbattery.sh",
// "good": 95, "format": "{}",
"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": { "clock": {
"exec": "~/.config/waybar/scripts/PBPbattery.sh", "interval": 10,
"format": "{}", "format-alt": " {:%e %b %Y}", // Icon: calendar-alt
}, "format": "{:%H:%M}",
"tooltip-format": "{:%e %B %Y}"
},
"cpu": {
"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
"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": { "pulseaudio": {
"exec": "~/.config/waybar/scripts/weather.sh", "scroll-step": 1, // %, can be a float
"format": "{text} {icon}", "format": "{volume}% {icon}",
"return-type": "json", "format-bluetooth": "{volume}% {icon}  {format_source}",
"interval": 600, "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}" "tooltip-format": "{tooltip}"
}, },
"tray": { "tray": {
"icon-size": 18, "icon-size": 18,
"spacing":10, "spacing":10,
}, },
"backlight#icon": { "backlight#icon": {
"format": "{icon}", "format": "{icon}",
"format-icons": [""], "format-icons": [""],
"on-scroll-down": "brightnessctl -c backlight set 1%-", "on-scroll-down": "brightnessctl -c backlight set 1%-",
"on-scroll-up": "brightnessctl -c backlight set +1%" "on-scroll-up": "brightnessctl -c backlight set +1%"
}, },
"backlight#value" :{ "backlight#value" :{
"format": "{percent}%", "format": "{percent}%",
"on-scroll-down": "brightnessctl -c backlight set 1%-", "on-scroll-down": "brightnessctl -c backlight set 1%-",
"on-scroll-up": "brightnessctl -c backlight set +1%" "on-scroll-up": "brightnessctl -c backlight set +1%"
},
}, "custom/firefox": {
"format": " ",
"on-click": "exec firefox",
"tooltip": false
},
"custom/firefox": { "custom/terminal": {
"format": " ", "format": " ",
"on-click": "exec firefox", "on-click": "exec alacritty",
"tooltip": false "tooltip": false
}, },
"custom/terminal": { "custom/files": {
"format": " ", "format": " ",
"on-click": "exec alacritty", "on-click": "exec thunar",
"tooltip": false "tooltip": false
}, },
"custom/files": { "custom/launcher": {
"format": " ", "format":" ",
"on-click": "exec thunar", "on-click": "exec wofi -c ~/.config/wofi/config -I",
"tooltip": false "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/power": {
"format":"⏻",
"on-click": "exec ~/.config/waybar/scripts/power-menu.sh",
"tooltip": false,
},
} }

View File

@@ -9,15 +9,13 @@
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
* 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;
@@ -40,7 +38,6 @@ Arc-Dark Color Scheme
} }
} }
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
* Base styles * Base styles
* -------------------------------------------------------------------------- */ * -------------------------------------------------------------------------- */
@@ -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,70 +74,63 @@ 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 { #battery.warning {
color: orange; color: orange;
} }
#battery.critical { #battery.critical {
color: red; color: red;
} }
#battery.warning.discharging { #battery.warning.discharging {
animation-name: blink-warning; animation-name: blink-warning;
animation-duration: 3s; animation-duration: 3s;
} }
#battery.critical.discharging { #battery.critical.discharging {
animation-name: blink-critical; animation-name: blink-critical;
animation-duration: 2s; animation-duration: 2s;
} }
#cpu{
}
#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 {
@@ -149,62 +139,62 @@ Arc-Dark Color Scheme
color:white; color:white;
margin-left: 5px; margin-left: 5px;
padding:7; padding:7;
} }
#network.disconnected { #network.disconnected {
color: orange; color: orange;
} }
#pulseaudio{ #pulseaudio {
padding-top:6px; 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{ #custom-power {
margin-left:15px; margin-left:15px;
margin-right:15px; margin-right:15px;
font-size:15px; font-size:15px;
}
#custom-launcher{
font-size:15px;
margin-left:15px;
margin-right:10px;
}
#backlight.icon{
padding-right:1px;
font-size: 13px;
} }
#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 {
}