Merge branch 'master' of github.com:stv0g/dotfiles

This commit is contained in:
Steffen Vogel 2014-06-24 14:34:53 +02:00
commit 14c22a5dff
6 changed files with 47 additions and 8 deletions

25
.bash_profile Normal file
View file

@ -0,0 +1,25 @@
# ~/.profile: executed by the command interpreter for login shells.
# This file is not read by bash(1), if ~/.bash_profile or ~/.bash_login
# exists.
# see /usr/share/doc/bash/examples/startup-files for examples.
# the files are located in the bash-doc package.
# the default umask is set in /etc/profile; for setting the umask
# for ssh logins, install and configure the libpam-umask package.
#umask 022
# if running bash
if [ -n "$BASH_VERSION" ]; then
# include .bashrc if it exists
if [ -f "$HOME/.bashrc" ]; then
. "$HOME/.bashrc"
fi
fi
# set PATH so it includes user's private bin if it exists
if [ -d "$HOME/bin" ] ; then
PATH="$HOME/bin:$PATH"
fi
# start gui
startx

View file

@ -42,4 +42,3 @@ fi
if [ -f ~/.bash_aliases ]; then source ~/.bash_aliases; fi
if [ -f ~/.bash_env ]; then source ~/.bash_env; fi
if [ -f ~/.bash_prompt ]; then source ~/.bash_prompt; fi
if [ -f /etc/bash_completion ]; then source /etc/bash_completion; fi

View file

@ -35,20 +35,20 @@ cpu_usage {
}
cpu_temperature 0 {
format = " %degrees°"
format = " %degrees°"
path = "/sys/devices/platform/coretemp.0/temp2_input"
max_threshold = 95
}
cpu_temperature 1 {
format = "%degrees° "
format = " %degrees° "
path = "/sys/devices/platform/coretemp.0/temp3_input"
max_threshold = 95
}
battery 0 {
format = "  %status %percentage %remaining "
format_down = "No battery"
format_down = " No battery "
path = "/sys/class/power_supply/BAT%d/uevent"
low_threshold = 10
integer_battery_capacity = true

View file

@ -5,14 +5,28 @@ xset -dpms
xset s off
# Composite manager
compton -d :0.0 -b
compton -d :0.1 -b
case "$(hostname)" in
"ryx")
compton -d :0.0 -b
compton -d :0.1 -b
;;
"len")
compton -d :1 -b
;;
*)
esac
# Background
xrdb ~/.Xresources
nitrogen --restore
# Window manager
DISPLAY=:0.1 i3 &
case "$(hostname)" in
"ryx")
DISPLAY=:0.1 i3 &
;;
*)
esac
exec i3

0
bash_colors.sh → colors.sh Normal file → Executable file
View file

3
debian.sh Normal file → Executable file
View file

@ -18,7 +18,8 @@ apt-get install git vim \
irssi \
htop \
fonts-font-awesome \
bind9-utils
bind9-utils \
sshfs
apt-get install texlive \
texlive-luatex \