Permalink
Browse files

add nvm bash-completion

  • Loading branch information...
1 parent 6b0c4ab commit 87094a3106ebb2580cf04e05dd3061f48fab6fa7 @nouh committed Aug 30, 2013
Showing with 38 additions and 27 deletions.
  1. +8 −0 Xresources
  2. +1 −1 dircolors-solarized
  3. +1 −1 oh-my-zsh
  4. +1 −1 tmux-powerline
  5. +16 −17 xinitrc
  6. +1 −1 z
  7. +1 −1 zsh-powerline-theme
  8. +9 −5 zshrc
View
@@ -187,6 +187,14 @@ URxvt.borderLess:False
URxvt.transparent: true
URxvt.shading: 30
+!URxvt.font:xft:Monaco For Powerline:pixelsize=14:antialias=true,xft:文泉驿等宽正黑:size=12:style=Regular:antialias=true
+!URxvt.boldfont:xft:Monaco For Powerline:pixelsize=14:Bold:antialias=true,xft:文泉驿等宽正黑:size=12:style=Bold:antialias=true
+!URxvt*font: xft:Monaco for Powerline:regular:size=12
+!URxvt*imFont: xft:Monaco for Powerline:regular:size=12
+!URxvt*boldFont: xft:Monaco for Powerline:bold:size=12
+!URxvt*italicFont: xft:Monaco for Powerline:italic:size=12
+!URxvt*boldItalicFont: xft:Monaco for Powerline:bold:italic:size=12
+
URxvt.font:xft:Inconsolata for Powerline:pixelsize=16:antialias=true,xft:文泉驿等宽微米黑:size=12:style=Regular:antialias=true
URxvt.boldfont:xft:Inconsolata for Powerline:pixelsize=16:Bold:antialias=true,xft:文泉驿等宽微米黑:size=12:style=Bold:antialias=true
URxvt*font: xft:Inconsolata for Powerline:regular:size=14
Submodule oh-my-zsh updated 123 files
View
33 xinitrc
@@ -3,28 +3,27 @@
# ~/.xinitrc
#
# Executed by startx (run your window manager from here)
-
-
-xrandr --output LVDS --auto
-xrandr --output HDMI-0 --right-of LVDS --auto
-
-export XMODIFIERS=@im=ibus
-export GTK_IM_MODULE=ibus
-export QT_IM_MODULE=ibus
-
-ibus-daemon -x -d
+export GTK_IM_MODULE=fcitx
+export QT_IM_MODULE=fcitx
+export XMODIFIERS="@im=fcitx"
xsetroot -cursor_name left_ptr
+xset +fp /usr/share/fonts/local
+xset fp rehash
xrdb -merge $HOME/.Xresources
-xmodmap $HOME/.Xmodmap
-exec awesome > $HOME/.cache/awesome/stdout 2> $HOME/.cache/awesome/stderr
+xmodmap $HOME/.Xmodmap &
+#compton -cGb # add fancy shadows
+#unclutter -idle 5 & # hide mouse cursor
+urxvtd -q -f -o
-#export XMODIFIERS=@im=fcitx
-#export GTK_IM_MODULE=fcitx
-#export QT_IM_MODULE=fcitx
-#killall fcitx
-#fcitx &
+fcitx -d
+syndaemon -t -k -i 2 -d & #disable track pad while typing
+eval $(cat ~/.fehbg) #set wallpaper
+exec $HOME/bin/monsterwm2bar
+#ibus-daemon -x -d
+#exec enlightenment_start
+# exec awesome > $HOME/.cache/awesome/stdout 2> $HOME/.cache/awesome/stderr
# exec gnome-session
# exec startkde
# exec startxfce4
2 z
Submodule z updated 3 files
+8 −13 README
+6 −13 z.1
+198 −215 z.sh
View
14 zshrc
@@ -6,7 +6,7 @@ ZSH_THEME="crunch"
DISABLE_AUTO_UPDATE="true"
COMPLETION_WAITING_DOTS="true"
-plugins=(debian vagrant gem git pip npm history-substring-search sublime composer pear)
+plugins=(rbenv debian vagrant gem git pip npm history-substring-search sublime composer pear)
source $ZSH/oh-my-zsh.sh
source ~/Dotfile/z/z.sh
@@ -16,16 +16,16 @@ unsetopt correct_all
typeset -U PATH
+export PATH="$HOME/.rvm/bin:$PATH" # Add RVM to PATH for scripting
export PATH="$HOME/bin:$PATH"
export PATH="/usr/local/sbin:/usr/local/bin:$PATH"
-#export PATH="/usr/local/share/npm/bin:$PATH"
-#export PATH="/Applications/Postgres.app/Contents/MacOS/bin:$PATH"
# initialize rbenv
if which rbenv > /dev/null; then eval "$(rbenv init -)"; fi
# initialize nvm
[[ -s $HOME/.nvm/nvm.sh ]] && . $HOME/.nvm/nvm.sh # This loads NVM
+[[ -r $NVM_DIR/bash_completion ]] && . $NVM_DIR/bash_completion
export LANG=en_US.UTF-8
export LC_ALL=en_US.UTF-8
@@ -45,12 +45,13 @@ setopt inc_append_history
setopt share_history
if [ $PLATFORM = "Linux" ]; then
- archey&
+ archey
export EDITOR="vim"
alias xrdb="xrdb ~/.Xdefaults"
alias ls='ls --color=auto'
alias awesomerc='vim ~/.config/awesome/rc.lua'
alias xmod='xmodmap ~/.Xmodmap'
+ export EDITOR="vim"
eval `dircolors ~/Dotfile/dircolors-solarized/dircolors.256dark`
alias emacs="/usr/bin/emacs -nw"
alias emacsclient="/usr/bin/emacsclient"
@@ -70,6 +71,10 @@ fi
alias zshrc="vim ~/.zshrc"
alias szrc="source ~/.zshrc"
+alias emacs="/usr/bin/emacs -nw"
+alias emacsclient="/usr/bin/emacsclient"
+alias e="emacsclient -t"
+alias ec="emacsclient -c"
alias vimrc="vim ~/.vimrc"
alias fishrc="vim ~/.config/fish/config.fish"
alias gitrc="vim ~/.gitconfig"
@@ -114,4 +119,3 @@ bindkey -M vicmd 'j' history-substring-search-down
#bindkey -v
#bindkey jk vi-cmd-mode
-PATH=$PATH:$HOME/.rvm/bin # Add RVM to PATH for scripting

0 comments on commit 87094a3

Please sign in to comment.