commit 18cb2e28e1c4ced40e38cf78cfdfd9fbd6ab44c8
parent e836d8e07bddbb66a2cd254cc7a09f3dfff97419
Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
Date: Thu, 6 Mar 2014 13:55:00 +0100
Back to i3 and solarized
Diffstat:
6 files changed, 82 insertions(+), 54 deletions(-)
diff --git a/.Xresources b/.Xresources
@@ -3,8 +3,13 @@ Xcursor.theme: Vanilla-DMZ-AA
Xcursor.size: 22
! terminal colors ------------------------------------------------------------
-!#include "/home/adc/.colors/solarized"
-#include "/home/adc/.colors/erosionedit"
+#include "/home/adc/.colors/solarized"
+!#include "/home/adc/.colors/erosionedit"
+
+! fonts ----------------------------------------------------------------------
+Xft*dpi: 96
+Xft*antialias: true
+Xft*hinting: full
! urxvt ----------------------------------------------------------------------
urxvt*perl-lib: /usr/lib/urxvt/perl
@@ -36,22 +41,26 @@ URxvt.keysym.C-5: command:\033]710;xft:inconsolata:size=14\007\033]711;xft:incon
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.keysym.C-9: command:\033]710;-*-uushi-*-*-*-*-*-*-*-*-*-*-*-*\007\033]711;-*-uushi-*-*-*-*-*-*-*-*-*-*-*-*\007
+URxvt.keysym.C-0: command:\033]710;-*-termsynu-medium-r-*-*-14-*-*-*-*-*-*-*\007\033]711;-*-termsynu-medium-r-*-*-14-*-*-*-*-*-*-*\007
!urxvt*font: -*-lemon-*-*-*-*-*-*-*-*-*-*-*-*
!urxvt*boldFont: -*-lemon-*-*-*-*-*-*-*-*-*-*-*-*
!urxvt*italicFont: -*-lemon-*-*-*-*-*-*-*-*-*-*-*-*
!urxvt*bolditalicFont: -*-lemon-*-*-*-*-*-*-*-*-*-*-*-*
-urxvt*font: -*-uushi-*-*-*-*-*-*-*-*-*-*-*-*
-urxvt*boldFont: -*-uushi-*-*-*-*-*-*-*-*-*-*-*-*
-urxvt*italicFont: -*-uushi-*-*-*-*-*-*-*-*-*-*-*-*
-urxvt*bolditalicFont: -*-uushi-*-*-*-*-*-*-*-*-*-*-*-*
+!urxvt*font: -misc-fixed-medium-r-normal--12-120-75-75-C-70-iso10646-1
+!urxvt*boldfont: -misc-fixed-bold-r-normal--12-120-75-75-C-70-iso10646-1
+!urxvt*font: -*-uushi-*-*-*-*-*-*-*-*-*-*-*-*
+!urxvt*font: -*-termsynu-medium-r-*-*-11-*-*-*-*-*-*-*
+!urxvt*boldfont: -*-termsynu-bold-r-*-*-11-*-*-*-*-*-*-*
+urxvt*font: -*-termsynu-medium-r-*-*-13-*-*-*-*-*-*-*
+urxvt*boldfont: -*-termsynu-bold-r-*-*-13-*-*-*-*-*-*-*
+!urxvt*font: xft:SourceCodePro-Light:size=7.3
-urxvt*transparent: true
+!urxvt*transparent: true
! 0-99 darkens, 101-200 lightens
-urxvt*shading: 10
+!urxvt*shading: 10
! xterm ----------------------------------------------------------------------
xterm*background: black
diff --git a/.i3/config b/.i3/config
@@ -14,12 +14,17 @@ set $alt Mod1
# Font for window titles. Will also be used by the bar unless a different font
# is used in the bar {} block below. ISO 10646 = Unicode
-font -misc-fixed-medium-r-normal--12-120-75-75-C-70-iso10646-1
+#font -misc-fixed-medium-r-normal--12-120-75-75-C-70-iso10646-1
# The font above is very space-efficient, that is, it looks good, sharp and
# clear in small sizes. However, if you need a lot of unicode glyphs or
# right-to-left text rendering, you should instead use pango for rendering and
# chose an xft font, such as:
-# font xft:DejaVu Sans Mono 10
+#font xft:DejaVu Sans Mono 10
+#font xft:LucidaTypewriter 7
+font -*-termsynu-medium-r-*-*-11-*-*-*-*-*-*-*
+#font -*-termsynu-medium-r-*-*-14-*-*-*-*-*-*-*
+#font -*-nu-*-*-*-*-*-*-*-*-*-*-*-*
+#font -*-terminus-*-*-*-*-*-*-*-*-*-*-*-*
# Window style
# normal: default border, window title
@@ -43,10 +48,15 @@ new_window 1pixel
#client.urgent #2f343a #900000 #ffffff #900000
# erosionedit
-client.focused #bea492 #bea492 #332d29 #93a1a1
-client.focused_inactive #333333 #222222 #888888 #333333
-client.unfocused #333333 #222222 #888888 #222222
-client.urgent #181512 #900000 #ffffff #900000
+#client.focused #bea492 #bea492 #332d29 #93a1a1
+#client.focused_inactive #333333 #222222 #888888 #333333
+#client.unfocused #333333 #222222 #888888 #222222
+#client.urgent #181512 #900000 #ffffff #900000
+
+client.focused #002b36 #586e75 #fdf6e3 #268bd2
+client.focused_inactive #002b36 #073642 #839496 #073642
+client.unfocused #002b36 #073642 #839496 #073642
+client.urgent #002b36 #dc322f #fdf6e3 #002b36
# Use Mouse+$mod to drag floating windows to their wanted position
floating_modifier $mod
@@ -66,7 +76,7 @@ bindsym $mod+Shift+b exec mpc prev
bindsym $mod+Shift+s exec mpc stop
# screen lock
-bindsym $mod+z exec /home/adc/bin/zzz-i3
+bindsym $mod+z exec /home/adc/bin/zzz
# kill focused window
bindsym $mod+Shift+q kill
@@ -185,37 +195,40 @@ bindsym $mod+r mode "resize"
# finds out, if available)
bar {
status_command i3status --config ~/.i3/status
+ #status_command conky -c ~/.i3/conkyrc
#position top
position bottom
- #mode dock
+ mode dock
#mode hide
workspace_buttons yes
#tray_output none
tray_output primary
- font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
+ #font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
+ #font pango:Droid Sans 8
colors {
- background #111111
- statusline #ffffff
- separator #333333
# colorclass <border> <backgr.> <text>
# default
+ #background #111111
+ #statusline #ffffff
+ #separator #333333
#focused_workspace #4c7899 #285577 #ffffff
#active_workspace #333333 #5f676a #ffffff
#inactive_workspace #333333 #222222 #888888
#urgent_workspace #2f343a #900000 #ffffff
-
- # erosionedit
- focused_workspace #9a875f #9a875f #000000
- active_workspace #817267 #504339 #bea492
- inactive_workspace #333333 #222222 #888888
- urgent_workspace #2f343a #900000 #ffffff
-
+
+ background #002b36
+ statusline #657b83
+ separator #586e75
+ focused_workspace #b58900 #b58900 #002b36
+ active_workspace #586e75 #586e75 #002b36
+ inactive_workspace #073642 #002b36 #839496
+ urgent_workspace #dc322f #dc322f #fdf6e3
}
}
# auto-start programs
-exec --no-startup-id urxvt -e tmux-utility.sh
+#exec --no-startup-id urxvt -e tmux-utility.sh
diff --git a/.i3/status b/.i3/status
@@ -1,7 +1,10 @@
general {
output_format = "i3bar"
colors = true
- interval = 5
+ interval = 2
+ color_good = "#859900"
+ color_bad = "#dc322f"
+ color_degraded = "#cb4b16"
}
#order += "ipv6"
@@ -28,10 +31,10 @@ ethernet eth0 {
}
volume master {
- format = "♪: %volume"
- device = "default"
- mixer = "Master"
- mixer_idx = 0
+ format = "V: %volume"
+ device = "default"
+ mixer = "Master"
+ mixer_idx = 0
}
battery 0 {
@@ -56,8 +59,8 @@ load {
}
cpu_usage {
-#color = "#00FF00"
- format = "%usage"
+ #color = "#00FF00"
+ format= "%usage"
}
disk "/" {
diff --git a/.vimperatorrc b/.vimperatorrc
@@ -1,7 +1,7 @@
""" VIMPERATOR Firefox plugin configuration
" see https://github.com/mashiro/dot-files/blob/master/.vimperatorrc
-colors phallus
+colors darkness2
highlight Bell display: none;
diff --git a/.vimrc b/.vimrc
@@ -28,7 +28,7 @@ Bundle 'scrooloose/syntastic'
Bundle 'kien/ctrlp.vim'
" solarized colorscheme
-"Bundle 'altercation/vim-colors-solarized'
+Bundle 'altercation/vim-colors-solarized'
" modify surrounding characters in pairs
Bundle 'tpope/vim-surround'
@@ -65,10 +65,11 @@ syntax on
" Select non-default syntax colorscheme. Found in /usr/share/vim/vim72/colors/
set background=dark " adjust colors for better contrast
-colorscheme desert
-"colorscheme solarized
-"call togglebg#map("<F3>")
-let g:airline_theme = 'ubaryd'
+"colorscheme desert
+colorscheme solarized
+call togglebg#map("<F3>")
+"let g:airline_theme = 'ubaryd'
+let g:airline_theme = 'solarized'
" hilight column 80
set textwidth=80
@@ -115,14 +116,14 @@ else
endif
" vim-airline
-let g:airline_symbols = {}
-let g:airline_left_sep = '⮀'
-let g:airline_left_alt_sep = '⮁'
-let g:airline_right_sep = '⮂'
-let g:airline_right_alt_sep = '⮃'
-let g:airline_symbols.branch = '⭠'
-let g:airline_symbols.readonly = '⭤'
-let g:airline_symbols.linenr = '⭡'
+"let g:airline_symbols = {}
+"let g:airline_left_sep = '⮀'
+"let g:airline_left_alt_sep = '⮁'
+"let g:airline_right_sep = '⮂'
+"let g:airline_right_alt_sep = '⮃'
+"let g:airline_symbols.branch = '⭠'
+"let g:airline_symbols.readonly = '⭤'
+"let g:airline_symbols.linenr = '⭡'
" Powerline symbols, fancy needs a patched/edited font
let g:Powerline_symbols = 'unicode'
diff --git a/.xinitrc b/.xinitrc
@@ -45,6 +45,7 @@ xset m 3/2 4
# Load local fonts
xset +fp ~/.fonts
+xset +fp /usr/share/fonts/local
xset fp rehash
#fc-cache
#fc-cache -fv
@@ -90,7 +91,8 @@ fi
# Start screensaver daemon
/usr/bin/xscreensaver -no-splash &
-#exec i3
+exec i3
+#exec herbstluftwm --locked
-sxhkd &
-exec bspwm
+#sxhkd &
+#exec bspwm
