commit 54d8e089f213cb035f00f0882590d10404fa0d3e
parent 861ac88a6a51ca8b865efd4086daa35d9aed4af0
Author: Ryan Jeffrey <ryan@ryanmj.xyz>
Date: Fri, 2 Oct 2020 20:25:29 -0700
new sxhkd keys and polybar mods
Diffstat:
5 files changed, 53 insertions(+), 49 deletions(-)
diff --git a/.config/polybar/config b/.config/polybar/config
@@ -22,10 +22,10 @@ background = ${xrdb:background}
;background = #aa000
;background-alt = #444
-;background = ${xrdb:color0:#222}
-background-alt = ${xrdb:color0:#222}
+;background = #aaa
+background-alt = #222
foreground = #fff
-foreground-alt = #bbb
+foreground-alt = #fff
primary = ${xrdb:color1:#222}
secondary = ${xrdb:color2:#222}
alert = ${xrdb:color3:#222}
@@ -152,7 +152,7 @@ ws-icon-default = ♟
; Default: %name%
label-monitor = %name%
-label-focused = %icon%
+label-focused = %name%
label-focused-background = ${colors.background-alt}
label-focused-underline= ${colors.primary}
label-focused-padding = 2
@@ -242,7 +242,7 @@ label-urgent-padding = 2
[module/mpd]
type = internal/mpd
-format-online = <label-song>
+format-online = <bar-progress> <label-song>
format-online-prefix = "🎵 "
format-online-underline = ${colors.foreground-alt}
@@ -257,6 +257,12 @@ label-song-ellipsis = true
label-song = %title%
+
+bar-progress-width = 10
+bar-progress-indicator = |
+bar-progress-fill = -
+bar-progress-empty = -
+
[module/xbacklight]
type = internal/xbacklight
diff --git a/.config/sxhkd/sxhkdrc b/.config/sxhkd/sxhkdrc
@@ -19,29 +19,33 @@ super + Escape
#
# quit/restart bspwm
-super + shift + r
- bspc wm -r
-
-super + alt + e
- bspc quit
+super + shift + {e,r}
+ bspc {quit,wm -r}
# close and kill
-super + shift + q
- bspc node -c
+super + {shift + , alt + shift + }q
+ bspc node -{c,k}
# alternate between the tiled and monocle layout
-super + m
- bspc desktop -f '^9' && emacsclient -c -e '(mu4e)'
+super + s
+ bspc desktop -l next
-super + e
- nemo
+# music
+super + y
+ bspc desktop -f '^8' && (pgrep >/dev/null ncmpcpp || st -e zsh -ic ncmpcpp)
-# send the newest marked node to the newest preselected node
-# super + y
-# bspc node newest.marked.local -n newest.!automatic.local
+super + p
+ mpc toggle
-super + y
- bspc desktop -f '^8' && st -e zsh -ic ncmpcpp
+super + n
+ mpc next
+
+super + l
+ mpc prev
+
+# send the newest marked node to the newest preselected node
+#super + y
+# bspc node newest.marked.local -n newest.!automatic.local
# swap the current node and the biggest window
super + g
@@ -52,8 +56,8 @@ super + g
#
# set the window state
-super + {t,shift + t,shift + space,f}
- bspc node -t {tiled,pseudo_tiled,floating,fullscreen}
+super + {t,shift + t,shift + @space,f}
+ xdo above -t $(xdo id -n root) $(xdo id -n polybar) && bspc node -t {tiled,pseudo_tiled,'~floating','~fullscreen'}
# set the node flags
super + ctrl + {m,x,y,z}
@@ -64,16 +68,16 @@ super + ctrl + {m,x,y,z}
#
# focus the node in the given direction
-super + {_,shift + }{h,j,k,l}
+super + {_,shift + }{Left,Down,Up,Right}
bspc node -{f,s} {west,south,north,east}
# focus the node for the given path jump
-super + {p,b,comma,period}
- bspc node -f @{parent,brother,first,second}
+#super + {p,b,comma,period}
+# bspc node -f @{parent,brother,first,second}
# focus the next/previous window in the current desktop
-super + {_,shift + }c
- bspc node -f {next,prev}.local.!hidden.window
+#super + {_,shift + }c
+# bspc node -f {next,prev}.local.!hidden.window
# focus the next/previous desktop in the current monitor
super + bracket{left,right}
@@ -84,21 +88,15 @@ super + {grave,Tab}
bspc {node,desktop} -f last
# focus the older or newer node in the focus history
-# TODO
-# super + {o,i}
-# bspc wm -h off; \
-# bspc node {older,newer} -f; \
-# bspc wm -h on
-
-
+super + {o,i}
+ bspc wm -h off; \
+ bspc node {older,newer} -f; \
+ bspc wm -h on
# focus or send to the given desktop
-super + {_,shift + }{1_-9,0}
+super + {_,shift + }{1-9,0}
bspc {desktop -f,node -d} '^{1-9,10}'
-super + {1-9,0}
- bspc desktop -f '^{1-9,10}'
-
#
# preselect
#
@@ -129,8 +127,8 @@ super + alt + {h,j,k,l}
# contract a window by moving one of its side inward
super + alt + shift + {h,j,k,l}
- bspc node -z {right -20 0,top 0 20,bottom 0 -20,left 20 0}
+ bspc node -z {right -20 0,top 0 20,bottom 0 -20,left 20 0}
# move a floating window
super + {Left,Down,Up,Right}
- bspc node -v {-20 0,0 20,0 -20,20 0}
+ bspc node -v {-20 0,0 20,0 -20,20 0}
diff --git a/.config/systemd/user/emacs.service b/.config/systemd/user/emacs.service
@@ -4,8 +4,8 @@ Documentation=info:emacs man:emacs(1) https://gnu.org/software/emacs/
[Service]
Type=forking
-ExecStart=/usr/local/bin/emacs --daemon
-ExecStop=/usr/local/bin/emacsclient --eval "(kill-emacs)"
+ExecStart=/usr/bin/emacs --daemon
+ExecStop=/usr/bin/emacsclient --eval "(kill-emacs)"
Environment=SSH_AUTH_SOCK=%t/keyring/ssh
Restart=on-failure
diff --git a/.config/zsh/zshrc b/.config/zsh/zshrc
@@ -88,7 +88,7 @@ alias 9='cd -9'
COMPLETION_WAITING_DOTS="true"
# Reload piwal theme
-(cat ~/.cache/wal/sequences &)
+[[ -v SSH_CLIENT ]] && (cat ~/.cache/wal/sequences &)
zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-z}'
@@ -182,4 +182,4 @@ bindkey "^[[A" history-beginning-search-backward-end
bindkey "^[[B" history-beginning-search-forward-end
unset HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND
-source /usr/share/zsh/plugins/fast-syntax-highlighting/fast-syntax-highlighting.plugin.zsh 2>/dev/null-
\ No newline at end of file
+source /usr/share/zsh/plugins/fast-syntax-highlighting/fast-syntax-highlighting.plugin.zsh 2>/dev/null
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
@@ -38,10 +38,11 @@
;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right.
'(org-display-custom-times 1)
- '(org-export-with-sub-superscripts '{})
- '(org-time-stamp-custom-formats '("<%b %e %G>" . "<%m/%d/%y %a %H:%M>"))
+ '(org-export-with-sub-superscripts (quote {}))
+ '(org-time-stamp-custom-formats (quote ("<%b %e %G>" . "<%m/%d/%y %a %H:%M>")))
'(package-selected-packages
- '(rainbow-mode impatient-mode vterm rust-mode systemd yasnippet-snippets yasnippet gitignore-mode company flycheck wc-mode htmlize fic-mode emojify org-bullets use-package-hydra use-package-ensure-system-package use-package-el-get use-package-chords undo-tree quelpa-use-package mu4e-query-fragments mu4e-overview mu4e-maildirs-extension mu4e-jump-to-list mu4e-conversation mu4e-alert modus-vivendi-theme modus-operandi-theme ivy-ycmd ivy-avy highlight fish-mode elfeed-web elfeed-score elfeed-protocol elfeed-org elfeed-goodies csgo-conf-mode counsel)))
+ (quote
+ (rainbow-mode impatient-mode vterm rust-mode systemd yasnippet-snippets yasnippet gitignore-mode company flycheck wc-mode htmlize fic-mode emojify org-bullets use-package-hydra use-package-ensure-system-package use-package-el-get use-package-chords undo-tree quelpa-use-package mu4e-query-fragments mu4e-overview mu4e-maildirs-extension mu4e-jump-to-list mu4e-conversation mu4e-alert modus-vivendi-theme modus-operandi-theme ivy-ycmd ivy-avy highlight fish-mode elfeed-web elfeed-score elfeed-protocol elfeed-org elfeed-goodies csgo-conf-mode counsel))))
(custom-set-faces
;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.
