commit 4ebd070748a151f4adf57718ce32b7dfba51b426
parent 2c5f11093c745f7e7e2befa65ff0381bf3942c2e
Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
Date: Mon, 3 Feb 2014 20:13:41 +0100
bspwm with laptop, terminal size
Diffstat:
6 files changed, 50 insertions(+), 37 deletions(-)
diff --git a/.Xmodmap b/.Xmodmap
@@ -7,9 +7,9 @@
!keysym Caps_Lock = Control_L
!add Control = Control_L
-remove mod1 = Alt_L
-remove mod1 = Alt_R
-remove mod4 = Super_L
-add mod1 = Super_L
-add mod4 = Alt_L
-add mod4 = Alt_R
+!remove mod1 = Alt_L
+!remove mod1 = Alt_R
+!remove mod4 = Super_L
+!add mod1 = Super_L
+!add mod4 = Alt_L
+!add mod4 = Alt_R
diff --git a/.Xresources b/.Xresources
@@ -31,12 +31,22 @@ URxvt.intensityStyles: false
!Xft.dpi: 100
!URxvt.font: xft:SourceCodePro-Light:pixelsize=11
-URxvt.keysym.C-7: command:\033]710;-*-uushi-medium-r-normal-*-*-*-*-*-*-*-*-*\007\033]711;-*-uushi-medium-r-normal-*-*-*-*-*-*-*-*-*\007
-URxvt.keysym.C-8: command:\033]710;-*-gohufontmod11-medium-r-normal-*-*-*-*-*-*-*-*-*\007\033]711;-*-gohufontmod-medium-r-normal-*-*-*-*-*-*-*-*-*\007
-URxvt.keysym.C-9: command:\033]710;-*-limey-*-*-*-*-*-*-*-*-*-*-*-*\007\033]711;-*-limey-*-*-*-*-*-*-*-*-*-*-*-*\007
-URxvt.keysym.C-0: command:\033]710;-*-lemon-*-*-*-*-*-*-*-*-*-*-*-*\007\033]711;-*-lemon-*-*-*-*-*-*-*-*-*-*-*-*\007
-URxvt.keysym.C-minus: command:\033]710;-*-tewi-medium-r-normal-*-*-*-*-*-*-*-*-*\007\033]711;-*-tewi-medium-r-normal-*-*-*-*-*-*-*-*-*\007
-URxvt.keysym.C-equal: command:\033]710;xft:inconsolata:size=8\007\033]711;xft:inconsolata:size=8\007
+!URxvt.keysym.C-7: command:\033]710;-*-uushi-medium-r-normal-*-*-*-*-*-*-*-*-*\007\033]711;-*-uushi-medium-r-normal-*-*-*-*-*-*-*-*-*\007
+!URxvt.keysym.C-8: command:\033]710;-*-gohufontmod11-medium-r-normal-*-*-*-*-*-*-*-*-*\007\033]711;-*-gohufontmod-medium-r-normal-*-*-*-*-*-*-*-*-*\007
+!URxvt.keysym.C-9: command:\033]710;-*-limey-*-*-*-*-*-*-*-*-*-*-*-*\007\033]711;-*-limey-*-*-*-*-*-*-*-*-*-*-*-*\007
+!URxvt.keysym.C-0: command:\033]710;-*-lemon-*-*-*-*-*-*-*-*-*-*-*-*\007\033]711;-*-lemon-*-*-*-*-*-*-*-*-*-*-*-*\007
+!URxvt.keysym.C-minus: command:\033]710;-*-tewi-medium-r-normal-*-*-*-*-*-*-*-*-*\007\033]711;-*-tewi-medium-r-normal-*-*-*-*-*-*-*-*-*\007
+!URxvt.keysym.C-equal: command:\033]710;xft:inconsolata:size=8\007\033]711;xft:inconsolata:size=8\007
+URxvt.keysym.C-1: command:\033]710;xft:inconsolata:size=7\007\033]711;xft:inconsolata:size=7\007
+URxvt.keysym.C-2: command:\033]710;xft:inconsolata:size=8\007\033]711;xft:inconsolata:size=8\007
+URxvt.keysym.C-3: command:\033]710;xft:inconsolata:size=10\007\033]711;xft:Monaco for Powerline:size=10\007
+URxvt.keysym.C-4: command:\033]710;xft:inconsolata:size=12\007\033]711;xft:inconsolata:size=12\007
+URxvt.keysym.C-5: command:\033]710;xft:inconsolata:size=14\007\033]711;xft:inconsolata:size=14\007
+URxvt.keysym.C-6: command:\033]710;xft:inconsolata:size=16\007\033]711;xft:inconsolata:size=16\007
+URxvt.keysym.C-7: command:\033]710;xft:inconsolata:size=18\007\033]711;xft:inconsolata:size=18\007
+URxvt.keysym.C-8: command:\033]710;xft:inconsolata:size=24\007\033]711;xft:inconsolata:size=24\007
+URxvt.keysym.C-9: command:\033]710;xft:inconsolata:size=36\007\033]711;xft:inconsolata:size=36\007
+URxvt.keysym.C-0: command:\033]710;-*-uushi-*-*-*-*-*-*-*-*-*-*-*-*\007\033]711;-*-uushi-*-*-*-*-*-*-*-*-*-*-*-*\007
!urxvt*font: -*-lemon-*-*-*-*-*-*-*-*-*-*-*-*
!urxvt*boldFont: -*-lemon-*-*-*-*-*-*-*-*-*-*-*-*
diff --git a/.config/bspwm/bspwmrc b/.config/bspwm/bspwmrc
@@ -10,22 +10,25 @@ FIRST_DESK_SECONDARY=v
REMAINING_DESKS_SECONDARY="vi vii viii ix x"
#MONITORS_ASSOCIATED=`bspc query -M | wc -l`
-if [[ -z `xrandr | grep " connected" | grep 'VGA\|DP-1'` ]]; then
- #No monitor connected
- bspc desktop ^1 -n $FIRST_DESK_MAIN
- bspc monitor -a $REMAINING_DESKS_MAIN
- bspc config top_padding 14
-else
- bspc desktop ^1 -n $FIRST_DESK_SECONDARY
- bspc config -m ^1 top_padding 14
- bspc monitor -a $REMAINING_DESKS_SECONDARY
-
- bspc monitor -f next
-
- bspc desktop Desktop2 -n $FIRST_DESK_MAIN
- bspc monitor -a $REMAINING_DESKS_MAIN
- bspc config -m ^2 top_padding 14
-fi
+#if [[ -z `xrandr | grep " connected" | grep 'VGA\|DP-1'` ]]; then
+# #No monitor connected
+# bspc desktop ^1 -n $FIRST_DESK_MAIN
+# bspc monitor -a $REMAINING_DESKS_MAIN
+# bspc config top_padding 14
+#else
+# bspc desktop ^1 -n $FIRST_DESK_SECONDARY
+# bspc config -m ^1 top_padding 14
+# bspc monitor -a $REMAINING_DESKS_SECONDARY
+#
+# bspc monitor -f next
+#
+# bspc desktop Desktop2 -n $FIRST_DESK_MAIN
+# bspc monitor -a $REMAINING_DESKS_MAIN
+# bspc config -m ^2 top_padding 14
+#fi
+bspc desktop ^1 -n $FIRST_DESK_MAIN
+bspc monitor -a $REMAINING_DESKS_MAIN
+bspc config top_padding 14
# Visual options
bspc config border_width 2
diff --git a/.xbindkeysrc b/.xbindkeysrc
@@ -1,9 +1,9 @@
-#"xbacklight -dec 10"
-"xbacklight -dec 5"
+"xbacklight -dec 10"
+#"xbacklight -dec 5"
XF86MonBrightnessDown
-#"xbacklight -inc 10"
-"xbacklight -inc 5"
+"xbacklight -inc 10"
+#"xbacklight -inc 5"
XF86MonBrightnessUp
"/home/adc/bin/display-switcher.sh"
diff --git a/.xinitrc b/.xinitrc
@@ -6,7 +6,7 @@ xsetroot -solid '#222222' &
# Disable beeps
xset -b
-# Keyboard layout with caps as ctrl
+# Keyboard layout
#setxkbmap dk
#setxkbmap us -option ctrl:nocaps
setxkbmap us
@@ -55,7 +55,6 @@ dunst &
#owncloud &
#dropbox start &
-
# Disable touchpad when typing
#syndaemon -t -k -i 2 -d &
@@ -68,8 +67,8 @@ synclient TapButton1=1 TapButton2=2 TapButton3=3
xautolock -time 10 -locker "i3lock -c 1d1f21" &
# Read .Xmodmap for modified keys
-#setxkbmap -option ctrl:nocaps
-xmodmap ~/.Xmodmap
+setxkbmap -option ctrl:nocaps
+#xmodmap ~/.Xmodmap
# Setup two monitors at iddqd
#xrandr --output DVI-D-0 --primary
diff --git a/bin/fsize.sh b/bin/fsize.sh
@@ -1,5 +1,6 @@
#!/bin/bash
#FONT=uushi
#FONT=Terminus
-FONT=lemon
+#FONT=lemon
+FONT="Monaco for Powerline"
printf '\33]50;%s%d\007' "xft:$FONT:pixelsize=" $1
