1
0
mirror of https://github.com/frebib/dotfiles.git synced 2024-06-14 12:57:23 +00:00

Merge remote-tracking branch 'origin/master' into surface

This commit is contained in:
Joe Groocock 2018-04-12 02:32:31 +01:00
commit f17927e0ee
Signed by: frebib
GPG Key ID: E0B16BEACFBB6A86
4 changed files with 11 additions and 13 deletions

View File

@ -11,9 +11,16 @@ if [ -d "$xinitdir" ]; then
done done
fi fi
source ~/.profile source $HOME/.profile
source $XDG_CONFIG_HOME/X11/xsession
xrdb -merge $XDG_CONFIG_HOME/X11/xresources xrdb -merge $XDG_CONFIG_HOME/X11/xresources
~/.local/share/surfacetools/rotationd --once xrandr --dpi $(xrdb -query | grep -i xft.dpi | cut -d: -f2)
xrandr --output eDP1 --primary
setxkbmap -option caps:none
xset r rate 200 18
~/.local/share/surface-scripts/pend &
~/.local/share/surface-scripts/rotationd &
exec i3 exec i3

View File

@ -1,7 +0,0 @@
setxkbmap -option caps:none
xset r rate 200 18
xrandr --dpi 136
xrandr --output eDP1 --primary
~/.local/share/surface-scripts/pend &
~/.local/share/surface-scripts/rotationd &

View File

@ -29,7 +29,6 @@ export ZDOTDIR="$XDG_CONFIG_HOME/zsh"
# Configure X11 config file paths # Configure X11 config file paths
export XAUTHORITY="$XDG_RUNTIME_DIR/Xauthority" export XAUTHORITY="$XDG_RUNTIME_DIR/Xauthority"
export XINITRC="$XDG_CONFIG_HOME/X11/xinitrc" export XINITRC="$XDG_CONFIG_HOME/X11/xinitrc"
export XSESSION="$XDG_CONFIG_HOME/X11/xsession"
export MANPAGER="less -+N" export MANPAGER="less -+N"
export TERMINAL="termite" export TERMINAL="termite"

View File

@ -258,8 +258,7 @@ alias vimrc="$EDITOR $VIMRC"
alias zshrc="$EDITOR ${ZDOTDIR:-$HOME}/.zshrc ; exec zsh" alias zshrc="$EDITOR ${ZDOTDIR:-$HOME}/.zshrc ; exec zsh"
alias gitrc="$EDITOR $XDG_CONFIG_HOME/git/config" alias gitrc="$EDITOR $XDG_CONFIG_HOME/git/config"
alias xinitrc="$EDITOR $XDG_CONFIG_HOME/X11/xinitrc" alias xinitrc="$EDITOR $XDG_CONFIG_HOME/X11/xinitrc"
alias xresources="$EDITOR $XDG_CONFIG_HOME/X11/xresources ; xrdb merge $XDG_CONFIG_HOME/X11/Xresources" alias xresources="$EDITOR $XDG_CONFIG_HOME/X11/xresources ; xrdb merge $XDG_CONFIG_HOME/X11/xresources"
alias xsession="$EDITOR $XDG_CONFIG_HOME/X11/xsession"
alias sshc="$EDITOR ~/.ssh/config" alias sshc="$EDITOR ~/.ssh/config"
alias dotfiles="cd $DOTFILES" alias dotfiles="cd $DOTFILES"
alias i3c="$EDITOR $XDG_CONFIG_HOME/i3/config ; i3-msg restart" alias i3c="$EDITOR $XDG_CONFIG_HOME/i3/config ; i3-msg restart"