dotfiles

commit 09d8d50270da288fbb77fe7cd6ea3aaeb9f6f52e
parent aad838feda805cb3d2a36994171c014751cb9e5d
Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
Date:   Mon,  3 Feb 2014 15:47:37 +0100

Merge branch 'master' of github.com:anders-dc/dotfiles

Conflicts:
	.xinitrc

Diffstat:
M
.i3/config
 | 
3
++-
D
.xinitrc
 | 
81
-------------------------------------------------------------------------------
A
bin/fsize.sh
 | 
5
+++++
M
bin/keyboard-layout-switch.sh
 | 
2
+-

4 files changed, 8 insertions(+), 83 deletions(-)
diff --git a/.i3/config b/.i3/config
@@ -187,7 +187,8 @@ bar {
     status_command    i3status --config ~/.i3/status
     #position          top
     position          bottom
-    mode              dock
+    #mode              dock
+    mode              hide
     workspace_buttons yes
     #tray_output       none
     tray_output       primary
diff --git a/.xinitrc b/.xinitrc
@@ -1,81 +0,0 @@
-#!/bin/sh
-
-# Set background color
-xsetroot -solid '#222222' &
-
-# Disable beeps
-xset -b
-
-# Keyboard layout with caps as ctrl
-#setxkbmap dk
-#setxkbmap us -option ctrl:nocaps
-setxkbmap us
-#setxkbmap dvorak -option ctrl:nocaps
-
-# Read .xbindkeysrc for special key-bindings
-xbindkeys
-
-# Set display color profile
-[ -f ~/doc/colorprofile.icc ] && xcalib ~/doc/colorprofile.icc 
-
-# Make sure this is before the 'exec' command or it won't be executed.
-[ -f ~/.xprofile ] && . ~/.xprofile
-xrdb ~/.Xresources
-
-# screen powersave
-xset +dpms # Energy Star features on
-xset dpms 300 600 900 # standby -> suspend -> off (seconds)
-
-# mouse acceleration (xset m <acceleration> <threshold>)
-xset m 3/2 4
-#xset m 2/1 4
-
-# Set dim LCD brightness
-#xbacklight -set 30 &
-
-# Load local fonts
-xset +fp ~/.fonts
-xset fp rehash
-fc-cache
-fc-cache -fv
-
-# Notification deamon
-dunst &
-
-# Bluetooth applet
-#blueman-applet &
-
-#gnome-settings-daemon &      # handles themes, starts gnome-screensaver. You may have to use gconf to disable it setting the background.
-#nm-applet &                  # assuming you're using Network Manager
-#pidgin &                     # if you're using pidgin. You can really put any programs here.
-#gnome-power-manager &        # for laptops and stuff
-#gnome-volume-manager &       # for mounting CDs, USB sticks, and such
-#eval `gnome-keyring-daemon`  # SSH/GPG agent
-
-#owncloud &
-#dropbox start &
-
-
-# Disable touchpad when typing
-#syndaemon -t -k -i 2 -d &
-
-# Enable tap-to-click on touchpad
-synclient TapButton1=1 TapButton2=2 TapButton3=3
-
-# Automatically suspend system after 20 mins of inactivity
-#xautolock -time 20 -locker "sudo pm-suspend" &
-# Automatically lock the screen after 10 mins of inactivity
-xautolock -time 10 -locker "i3lock -c 1d1f21" &
-
-# Read .Xmodmap for modified keys
-#setxkbmap -option ctrl:nocaps
-#xmodmap ~/.Xmodmap
-
-#exec i3
-
-# Setup two monitors at iddqd
-xrandr --output DVI-D-0 --primary
-xrandr --output DP-1 --auto --left-of DVI-D-0
-
-sxhkd &
-exec bspwm
diff --git a/bin/fsize.sh b/bin/fsize.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+#FONT=uushi
+#FONT=Terminus
+FONT=lemon
+printf '\33]50;%s%d\007' "xft:$FONT:pixelsize=" $1
diff --git a/bin/keyboard-layout-switch.sh b/bin/keyboard-layout-switch.sh
@@ -8,7 +8,7 @@ LANG1="us"
 LANG2="dk"
 
 # make the caps lock key a ctrl key
-OPTS="-option ctrl:nocaps"
+OPTS="-option ctrl:nocaps,altwin:swap_lalt_lwin"
 
 # write the file if it doesn't exist
 if [ ! -f $LAYOUTFILE ]; then