Merge branch 'dev' into gentoo
This commit is contained in:
commit
754f46f7c6
@ -8,12 +8,12 @@ xss-lock -- slock &
|
||||
redshift &
|
||||
dunst -follow mouse &> /dev/null & #temp fix
|
||||
# MPD daemon start (if no other user instance exists)
|
||||
[ ! -s ~/.config/mpd/pid ] && mpd
|
||||
[ ! -s "$XDG_CONFIG_HOME/mpd/pid" ] && mpd
|
||||
pulsemixer --set-volume 50
|
||||
sbacklight set 3 &
|
||||
setbg &
|
||||
dwmblocks &
|
||||
xrdb ${XDG_CONFIG_HOME:-$HOME/.config}/X11/xresources
|
||||
xrdb "$XDG_CONFIG_HOME/X11/xresources"
|
||||
|
||||
setxkbmap 'fr(oss)'
|
||||
xmodmap "$XDG_CONFIG_HOME/X11/xmodmap" &
|
||||
|
@ -52,13 +52,13 @@ super + shift + {h,j,k,l}
|
||||
player {prev,stop,toggle,next}
|
||||
|
||||
super + shift + m
|
||||
$TERMINAL -g 128x32 -c "ncmpcpp" -e ncmpcpp
|
||||
$TERMINAL -g 128x32 -c "float" -e ncmpc
|
||||
|
||||
super + shift + n
|
||||
$TERMINAL -g 128x32 -c "neomutt" -e neomutt
|
||||
$TERMINAL -g 128x32 -c "float" -e neomutt
|
||||
|
||||
super + shift + t
|
||||
$TERMINAL -g 128x32 -c "transmission" -e tremc
|
||||
$TERMINAL -g 128x32 -c "float" -e tremc
|
||||
|
||||
super + shift + b
|
||||
script="$(printf "bibinput\nbibshow" | dmenu -i -p "which script?")" && $script
|
||||
|
@ -19,6 +19,7 @@ bindkey '^[[6~' down-line-or-history # PageDown
|
||||
HISTSIZE=10000
|
||||
SAVEHIST=10000
|
||||
HISTFILE=~/.cache/zsh/history
|
||||
setopt hist_ignore_space # Ignore commands preceeded by a space
|
||||
|
||||
# Basic auto/tab complete:
|
||||
autoload -U compinit
|
||||
@ -27,6 +28,9 @@ zmodload zsh/complist
|
||||
compinit
|
||||
_comp_options+=(globdots) # Include hidden files.
|
||||
|
||||
# Command correction
|
||||
setopt correctall
|
||||
|
||||
# vi mode
|
||||
bindkey -v
|
||||
export KEYTIMEOUT=1
|
||||
|
@ -20,8 +20,14 @@ step=$(expr $max / 20)
|
||||
[ "$1" = "dec" ] && new=$(expr $current - $step)
|
||||
[ "$1" = "inc" ] && new=$(expr $current + $step)
|
||||
[ "$1" = "set" ] && new=$(expr $2 \* $step)
|
||||
case "$1" in
|
||||
"dec") new=$(expr $current - $step);;
|
||||
"inc") new=$(expr $current + $step);;
|
||||
"set") new=$(expr $2 \* $step);;
|
||||
*) exit
|
||||
esac
|
||||
|
||||
[ $new -gt 850 ] && new=850
|
||||
[ $new -gt $max ] && new=$max
|
||||
[ $new -lt 0 ] && new=0
|
||||
|
||||
echo $new > /sys/class/backlight/intel_backlight/brightness
|
||||
|
@ -53,4 +53,4 @@ do
|
||||
fi
|
||||
[ 40 -gt $total ] && notify;
|
||||
printf " %s %3d%% " "$status" "$capacity";
|
||||
done && return 0
|
||||
done
|
||||
|
@ -1 +1 @@
|
||||
Subproject commit 8bd3d0987af29c71f5e6bfa884936dc99aa58293
|
||||
Subproject commit db515753ac0c9811199453d3e4ce72a1c72f5e2e
|
@ -1 +1 @@
|
||||
Subproject commit 0e2075b0ec4282cb81dec8055332b5f71ede9e6c
|
||||
Subproject commit 7199d8d564c144bbf4d47641db72b071f39533c7
|
Reference in New Issue
Block a user