1
0
Fork 0

Update sway configuration, bump yadm files

main
Ambrose Chua 2020-03-30 23:10:50 +08:00
parent 3f361a8749
commit 18eec91a72
Signed by: ambrose
GPG Key ID: BC367D33F140B5C2
13 changed files with 666 additions and 37 deletions

View File

@ -1,7 +1,3 @@
# Default config for sway
#
# Copy this to ~/.config/sway/config and edit it to your liking.
#
# Read `man 5 sway` for a complete reference.
### Variables
@ -16,20 +12,44 @@ set $right l
# Your preferred terminal emulator
set $term kitty --single-instance -d ~
# Your preferred application launcher
set $menu dmenu_run -nb '#202020' -nf '#93a1a1' -sb '#cb4b16' -sf '#eee8d5' -fn 'IBM Plex Sans:bold:pixelsize=18'
set $menu ~/.local/bin/wofi_run
### Output configuration
#
# Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/)
#output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill
output * bg ~/.wallpaper/dark.png tile
#output * bg ~/.wallpaper/default.jpg fill
# Default wallpaper
#output * bg ~/.wallpaper/dark.png tile
#output * bg ~/.wallpaper/light.png tile
output * bg ~/.wallpaper/default.jpg fill
#
# Example configuration:
#
# output HDMI-A-1 resolution 1920x1080 position 1920,0
#
# You can get the names of your outputs by running: swaymsg -t get_outputs
#output eDP-1 scale 1 position 4000 0
#output DP-4 position 1440 -540
#output DP-1 position 0 0
### Idle configuration
#
# Example configuration:
#
# exec swayidle -w \
# timeout 300 'swaylock -f -c 000000' \
# timeout 600 'swaymsg "output * dpms off"' \
# resume 'swaymsg "output * dpms on"' \
# before-sleep 'swaylock -f -c 000000'
#
# This will lock your screen after 300 seconds of inactivity, then turn off
# your displays after another 300 seconds, and turn your screens back on when
# resumed. It will also lock your screen before your computer goes to sleep.
exec swayidle -w \
timeout 1140 'swaymsg "output * dpms off"' \
resume 'swaymsg "output * dpms on"' \
timeout 1200 'swaylock -f --color 000000 --font "IBM Plex Sans" --image ~/.wallpaper/default.jpg' \
before-sleep 'swaylock -f --color 000000 --font "IBM Plex Sans" --image ~/.wallpaper/default.jpg' \
timeout 3600 'systemctl hybrid-sleep'
bindsym $mod+Pause exec swaylock -f --color 000000 --font "IBM Plex Sans" --image ~/.wallpaper/default.jpg
### Input configuration
#
@ -159,7 +179,7 @@ input type:touchpad {
bindsym $mod+space focus mode_toggle
# move focus to the parent container
#bindsym $mod+a focus parent
bindsym $mod+a focus parent
#
# Scratchpad:
#
@ -197,12 +217,6 @@ mode "resize" {
}
bindsym $mod+r mode "resize"
#
# Custom largegaps mode
#
bindsym $mod+g gaps inner current set 36, gaps outer current set 60
bindsym $mod+Shift+g gaps inner current set 12, gaps outer current set 20
#
# Status Bar:
#
@ -218,9 +232,10 @@ bar {
inactive_workspace #202020dd #202020dd #999999
urgent_workspace #dc322fdd #dc322fdd #eee8d5
}
status_command exec sway_status
swaybar_command waybar
}
### Customisations
#
# Colors:
#
@ -228,14 +243,12 @@ client.focused #202020 #202020 #999999 #cb4b16 #cb4b16bb
client.focused_inactive #202020 #202020 #999999 #cb4b1699 #cb4b16bb
client.unfocused #202020dd #202020dd #999999 #cb4b1699 #cb4b1600
client.urgent #202020 #dc322f #fdf6e3 #cb4b1699 #cb4b1600
#
# Fonts:
#
font pango:IBM Plex Sans bold 11
#
# WE LOVE GAPS:
# Gaps:
#
default_border pixel 2
default_floating_border pixel 2
@ -244,19 +257,23 @@ hide_edge_borders smart
smart_gaps on
gaps inner 12
gaps outer 20
# Toggle large gaps
bindsym $mod+g gaps inner current set 36, gaps outer current set 60
bindsym $mod+Shift+g gaps inner current set 12, gaps outer current set 20
### Fixes
#
# Force Xresources load
# Force Xresources load:
#
exec xrdb -merge .Xresources
#
# Enable PolicyKit:
#
exec lxpolkit
#
# Monitor Layout:
#
output eDP-1 scale 1 pos 4000 0
#output DP-4 pos 1440 -540
#output DP-1 pos 0 0
#include /etc/sway/config.d/*
### Setup-specific configuration
#
# Enables custom monitor layouts on other desktop environments
include ~/.config/sway/enabled/*
# vim: ai ts=4 sw=4 et

7
.config/sway/enable Executable file
View File

@ -0,0 +1,7 @@
#!/bin/sh
rm -f enabled/*
for name in "$@"; do
ln -s ../$name enabled/$name
done

54
.config/sway/triple Normal file
View File

@ -0,0 +1,54 @@
#
# Wallpaper configuration
#
output "Philips Consumer Electronics Company Philips 19B4 UK51344100785" bg ~/.wallpaper/wallpaper-aux.png center
output "Dell Inc. DELL P2719H DNJQPS2" bg ~/.wallpaper/wallpaper-right.png center
output "Dell Inc. DELL P2719H 974YPS2" bg ~/.wallpaper/wallpaper-left.png center
#
# Output configuration
#
default_orientation vertical
output "Philips Consumer Electronics Company Philips 19B4 UK51344100785" position 2160 800 transform 270
output "Dell Inc. DELL P2719H DNJQPS2" position 1080 0 transform 90
output "Dell Inc. DELL P2719H 974YPS2" position 0 0 transform 270
#
# Magic source switch
#
mode "monitor" {
# --nodetect increases performance only when --bus is used
# switch the left display to DisplayPort
#bindsym F1 exec ddcutil --sn 974YPS2 --async --nousb --noverify setvcp 60 0x0f
bindsym F1 exec ddcutil --bus 6 --nodetect --noverify setvcp D6 0x01 && ddcutil --bus 6 --nodetect --noverify setvcp 60 0x0f
# switch the left display to VGA
#bindsym Shift+F1 exec ddcutil --sn 974YPS2 --async --nousb --noverify setvcp 60 0x01
bindsym F3 exec ddcutil --bus 6 --nodetect --noverify setvcp D6 0x01 && ddcutil --bus 6 --nodetect --noverify setvcp 60 0x01
# switch the right display to DisplayPort
#bindsym F2 exec ddcutil --sn DNJQPS2 --async --nousb --noverify setvcp 60 0x0f
bindsym F2 exec ddcutil --bus 5 --nodetect --noverify setvcp D6 0x01 && ddcutil --bus 5 --nodetect --noverify setvcp 60 0x0f
# switch the right display to VGA
#bindsym Shift+F2 exec ddcutil --sn DNJQPS2 --async --nousb --noverify setvcp 60 0x01
bindsym F4 exec ddcutil --bus 5 --nodetect --noverify setvcp D6 0x01 && ddcutil --bus 5 --nodetect --noverify setvcp 60 0x01
# switch both displays to DisplayPort
bindsym F5 exec (ddcutil --bus 5 --nodetect --noverify setvcp D6 0x01 && ddcutil --bus 5 --nodetect --noverify setvcp 60 0x0f) & (ddcutil --bus 6 --nodetect --noverify setvcp D6 0x01 && ddcutil --bus 6 --nodetect --noverify setvcp 60 0x0f)
# switch both displays to VGA
bindsym F6 exec (ddcutil --bus 5 --nodetect --noverify setvcp D6 0x01 && ddcutil --bus 5 --nodetect --noverify setvcp 60 0x01) & (ddcutil --bus 6 --nodetect --noverify setvcp D6 0x01 && ddcutil --bus 6 --nodetect --noverify setvcp 60 0x01)
# return to default mode
bindsym Scroll_Lock mode "default"
}
bindsym Scroll_Lock mode "monitor"
#
# Media controls
#
bindsym XF86AudioRaiseVolume exec "pactl set-sink-volume 0 +2%"
bindsym XF86AudioLowerVolume exec "pactl set-sink-volume 0 -2%"
bindsym XF86AudioMute exec "pactl set-sink-mute 0 toggle"
bindsym $mod+p exec "dbus-send --bus=unix:path=/run/user/1000/bus --print-reply --dest=org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.PlayPause"
# vim: ai ts=4 sw=4 et

149
.config/waybar/config Normal file
View File

@ -0,0 +1,149 @@
{
"layer": "top", // Waybar at top layer
// "position": "bottom", // Waybar position (top|bottom|left|right)
"height": 26, // Waybar height (to be removed for auto height)
// "width": 1280, // Waybar width
// Choose the order of the modules
"modules-left": ["sway/workspaces", "sway/mode", "custom/media"],
"modules-center": ["sway/window"],
"modules-right": ["pulseaudio", "idle_inhibitor", "network", "cpu", "memory", "temperature", "backlight", "clock", "tray"],
// Modules configuration
// "sway/workspaces": {
// "disable-scroll": true,
// "all-outputs": true,
// "format": "{name}: {icon}",
// "format-icons": {
// "1": "",
// "2": "",
// "3": "",
// "4": "",
// "5": "",
// "urgent": "",
// "focused": "",
// "default": ""
// }
// },
"sway/mode": {
"format": "<span style=\"italic\">{}</span>"
},
"mpd": {
"format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ",
"format-disconnected": "Disconnected ",
"format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ",
"unknown-tag": "N/A",
"interval": 2,
"consume-icons": {
"on": " "
},
"random-icons": {
"off": "<span color=\"#f53c3c\"></span> ",
"on": " "
},
"repeat-icons": {
"on": " "
},
"single-icons": {
"on": "1 "
},
"state-icons": {
"paused": "",
"playing": ""
},
"tooltip-format": "MPD (connected)",
"tooltip-format-disconnected": "MPD (disconnected)"
},
"idle_inhibitor": {
"format": "{icon}",
"format-icons": {
"activated": "",
"deactivated": ""
}
},
"tray": {
// "icon-size": 21,
"spacing": 10
},
"clock": {
// "timezone": "America/New_York",
"tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
"format-alt": "{:%Y-%m-%d}"
},
"cpu": {
"format": "{usage}% ",
"format-alt": "{usage}%"
},
"memory": {
"format": "{}% ",
"format-alt": "{}%"
},
"temperature": {
// "thermal-zone": 2,
// "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
"critical-threshold": 80,
// "format-critical": "{temperatureC}°C {icon}",
"format": "{temperatureC}°C {icon}",
"format-icons": ["", "", ""],
"format-alt": "{temperatureC}°C"
},
"backlight": {
// "device": "acpi_video1",
"format": "{percent}% {icon}",
"format-icons": ["", ""]
},
"battery": {
"states": {
// "good": 95,
"warning": 30,
"critical": 15
},
"format": "{capacity}% {icon}",
"format-charging": "{capacity}% ",
"format-plugged": "{capacity}% ",
"format-alt": "{time} {icon}",
// "format-good": "", // An empty format will hide the module
// "format-full": "",
"format-icons": ["", "", "", "", ""]
},
"battery#bat2": {
"bat": "BAT2"
},
"network": {
// "interface": "wlp2*", // (Optional) To force the use of this interface
"format-wifi": "{essid} ({signalStrength}%) ",
"format-ethernet": "{ifname}: {ipaddr}/{cidr} ",
"format-linked": "{ifname} (No IP) ",
"format-disconnected": "Disconnected ⚠",
"format-alt": "{ipaddr}"
},
"pulseaudio": {
// "scroll-step": 1, // %, can be a float
"format": "{volume}% {icon} {format_source}",
"format-bluetooth": "{volume}% {icon} {format_source}",
"format-bluetooth-muted": " {icon} {format_source}",
"format-muted": "muted  {format_source}",
"format-source": "",
"format-source-muted": "",
"format-icons": {
"headphone": "",
"hands-free": "",
"headset": "",
"phone": "",
"portable": "",
"car": "",
"default": ["", "", ""]
},
"on-click": "XDG_CURRENT_DESKTOP=GNOME gnome-control-center sound"
},
"custom/media": {
"format": "{icon} {}",
"return-type": "json",
"max-length": 30,
"format-icons": {
"spotify": "",
"default": "🎜"
},
"escape": true,
"exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder
// "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name
}
}

129
.config/waybar/mediaplayer.py Executable file
View File

@ -0,0 +1,129 @@
#!/usr/bin/env python3
import argparse
import logging
import sys
import signal
import gi
import json
gi.require_version('Playerctl', '2.0')
from gi.repository import Playerctl, GLib
logger = logging.getLogger(__name__)
def write_output(text, player):
logger.info('Writing output')
output = {'text': text,
'class': 'custom-' + player.props.player_name,
'alt': player.props.player_name}
sys.stdout.write(json.dumps(output) + '\n')
sys.stdout.flush()
def on_play(player, status, manager):
logger.info('Received new playback status')
on_metadata(player, player.props.metadata, manager)
def on_metadata(player, metadata, manager):
logger.info('Received new metadata')
track_info = ''
if player.props.player_name == 'spotify' and \
'mpris:trackid' in metadata.keys() and \
':ad:' in player.props.metadata['mpris:trackid']:
track_info = 'AD PLAYING'
elif player.get_artist() != '' and player.get_title() != '':
track_info = '{artist} - {title}'.format(artist=player.get_artist(),
title=player.get_title())
else:
track_info = player.get_title()
if player.props.status != 'Playing' and track_info:
track_info = '' + track_info
write_output(track_info, player)
def on_player_appeared(manager, player, selected_player=None):
if player is not None and (selected_player is None or player.name == selected_player):
init_player(manager, player)
else:
logger.debug("New player appeared, but it's not the selected player, skipping")
def on_player_vanished(manager, player):
logger.info('Player has vanished')
sys.stdout.write('\n')
sys.stdout.flush()
def init_player(manager, name):
logger.debug('Initialize player: {player}'.format(player=name.name))
player = Playerctl.Player.new_from_name(name)
player.connect('playback-status', on_play, manager)
player.connect('metadata', on_metadata, manager)
manager.manage_player(player)
on_metadata(player, player.props.metadata, manager)
def signal_handler(sig, frame):
logger.debug('Received signal to stop, exiting')
sys.stdout.write('\n')
sys.stdout.flush()
# loop.quit()
sys.exit(0)
def parse_arguments():
parser = argparse.ArgumentParser()
# Increase verbosity with every occurence of -v
parser.add_argument('-v', '--verbose', action='count', default=0)
# Define for which player we're listening
parser.add_argument('--player')
return parser.parse_args()
def main():
arguments = parse_arguments()
# Initialize logging
logging.basicConfig(stream=sys.stderr, level=logging.DEBUG,
format='%(name)s %(levelname)s %(message)s')
# Logging is set by default to WARN and higher.
# With every occurrence of -v it's lowered by one
logger.setLevel(max((3 - arguments.verbose) * 10, 0))
# Log the sent command line arguments
logger.debug('Arguments received {}'.format(vars(arguments)))
manager = Playerctl.PlayerManager()
loop = GLib.MainLoop()
manager.connect('name-appeared', lambda *args: on_player_appeared(*args, arguments.player))
manager.connect('player-vanished', on_player_vanished)
signal.signal(signal.SIGINT, signal_handler)
signal.signal(signal.SIGTERM, signal_handler)
for player in manager.props.player_names:
if arguments.player is not None and arguments.player != player.name:
logger.debug('{player} is not the filtered player, skipping it'
.format(player=player.name)
)
continue
init_player(manager, player)
loop.run()
if __name__ == '__main__':
main()
# vim: set et ts=4 sw=4:

205
.config/waybar/style.css Normal file
View File

@ -0,0 +1,205 @@
* {
border: none;
border-radius: 0;
/* `otf-font-awesome` is required to be installed for icons */
font-family: "IBM Plex Sans";
font-size: 13px;
min-height: 0;
}
window#waybar {
background-color: rgba(43, 48, 59, 0.5);
border-bottom: 3px solid rgba(100, 114, 125, 0.5);
color: #ffffff;
transition-property: background-color;
transition-duration: .5s;
}
window#waybar.hidden {
opacity: 0.2;
}
/*
window#waybar.empty {
background-color: transparent;
}
window#waybar.solo {
background-color: #FFFFFF;
}
*/
window#waybar.termite {
background-color: #3F3F3F;
}
window#waybar.chromium {
background-color: #000000;
border: none;
}
#workspaces button {
padding: 0 5px;
background-color: transparent;
color: #ffffff;
border-bottom: 3px solid transparent;
}
/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
#workspaces button:hover {
background: rgba(0, 0, 0, 0.2);
box-shadow: inherit;
border-bottom: 3px solid #ffffff;
}
#workspaces button.focused {
background-color: #64727D;
border-bottom: 3px solid #ffffff;
}
#workspaces button.urgent {
background-color: #eb4d4b;
}
#mode {
background-color: #64727D;
border-bottom: 3px solid #ffffff;
}
#window {
}
#clock,
#battery,
#cpu,
#memory,
#temperature,
#backlight,
#network,
#pulseaudio,
#custom-media,
#tray,
#mode,
#idle_inhibitor,
#mpd {
padding: 0 10px;
margin: 0 4px;
color: #ffffff;
}
#clock {
background-color: #64727D;
}
#battery {
background-color: #ffffff;
color: #000000;
}
#battery.charging {
color: #ffffff;
background-color: #26A65B;
}
@keyframes blink {
to {
background-color: #ffffff;
color: #000000;
}
}
#battery.critical:not(.charging) {
background-color: #f53c3c;
color: #ffffff;
animation-name: blink;
animation-duration: 0.5s;
animation-timing-function: linear;
animation-iteration-count: infinite;
animation-direction: alternate;
}
label:focus {
background-color: #000000;
}
#cpu {
background-color: #2ecc71;
color: #000000;
}
#memory {
background-color: #9b59b6;
}
#backlight {
background-color: #90b1b1;
}
#network {
background-color: #2980b9;
}
#network.disconnected {
background-color: #f53c3c;
}
#pulseaudio {
background-color: #f1c40f;
color: #000000;
}
#pulseaudio.muted {
background-color: #90b1b1;
color: #2a5c45;
}
#custom-media {
background-color: #66cc99;
color: #2a5c45;
min-width: 100px;
}
#custom-media.custom-spotify {
background-color: #66cc99;
}
#custom-media.custom-vlc {
background-color: #ffa000;
}
#temperature {
background-color: #f0932b;
}
#temperature.critical {
background-color: #eb4d4b;
}
#tray {
background-color: #2980b9;
}
#idle_inhibitor {
background-color: #2d3436;
}
#idle_inhibitor.activated {
background-color: #ecf0f1;
color: #2d3436;
}
#mpd {
background-color: #66cc99;
color: #2a5c45;
}
#mpd.disconnected {
background-color: #f53c3c;
}
#mpd.stopped {
background-color: #90b1b1;
}
#mpd.paused {
background-color: #51a37a;
}

