commit 9af1a0c0b3d0a6f4980c522116433e480a93d0d0
parent 1b08faa520106b96d053032f4abdd6b5f1bbc18a
Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
Date: Tue, 27 Jan 2015 10:24:57 +0100
add shortcut to lock X
Diffstat:
5 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/.i3/config b/.i3/config
@@ -27,7 +27,7 @@ set $alt Mod1
#font xft:DejaVu Sans Mono 10
#font xft:LucidaTypewriter 7
#font -*-termsynu-medium-r-*-*-13-*-*-*-*-*-*-*
-font xft:PragmataPro 8
+font xft:PragmataPro 9
#font -*-nu-*-*-*-*-*-*-*-*-*-*-*-*
#font -*-terminus-*-*-*-*-*-*-*-*-*-*-*-*
@@ -91,6 +91,10 @@ bindsym $mod+Shift+i exec --no-startup-id amixer set Master 3%+ unmute && killal
bindsym $mod+Shift+o exec --no-startup-id amixer set Master 3%- unmute && killall -SIGUSR1 i3status
bindsym $mod+Shift+m exec --no-startup-id amixer set Master toggle && killall -SIGUSR1 i3status
+# keyboard backlight
+bindsym XF86KbdBrightnessDown exec --no-startup-id /home/ad/bin/kbd_backlight.sh down
+bindsym XF86KbdBrightnessUp exec --no-startup-id /home/ad/bin/kbd_backlight.sh up
+
# mpd control
bindsym $mod+Shift+p exec mpc toggle
bindsym $mod+Shift+n exec mpc next
@@ -106,6 +110,7 @@ bindsym $mod+Shift+d exec --no-startup-id bash /home/ad/code/dotfiles/bin/xrandr
# screen lock
bindsym $mod+z exec /home/ad/bin/zzz
+bindsym $mod+x exec /home/ad/bin/xlock
# kill focused window
bindsym $mod+Shift+q kill
diff --git a/.xinitrc b/.xinitrc
@@ -12,14 +12,15 @@ xsetroot -cursor_name left_ptr &
#xsetroot -solid '#222222' &
#hsetroot -cover ~/wallpapers/blue-gradient.jpg
#hsetroot -tile ~/wallpapers/solarized-pattern.png
-if [ "$HOSTNAME" = "iddqd" ]
-then
+hsetroot -fill ~/wallpapers/fall.jpg # single screen
+#if [ "$HOSTNAME" = "iddqd" ]
+#then
#hsetroot -fill ~/wallpapers/octahedron-bg-gimp-double.png # dual screen
#hsetroot -fill ~/wallpapers/octahedron-bg-gimp.png # single screen
- hsetroot -fill ~/wallpapers/fall.jpg # single screen
-else
- hsetroot -cover ~/wallpapers/octahedron-bg-gimp.png
-fi
+ #hsetroot -fill ~/wallpapers/fall.jpg # single screen
+#else
+ #hsetroot -cover ~/wallpapers/octahedron-bg-gimp.png
+#fi
# Hide mouse on inactivity. unclutter messes up i3lock
#unclutter -grab -noevents -root &
diff --git a/bin/iddqd-ssh b/bin/iddqd-ssh
@@ -1,10 +1,11 @@
-#!/bin/sh
+#!/bin/bash
-if [[ "$(ifconfig | grep 10.17.8)" ]]; then
+#if [[ "$(ifconfig | grep 10.17.8)" ]]; then
+if [[ "$(ip addr | grep 10.17.8)" ]]; then
echo "On geo lan. Mounting sshfs and connecting directly..."
sshfs-iddqd.sh
ssh -v adc@iddqd.nfit.au.dk -t 'bin/tmux-dev.sh'
-elif [[ "$(ifconfig | grep 10.17.2)" ]]; then
+elif [[ "$(ip addr | grep 10.17.2)" ]]; then
echo "On geo VPN. Mounting sshfs and connecting directly..."
sshfs-iddqd.sh
ssh -v adc@iddqd.nfit.au.dk -t 'bin/tmux-dev.sh'
diff --git a/bin/install_debian_pkgs.sh b/bin/install_debian_pkgs.sh
@@ -7,6 +7,7 @@ apt-get install vim tmux git zsh i3 exuberant-ctags haskell-platform \
xautolock pass urlview elinks redshift libnotify-bin owncloud-client \
hsetroot xbacklight i3lock scrot imagemagick mpc htop \
rxvt-unicode-256color texlive cmake sshfs paraview python-numpy \
- python-scipy python-matplotlib ipython mplayer
+ python-scipy python-matplotlib ipython mplayer zathura okular python-pip \
+ dunst
sudo gem install tmuxinator
diff --git a/bin/zzz b/bin/zzz
@@ -6,9 +6,9 @@
HOSTNAME=`hostname`
-if [[ "$HOSTNAME" == 'flaptop' ]]; then
- killall ssh
-fi
+#if [[ "$HOSTNAME" == 'flaptop' ]]; then
+ #killall ssh
+#fi
mpc stop
#i3lock -c 1d1f21
$HOME/bin/xlock