Merge remote-tracking branch 'origin/master'

This commit is contained in:
Vlad Doster 2020-04-09 17:19:57 -05:00
commit c346b2926e
5 changed files with 6 additions and 13 deletions

View File

@ -10,8 +10,6 @@ alias \
mv="mv -iv" \
rm="rm -v" \
mkd="mkdir -pv" \
yt="youtube-dl --add-metadata -i" \
yta="yt -x -f bestaudio/best" \
ffmpeg="ffmpeg -hide_banner"
# Colorize commands when possible.
@ -25,8 +23,6 @@ alias \
alias \
ka="killall" \
g="git" \
trem="transmission-remote" \
YT="youtube-viewer" \
sdn="sudo shutdown -h now" \
f="$FILE" \
e="$EDITOR" \
@ -37,5 +33,4 @@ alias \
alias \
magit="nvim -c MagitOnly" \
ref="shortcuts >/dev/null; source ${XDG_CONFIG_HOME:-$HOME/.config}/shortcutrc ; source ${XDG_CONFIG_HOME:-$HOME/.config}/zshnameddirrc" \
weath="less -S ${XDG_DATA_HOME:-$HOME/.local/share}/weatherreport" \
tmux="tmux -f ${XDG_CONFIG_HOME:-$HOME/.config}/tmux/tmux.conf"

View File

@ -34,7 +34,7 @@ module-margin-right = 1
font-0 = "Source Code Pro:pixelsize=8;1"
font-1 = "Source Code Pro:style=Regular:pixelsize=8;1"
; enable emojis
font-2 = NotoColorEmoji:pixelsize=5;0:fontformat=truetype:scale=12:antialias=true;
font-2 = NotoColorEmoji:pixelsize=8;1:fontformat=truetype:scale=10:antialias=true;3
; wm related
wm-restack = i3
scroll-up = i3wm-wsnext
@ -52,7 +52,8 @@ full-at = 98
; orange denotes charging
format-charging =<label-charging>
label-charging = Batt: %percentage%%
format-charging-prefix = "Batt: "
label-charging = %percentage%%
label-charging-overline=${colors.orange}
label-charging-underline=${colors.orange}
@ -154,7 +155,7 @@ type = custom/script
exec = ~/.local/bin/polybar_scripts/sys_temp
format = <label>
interval = 5
label = Temp: %output%°F
label = Sys Temp: %output%°F
[module/volume]
; sound utility

3
.gitmodules vendored
View File

@ -1,3 +0,0 @@
[submodule ".config/mpv/scripts/mpvSockets"]
path = .config/mpv/scripts/mpvSockets
url = https://github.com/wis/mpvSockets.git

View File

@ -5,7 +5,7 @@
# Must have xclip installed to even show menu.
xclip -h 2>/dev/null || exit 1
chosen=$(cut -d ';' -f1 ${XDG_DATA_HOME:-$HOME/.local/share}/larbs/emoji | dmenu -i -l 20 | sed "s/ .*//")
chosen=$(cut -d ';' -f1 ${XDG_DATA_HOME:-$HOME/.local/share}/dotfiles/emoji | dmenu -i -l 20 | sed "s/ .*//")
[ "$chosen" != "" ] || exit

View File

@ -44,4 +44,4 @@ export LESS_TERMCAP_ue="$(printf '%b' '')"
[ "$(tty)" = "/dev/tty1" ] && ! pgrep -x Xorg >/dev/null && exec startx
# Switch escape and caps if tty and no passwd required:
sudo -n loadkeys ${XDG_DATA_HOME:-$HOME/.local/share}/larbs/ttymaps.kmap 2>/dev/null
sudo -n loadkeys ${XDG_DATA_HOME:-$HOME/.local/share}/dotfiles/ttymaps.kmap 2>/dev/null