54
.config/wofi/style.css Normal file
View File

@ -0,0 +1,54 @@
#window {
border: none;
background: rgba(32, 32, 32, 0.875);
color: #999;
}
#input {
padding: 8px 12px;
border-radius: 0;
border: none;
background: rgba(32, 32, 32, 0);
color: #fff;
}
#input:focus {
border: none;
}
.entry#selected,
.entry#unselected {
padding: 8px 12px;
}
#selected,
row > #selected {
background: rgba(203, 75, 22, 0.73);
text: #fff;
}
#unselected,
row > #unselected {
background: none;
text: #fff;
}
flowboxchild {
padding: 0;
}
flowboxchild:focus,
flowboxchild:selected,
row:focus,
row:selected {
outline: none;
background: none;
border-radius: 0;
}
list {
background: rgba(32, 32, 32, 0.875);
color: #999;
}
list * {
padding: 0;
margin: 0;
}

9
.local/bin/wg0-toggle Executable file
View File

@ -0,0 +1,9 @@
#!/bin/sh
if ip link show wg0 2> /dev/null > /dev/null; then
echo "wg-quick down wg0"
pkexec wg-quick down wg0
else
echo "wg-quick up wg0"
pkexec wg-quick up wg0
fi

5
.local/bin/wofi_run Executable file
View File

