diff options
| -rw-r--r-- | .config/sway/anahita | 12 | ||||
| -rw-r--r-- | .config/sway/config | 10 | ||||
| -rw-r--r-- | .emacs.d/init.el | 1 | ||||
| -rwxr-xr-x | .local/bin/b-prompt | 12 | ||||
| -rwxr-xr-x | .local/bin/dmenu-light | 2 | ||||
| -rwxr-xr-x | .local/bin/dmenu-pavols | 2 |
6 files changed, 28 insertions, 11 deletions
diff --git a/.config/sway/anahita b/.config/sway/anahita index 7782d93..d47659a 100644 --- a/.config/sway/anahita +++ b/.config/sway/anahita @@ -16,12 +16,14 @@ input "0:0:Atmel_maXTouch_Touchpad" { input "0:0:Atmel_maXTouch_Touchscreen" events disabled -bindsym F7 exec light -A 5 bindsym F6 exec light -U 5 +bindsym F7 exec light -A 5 -bindsym F10 exec $sinkup -bindsym F9 exec $sinkdown bindsym F8 exec $sinkmute -bindsym $mod+F10 exec $sourceup -bindsym $mod+F9 exec $sourcedown +bindsym F9 exec $sinkdown +bindsym F10 exec $sinkup bindsym $mod+F8 exec $sourcemute +bindsym $mod+F9 exec $sourcedown +bindsym $mod+F10 exec $sourceup + +bindsym XF86Tools exec $lock diff --git a/.config/sway/config b/.config/sway/config index ba1cc60..0110d04 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -15,12 +15,13 @@ set $right l set $term foot set $menu dmenu_path | wmenu -f '$font' | xargs swaymsg exec -- +set $lock swaylock -f -c 000000 exec swayidle -w \ - timeout 600 'swaylock -f -c 000000' \ + timeout 600 '$lock' \ timeout 610 'swaymsg "output * power off"' \ resume 'swaymsg "output * power on"' \ - before-sleep 'swaylock -f -c 000000' + before-sleep '$lock' input * { repeat_delay 200 @@ -44,7 +45,7 @@ bindsym $mod+Shift+r restart set $mode_system System (l)ock | (e)xit sway | (s)uspend | (h)ibernate | (r)eboot | (S)hutdown mode "$mode_system" { - bindsym l exec swaylock -f -c 000000, mode "default" + bindsym l exec $lock, mode "default" bindsym e exec swaymsg exit, mode "default" bindsym s exec sudo pm-suspend, mode "default" # bindsym h exec systemctl hibernate, mode "default" @@ -205,7 +206,8 @@ for_window [app_id="^[Ff]irefox.*" title="Sharing Indicator"] \ exec mako >/tmp/mako.log 2>&1 exec dbus-update-activation-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK exec gsettings set 'org.gnome.desktop.interface' cursor-theme 'DMZ-White' +# exec gsettings set 'org.gnome.desktop.interface' font-name 'Sans 10' exec b-pacify -exec [ -x "$(command -v nm-applet)" ] && nm-applet +exec [ -x "$(command -v nm-applet)" ] && nm-applet --indicator include ~/.config/sway/"$(hostname)" diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 5a9cdd3..65cb9fe 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -305,6 +305,7 @@ plain variables. This means that `setopt' will execute any (let ((grey "#e7e7e7")) (set-face-attribute 'default nil :font "Source Code Pro" + :height 105 ; 113 :weight 'medium) (set-face-attribute 'fixed-pitch nil :font "Source Code Pro" diff --git a/.local/bin/b-prompt b/.local/bin/b-prompt new file mode 100755 index 0000000..2f98e59 --- /dev/null +++ b/.local/bin/b-prompt @@ -0,0 +1,12 @@ +#!/bin/sh + +# $1: newline-separated choices +# $2: prompt string + +if [ "$WAYLAND_DISPLAY" ]; then + menu_font='Source Code Pro Medium 10.5' + printf "$1" | wmenu -i -p "$2" -f "$menu_font" +else + menu_font='Source Code Pro Medium-10.5' + printf "$1" | dmenu -i -p "$2" -fn "$menu_font" +fi diff --git a/.local/bin/dmenu-light b/.local/bin/dmenu-light index 614281c..8c46f0f 100755 --- a/.local/bin/dmenu-light +++ b/.local/bin/dmenu-light @@ -1,4 +1,4 @@ #!/bin/sh cur=$(light -G) -val=$(dmenu -fn 'Source Code Pro Medium-10.5' -p "brightness ($cur):" < /dev/null) +val=$(b-prompt '' "brightness ($cur):") [ -n "$val" ] && light -S "$val" diff --git a/.local/bin/dmenu-pavols b/.local/bin/dmenu-pavols index 0b840ad..c30bdf8 100755 --- a/.local/bin/dmenu-pavols +++ b/.local/bin/dmenu-pavols @@ -1,4 +1,4 @@ #!/bin/sh cur=$(pactl get-sink-volume @DEFAULT_SINK@ | grep -Po '\d+(?=%)' | head -n1) -val=$(dmenu -fn 'Source Code Pro Medium-10.5' -p "volume ($cur):" < /dev/null) +val=$(b-prompt '' "volume ($cur):") [ -n "$val" ] && pactl set-sink-volume @DEFAULT_SINK@ "${val}%" |