commit f5a330ad342e5ff7856b452660a6f456509c14cd
parent 0741e675075eb07aa0aee4f62901ccf89008e6c4
Author: Shimmy Xu <shimmy.xu@shimmy1996.com>
Date: Mon, 21 Jan 2019 08:53:42 -0500
Merge branch 'master' of ssh://git.shimmy1996.com:4869/shimmy1996/dotfiles
Diffstat:
6 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/.config/mako/config b/.config/mako/config
@@ -4,3 +4,4 @@ border-size=2
default-timeout=10000
font=Iosevka SS09 12
max-visible=10
+height=500
diff --git a/.config/mpd/playlists/.gitkeep b/.config/mpd/playlists/.gitkeep
diff --git a/.config/sway/config b/.config/sway/config
@@ -100,6 +100,11 @@ client.background $base07
bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume 0 -5% && pkill -RTMIN+10 i3blocks
bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute 0 toggle && pkill -RTMIN+10 i3blocks
+ # music control
+ bindsym XF86AudioPlay exec --no-startup-id mpc toggle && pkill -RTMIN+12 i3blocks
+ bindsym XF86AudioPrev exec --no-startup-id mpc prev && pkill -RTMIN+12 i3blocks
+ bindsym XF86AudioNext exec --no-startup-id mpc next && pkill -RTMIN+12 i3blocks
+
# emoji and unicode character picker
bindsym $mod+u exec rofimoji
bindsym $mod+Shift+u exec unipicker --command "rofi -dmenu" --copy
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@
# Git files.
!.gitignore
!.README.org
+!**.gitkeep
# Config files.
!.config
@@ -20,6 +21,7 @@
!.config/tbsm
!.config/tbsm/tbsm.conf
!.config/mpd
+!.config/mpd/playlists
!.config/mpd/mpd.conf
!.config/rofi
!.config/rofi-pass
diff --git a/.local/bin/i3blocks/music b/.local/bin/i3blocks/music
@@ -7,8 +7,8 @@ filter() {
case $BLOCK_BUTTON in
1) mpc status | filter && setsid "$TERMINAL" -e ncmpcpp & ;; # left click, bring up player
- 2) mpc toggle | filter ;; # left click, nothing
- 3) mpc status | filter && pgrep -x dunst >/dev/null && notify-send "<b>🎵 Music module:</b>
+ 2) mpc toggle | filter ;; # left click, nothing && pgrep -x dunst >/dev/null
+ 3) mpc status | filter && notify-send "🎵 Music module:
- Shows mpd song playing.
- Italic when paused.
- Left click opens ncmpcpp.
diff --git a/.profile b/.profile
@@ -14,12 +14,7 @@ export QT_IM_MODULE=fcitx
export GTK_IM_MODULE=fcitx
# Preferred applications
-if [[ `hostname` == "bluebear" ]]; then
- # Wayland fix.
- export TERMINAL=env WINIT_HIDPI_FACTOR=1.0 WAYLAND_DISPLAY= alacritty
-else
- export TERMINAL=alacritty
-fi
+export TERMINAL="alacritty"
export BROWSER="firefox"
export EDITOR="emacsclient"
export VISUAL="emacsclient"