@ -0,0 +1,5 @@
#!/bin/zsh
export PATH="$PATH:$HOME/.local/bin"
wofi --normal-window --show drun

View File

@ -1,12 +1,12 @@
#!/bin/sh
export NEOVIM_VERSION=0.3.4
export NEOVIM_VERSION=0.4.3
export GOLANG_VERSION=1.13.1
export GOLANG_VERSION=1.14.1
export GOLANG_HASH=81f154e69544b9fa92b1475ff5f11e64270260d46e7e36c34aafc8bc96209358
export NODE_VERSION=10.15.0
export YARN_VERSION=1.13.0
export NODE_VERSION=12.16.1
export YARN_VERSION=1.22.4
export JDK_NUMBER=14
export JDK_VERSION=15
@ -16,16 +16,16 @@ export VIM_PLUG_VERSION=0.10.0
export PURE_VERSION=1.11.0
export YADM_VERSION=1.12.0
export YADM_VERSION=2.4.0
export ZSH_AUTOSUGGESTIONS_VERSION=0.6.3
export ZSH_SYNTAX_HIGHLIGHTING_VERSION=0.6.0
export ZSH_AUTOSUGGESTIONS_VERSION=0.6.4
export ZSH_SYNTAX_HIGHLIGHTING_VERSION=0.7.1
export CADDY_VERSION=1.0.3
export JQ_VERSION=1.6
export KUBECTL_VERSION=1.16.0
export KUBECTL_VERSION=1.18.0
export DUST_VERSION=0.3.1