commit c5784e4d5561cc4a229a4ad39286138902abf0b2
parent 3814be475685727c31513526f4b326767cd021df
Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
Date: Sat, 4 Jan 2014 16:47:12 +0100
Changed X appearance
Diffstat:
6 files changed, 123 insertions(+), 202 deletions(-)
diff --git a/.Xdefaults b/.Xdefaults
@@ -1,197 +0,0 @@
-! Xcursor --------------------------------------------------------------------
-Xcursor.theme: Vanilla-DMZ-AA
-Xcursor.size: 22
-
-! terminal colors ------------------------------------------------------------
-
-!! tangoesque scheme
-!*background: #041621
-!*foreground: #babdb6
-!! Black (not tango) + DarkGrey
-!*color0: #000000
-!*color8: #555753
-!! DarkRed + Red
-!*color1: #ff6565
-!*color9: #ff8d8d
-!! DarkGreen + Green
-!*color2: #93d44f
-!*color10: #c8e7a8
-!! DarkYellow + Yellow
-!*color3: #eab93d
-!*color11: #ffc123
-!! DarkBlue + Blue
-!*color4: #204a87
-!*color12: #3465a4
-!! DarkMangenta + Mangenta
-!*color5: #ce5c00
-!*color13: #f57900
-!!DarkCyan + Cyan (both not tango)
-!*color6: #89b6e2
-!*color14: #46a4ff
-!! LightGrey + White
-!*color7: #cccccc
-!*color15: #ffffff
-
-! Solarized color scheme for the X Window System
-! http://ethanschoonover.com/solarized
-
-! Common
-#define S_yellow #b58900
-#define S_orange #cb4b16
-#define S_red #dc322f
-#define S_magenta #d33682
-#define S_violet #6c71c4
-#define S_blue #268bd2
-#define S_cyan #2aa198
-#define S_green #859900
-
-! Dark
-#define S_base03 #002b36
-#define S_base02 #073642
-#define S_base01 #586e75
-#define S_base00 #657b83
-#define S_base0 #839496
-#define S_base1 #93a1a1
-#define S_base2 #eee8d5
-#define S_base3 #fdf6e3
-
-! Light
-! #define S_base03 #fdf6e3
-! #define S_base02 #eee8d5
-! #define S_base01 #93a1a1
-! #define S_base00 #839496
-! #define S_base0 #657b83
-! #define S_base1 #586e75
-! #define S_base2 #073642
-! #define S_base3 #002b36
-
-! To only apply colors to your terminal, for example, prefix
-! the color assignment statement with its name. Example:
-! URxvt*background: S_base03
-URxvt*background: S_base03
-URxvt*foreground: S_base0
-!*fading: 40
-URxvt*fadeColor: S_base03
-!*cursorColor: S_base1
-URxvt*cursorColor: $DCDCCC
-URxvt*pointerColorBackground: S_base01
-URxvt*pointerColorForeground: S_base1
-
-URxvt*color0: S_base02
-URxvt*color1: S_red
-URxvt*color2: S_green
-URxvt*color3: S_yellow
-URxvt*color4: S_blue
-URxvt*color5: S_magenta
-URxvt*color6: S_cyan
-URxvt*color7: S_base2
-URxvt*color8: S_base03
-URxvt*color9: S_orange
-URxvt*color10: S_base01
-URxvt*color11: S_base00
-URxvt*color12: S_base0
-URxvt*color13: S_violet
-URxvt*color14: S_base1
-URxvt*color15: S_base3
-
-
-! xterm ----------------------------------------------------------------------
-!xterm*background: black
-!xterm*background: black
-!xterm*foreground: white
-xterm*termName: xterm-256color
-!xterm*geometry: 80x25
-!!xterm*faceName: terminus:bold:pixelsize=11
-!!!xterm*font: -*-dina-medium-r-*-*-16-*-*-*-*-*-*-*
-!xterm*faceName: SourceCodePro-Regular
-!xterm*faceSize: 11
-!xterm*font: 7x13
-!xterm*font: 8x15
-!!xterm*dynamicColors: true
-!!!xterm*metaSendsEscape: true
-!!!xterm*eightBitInput: false
-!!!xterm*eightBitControl: false
-!!!xterm*eightBitOutput: true
-
-!xterm*utf8: 1
-xterm*utf8: 2
-xterm*eightBitInput: true
-
-xterm*saveLines: 1024
-!xterm*scrollKey: true
-!xterm*scrollTtyOutput: false
-!!xterm*scrollBar: true
-!xterm*rightScrollBar: true
-!xterm*jumpScroll: true
-!xterm*multiScroll: true
-!xterm*toolBar: false
-
-! xpdf -----------------------------------------------------------------------
-xpdf*enableFreetype: yes
-xpdf*antialias: yes
-xpdf*foreground: black
-xpdf*background: white
-xpdf*matteColor: gray
-xpdf*urlCommand: /usr/bin/firefox %s
-
-! rxvt-unicode ---------------------------------------------------------------
-URxvt.termName:screen-256color
-!URxvt.termName:rxvt-256color
-!URxvt.transparent: true
-! URxvt.shading: 0 to 99 darkens, 101 to 200 lightens
-!URxvt.shading: 20
-! scrollbar style - rxvt (default), plain (most compact), next, or xterm
-!URxvt.scrollstyle: rxvt
-URxvt.internalBorder: 1
-!URxvt.loginShell: true
-URxvt.scrollBar: off
-!URxvt.font: 7x13euro
-!URxvf.font: 8x13
-! tabs and clickable URLs
-!URxvt.perl-ext-common: default,tabbed,matcher
-URxvt.perl-ext-common: default,matcher
-URxvt.urlLauncher: /usr/bin/firefox
-URxvt.matcher.button: 1
-! tab colors
-!URxvt.tabbed.tabbar-fg: 2
-!URxvt.tabbed.tabbar-bg: 0
-!URxvt.tabbed.tab-fg: 3
-!URxvt.tabbed.tab-bg: 0
-! colors
-!URxvt.foreground: White
-!URxvt.background: Black
-!URxvt.saveLines: 1024
-URxvt.meta8: True
-URxvt.intensityStyles: false
-!Xft.dpi: 81
-!Xft.dpi: 100
-!URxvt.font: xft:SourceCodePro-Light:pixelsize=11
-
-! xscreensaver ---------------------------------------------------------------
-!font settings
-xscreensaver.Dialog.headingFont: -*-dina-bold-r-*-*-12-*-*-*-*-*-*-*
-xscreensaver.Dialog.bodyFont: -*-dina-medium-r-*-*-12-*-*-*-*-*-*-*
-xscreensaver.Dialog.labelFont: -*-dina-medium-r-*-*-12-*-*-*-*-*-*-*
-xscreensaver.Dialog.unameFont: -*-dina-medium-r-*-*-12-*-*-*-*-*-*-*
-xscreensaver.Dialog.buttonFont: -*-dina-bold-r-*-*-12-*-*-*-*-*-*-*
-xscreensaver.Dialog.dateFont: -*-dina-medium-r-*-*-12-*-*-*-*-*-*-*
-xscreensaver.passwd.passwdFont: -*-dina-bold-r-*-*-12-*-*-*-*-*-*-*
-!general dialog box (affects main hostname, username, password text)
-xscreensaver.Dialog.foreground: #ffffff
-xscreensaver.Dialog.background: #111111
-xscreensaver.Dialog.topShadowColor: #111111
-xscreensaver.Dialog.bottomShadowColor: #111111
-xscreensaver.Dialog.Button.foreground: #666666
-xscreensaver.Dialog.Button.background: #ffffff
-!username/password input box and date text colour
-xscreensaver.Dialog.text.foreground: #666666
-xscreensaver.Dialog.text.background: #ffffff
-xscreensaver.Dialog.internalBorderWidth:24
-xscreensaver.Dialog.borderWidth: 20
-xscreensaver.Dialog.shadowThickness: 2
-!timeout bar (background is actually determined by Dialog.text.background)
-xscreensaver.passwd.thermometer.foreground: #ff0000
-xscreensaver.passwd.thermometer.background: #000000
-xscreensaver.passwd.thermometer.width: 8
-!datestamp format--see the strftime(3) manual page for details
-xscreensaver.dateFormat: %I:%M%P %a %b %d, %Y
diff --git a/.Xresources b/.Xresources
@@ -0,0 +1,114 @@
+! Xcursor --------------------------------------------------------------------
+Xcursor.theme: Vanilla-DMZ-AA
+Xcursor.size: 22
+
+! terminal colors ------------------------------------------------------------
+#include "/home/adc/.colors/solarized"
+
+! urxvt ----------------------------------------------------------------------
+urxvt*perl-lib: /usr/lib/urxvt/perl
+urxvt*perl-ext-common: default,matcher
+urxvt*perl-matcher: 1
+urxvt*matcher-button: 1
+urxvt*urlLauncher: /usr/bin/iceweasel
+!URxvt*matcher.button: 1
+!URxvt*matcher.pattern.1: \\bwww\\.[\\w-]\\.[\\w./?&@#-]*[\\w/-]
+urxvt*cursorUnderline: 1
+urxvt*letterspace: -5
+!urxvt*fading: 10
+!urxvt*fadeColor: #000000
+urxvt*cursorBlink: true
+urxvt*scrollBar: false
+urxvt*depth: 24
+urxvt*internalBorder: 1
+
+URxvt.meta8: True
+URxvt.intensityStyles: false
+!Xft.dpi: 81
+!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*font: -*-lemon-*-*-*-*-*-*-*-*-*-*-*-*
+!urxvt*boldFont: -*-lemon-*-*-*-*-*-*-*-*-*-*-*-*
+!urxvt*italicFont: -*-lemon-*-*-*-*-*-*-*-*-*-*-*-*
+!urxvt*bolditalicFont: -*-lemon-*-*-*-*-*-*-*-*-*-*-*-*
+
+urxvt*font: -*-uushi-*-*-*-*-*-*-*-*-*-*-*-*
+urxvt*boldFont: -*-uushi-*-*-*-*-*-*-*-*-*-*-*-*
+urxvt*italicFont: -*-uushi-*-*-*-*-*-*-*-*-*-*-*-*
+urxvt*bolditalicFont: -*-uushi-*-*-*-*-*-*-*-*-*-*-*-*
+
+! xterm ----------------------------------------------------------------------
+xterm*background: black
+!xterm*background: black
+xterm*foreground: white
+xterm*termName: xterm-256color
+!xterm*geometry: 80x25
+!!xterm*faceName: terminus:bold:pixelsize=11
+!!!xterm*font: -*-dina-medium-r-*-*-16-*-*-*-*-*-*-*
+!xterm*faceName: SourceCodePro-Regular
+!xterm*faceSize: 11
+!xterm*font: 7x13
+!xterm*font: 8x15
+!!xterm*dynamicColors: true
+!!!xterm*metaSendsEscape: true
+!!!xterm*eightBitInput: false
+!!!xterm*eightBitControl: false
+!!!xterm*eightBitOutput: true
+
+!xterm*utf8: 1
+xterm*utf8: 2
+xterm*eightBitInput: true
+
+xterm*saveLines: 1024
+!xterm*scrollKey: true
+!xterm*scrollTtyOutput: false
+!!xterm*scrollBar: true
+!xterm*rightScrollBar: true
+!xterm*jumpScroll: true
+!xterm*multiScroll: true
+!xterm*toolBar: false
+
+! xpdf -----------------------------------------------------------------------
+xpdf*enableFreetype: yes
+xpdf*antialias: yes
+xpdf*foreground: black
+xpdf*background: white
+xpdf*matteColor: gray
+xpdf*urlCommand: /usr/bin/firefox %s
+
+! xscreensaver ---------------------------------------------------------------
+!font settings
+xscreensaver.Dialog.headingFont: -*-dina-bold-r-*-*-12-*-*-*-*-*-*-*
+xscreensaver.Dialog.bodyFont: -*-dina-medium-r-*-*-12-*-*-*-*-*-*-*
+xscreensaver.Dialog.labelFont: -*-dina-medium-r-*-*-12-*-*-*-*-*-*-*
+xscreensaver.Dialog.unameFont: -*-dina-medium-r-*-*-12-*-*-*-*-*-*-*
+xscreensaver.Dialog.buttonFont: -*-dina-bold-r-*-*-12-*-*-*-*-*-*-*
+xscreensaver.Dialog.dateFont: -*-dina-medium-r-*-*-12-*-*-*-*-*-*-*
+xscreensaver.passwd.passwdFont: -*-dina-bold-r-*-*-12-*-*-*-*-*-*-*
+!general dialog box (affects main hostname, username, password text)
+xscreensaver.Dialog.foreground: #ffffff
+xscreensaver.Dialog.background: #111111
+xscreensaver.Dialog.topShadowColor: #111111
+xscreensaver.Dialog.bottomShadowColor: #111111
+xscreensaver.Dialog.Button.foreground: #666666
+xscreensaver.Dialog.Button.background: #ffffff
+!username/password input box and date text colour
+xscreensaver.Dialog.text.foreground: #666666
+xscreensaver.Dialog.text.background: #ffffff
+xscreensaver.Dialog.internalBorderWidth:24
+xscreensaver.Dialog.borderWidth: 20
+xscreensaver.Dialog.shadowThickness: 2
+!timeout bar (background is actually determined by Dialog.text.background)
+xscreensaver.passwd.thermometer.foreground: #ff0000
+xscreensaver.passwd.thermometer.background: #000000
+xscreensaver.passwd.thermometer.width: 8
+!datestamp format--see the strftime(3) manual page for details
+xscreensaver.dateFormat: %I:%M%P %a %b %d, %Y
diff --git a/.vimrc b/.vimrc
@@ -119,8 +119,8 @@ let g:airline_symbols.readonly = '⭤'
let g:airline_symbols.linenr = '⭡'
" Powerline symbols, fancy needs a patched/edited font
-"let g:Powerline_symbols = 'unicode'
-let g:Powerline_symbols = 'fancy'
+let g:Powerline_symbols = 'unicode'
+"let g:Powerline_symbols = 'fancy'
" Dictionary word completion using Ctrl-x Ctrl-k
" File from wordlist- (debian) or word- (arch) package
diff --git a/.xinitrc b/.xinitrc
@@ -18,7 +18,7 @@ xbindkeys
# Make sure this is before the 'exec' command or it won't be executed.
[ -f ~/.xprofile ] && . ~/.xprofile
-xrdb ~/.Xdefaults
+xrdb ~/.Xresources
# screen powersave
xset +dpms # Energy Star features on
diff --git a/create_symlinks.sh b/create_symlinks.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# Home folder dotfiles
-for F in .bashrc .vimrc .tmux.conf .xpdfrc .signature .Xdefaults .Xmodmap .xinitrc .xprofile .zshrc .conkyrc .xbindkeysrc .gitconfig .vimperatorrc; do
+for F in .bashrc .vimrc .tmux.conf .xpdfrc .signature .Xresources .Xmodmap .xinitrc .xprofile .zshrc .conkyrc .xbindkeysrc .gitconfig .vimperatorrc; do
SOURCE=$PWD/$F
TARGET=~/$F
@@ -14,7 +14,7 @@ for F in .bashrc .vimrc .tmux.conf .xpdfrc .signature .Xdefaults .Xmodmap .xinit
done
# Home folder dotfolders
-for F in .config/uzbl .config/awesome .config/luakit .config/openbox .i3 .mutt .ncmpcpp .vim .w3m; do
+for F in .colors .config/uzbl .config/awesome .config/luakit .config/openbox .i3 .mutt .ncmpcpp .vim .w3m; do
SOURCE=$PWD/$F
TARGET=~/$F
diff --git a/install.sh b/install.sh
@@ -7,5 +7,9 @@
mkdir -p $HOME/code && cd $HOME/code && \
git clone https://github.com/zsh-users/zsh-syntax-highlighting.git
+# Install fonts
+git clone https://github.com/phallus/fonts ~/code/phallus-fonts &&
+ cd ~/code/phallus-fonts && ./install
+
# Install Vundle
git clone https://github.com/gmarik/vundle.git ~/.vim/bundle/vundle
