Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

We’re showing branches in this repository, but you can also compare across forks.

base fork: hutchison/dotfiles
base: 6446f09ef8
...
head fork: hutchison/dotfiles
compare: c0645bc1a7
  • 5 commits
  • 4 files changed
  • 0 commit comments
  • 1 contributor
Commits on Jun 25, 2012
Martin Darmüntzel New oh-my-zsh version. af6ac9d
Martin Darmüntzel Sets i3 as the new standard WM on fitzgerald. a566c1c
Martin Darmüntzel Adds redshift-alias to .zshrc. 2902f49
Martin Darmüntzel Adds .i3status.conf. 4dc3120
Martin Darmüntzel Merge branch 'master' of github.com:hutchison/dotfiles
Conflicts:
	.oh-my-zsh
c0645bc
Showing with 56 additions and 2 deletions.
  1. +49 −0 .i3status.conf
  2. +1 −1  .oh-my-zsh
  3. +4 −1 .xinitrc
  4. +2 −0  .zshrc
49 .i3status.conf
View
@@ -0,0 +1,49 @@
+general {
+ colors = true
+ interval = 5
+}
+
+#order += "ipv6"
+order += "disk /"
+order += "run_watch DHCP"
+order += "run_watch VPN"
+#order += "wireless wlan0"
+order += "ethernet eth1"
+#order += "battery 0"
+order += "load"
+order += "time"
+
+wireless wlan0 {
+ format_up = "W: (%quality at %essid) %ip"
+ format_down = "W: down"
+}
+
+ethernet eth1 {
+ # if you use %speed, i3status requires root privileges
+ format_up = "E: %ip (%speed)"
+ format_down = "E: down"
+}
+
+battery 0 {
+ format = "%status %percentage %remaining"
+}
+
+run_watch DHCP {
+ pidfile = "/var/run/dhcpcd-eth1.pid"
+}
+
+run_watch VPN {
+ pidfile = "/var/run/vpnc/pid"
+}
+
+time {
+ format = "[%V] %Y-%m-%d %H:%M:%S"
+}
+
+load {
+ format = "L: %1min %5min %15min"
+}
+
+disk "/" {
+ format = "%free"
+}
2  .oh-my-zsh
@@ -1 +1 @@
-Subproject commit c79d8aa282e3f968d6bbff9f0eea5c8664265f50
+Subproject commit fc23fda7c7e4fd7efc4c96304cf7c349d683ed59
5 .xinitrc
View
@@ -23,6 +23,8 @@ redshift -l 54:12 -t 5500:3600 -m randr 2> /dev/null &
# This enables it again.
setxkbmap -option terminate:ctrl_alt_bksp
+export TERMINAL=gnome-terminal
+
# gvim vimwiki:
gvim -c ":VimwikiIndex" --name "gvimwiki" &
@@ -55,7 +57,8 @@ sh $HOME/dotfiles/bin/NASABackground.sh
# exec startkde
# exec startxfce4
# ...or the Window Manager of your choice
-exec ck-launch-session dbus-launch --exit-with-session awesome
+#exec ck-launch-session dbus-launch --exit-with-session awesome
+exec i3
#exec herbstluftwm
# exec openbox-session
#exec ck-launch-session dbus-launch --exit-with-session startxfce4
2  .zshrc
View
@@ -65,6 +65,8 @@ if [ "$COLORTERM" = "gnome-terminal" ]; then
export TERM="xterm-256color"
fi
+alias dimmer='redshift -l 54:12 -t 5700:3600 -m randr 2> /dev/null &'
+
# connect via rdesktop to appwts.uni-rostock.de
alias appwts='rdesktop -d rechenzentrum -u md261 -g 95% appwts.uni-rostock.de'
alias netwts='rdesktop -d rechenzentrum -u md261 -g 95% netwts.uni-rostock.de'

No commit comments for this range

Something went wrong with that request. Please try again.