Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

solve conflicts

  • Loading branch information...
commit 1920f92042a0a16324e7e64dc52ecfe1a19211a3 1 parent 671c405
zach zhao authored
Showing with 173 additions and 135 deletions.
  1. +10 −4 Xmodmap
  2. +131 −94 Xresources
  3. +2 −0  gitconfig
  4. +5 −19 tmux.conf
  5. +14 −14 vimrc
  6. +11 −4 zshrc
14 Xmodmap
View
@@ -1,9 +1,15 @@
!Exchange left Alt and left Win
-remove mod1 = Alt_L
-remove mod4 = Super_L
-add mod1 = Super_L
-add mod4 = Alt_L
+!remove mod1 = Alt_L
+!remove mod4 = Super_L
+!add mod1 = Super_L
+!add mod4 = Alt_L
+!remove mod1 = Alt_R
+!remove mod4 = Super_R
+!add mod1 = Super_R
+!add mod4 = Alt_R
+!remove mod3 = Alt_R
+!add mod4 = Alt_R
!Turn Caps_lock to another Ctrl
remove Lock = Caps_Lock
remove Control = Control_L
225 Xresources
View
@@ -10,55 +10,55 @@ Xft.hintstyle: hintslight
!TomorrowNight Theme
!!-------------------------------------------------------------------------------
-!#define t_background #1d1f21
-!#define t_current_line #282a2e
-!#define t_selection #373b41
-!#define t_foreground #c5c8c6
-!#define t_comment #969896
-!#define t_red #cc6666
-!#define t_orange #de935f
-!#define t_yellow #f0c674
-!#define t_green #b5bd68
-!#define t_aqua #8abeb7
-!#define t_blue #81a2be
-!#define t_purple #b294bb
-
-
-!*.foreground: t_foreground
-!*.background: t_background
-!*.cursorColor: #aeafad
-
-!! Black / Grey
-!*.color0: #000000
-!*.color8: #666666
-
-!! Red / Bright Red
-!*.color1: t_red
-!*.color9: #FF3334
-
-!! Green + Bright Green
-!*.color2: t_green
-!*.color10: #9ec400
-
-!! Yellow (Orange) + Bright Yellow (Yellow)
-!*.color3: t_orange
-!*.color11: t_yellow
-
-!! Blue + Bright Blue
-!*.color4: t_blue
-!*.color12: t_blue
-
-!! Magenta (Purple) + Bright Magenta
-!*.color5: t_purple
-!*.color13: #b777e0
-
-!! Cyan (Aqua) + Bright Cyan
-!*.color6: t_aqua
-!*.color14: #54ced6
-
-!! Light Grey (Selection) + White (Current Line)
-!*.color7: t_selection
-!*.color15: t_current_line
+#define t_background #1d1f21
+#define t_current_line #282a2e
+#define t_selection #373b41
+#define t_foreground #c5c8c6
+#define t_comment #969896
+#define t_red #cc6666
+#define t_orange #de935f
+#define t_yellow #f0c674
+#define t_green #b5bd68
+#define t_aqua #8abeb7
+#define t_blue #81a2be
+#define t_purple #b294bb
+
+
+*.foreground: t_foreground
+*.background: t_background
+*.cursorColor: #aeafad
+
+! Black / Grey
+*.color0: #000000
+*.color8: #666666
+
+! Red / Bright Red
+*.color1: t_red
+*.color9: #FF3334
+
+! Green + Bright Green
+*.color2: t_green
+*.color10: #9ec400
+
+! Yellow (Orange) + Bright Yellow (Yellow)
+*.color3: t_orange
+*.color11: t_yellow
+
+! Blue + Bright Blue
+*.color4: t_blue
+*.color12: t_blue
+
+! Magenta (Purple) + Bright Magenta
+*.color5: t_purple
+*.color13: #b777e0
+
+! Cyan (Aqua) + Bright Cyan
+*.color6: t_aqua
+*.color14: #54ced6
+
+! Light Grey (Selection) + White (Current Line)
+*.color7: t_selection
+*.color15: t_current_line
! Solarized Theme
!!-------------------------------------------------------------------------------
@@ -87,78 +87,88 @@ Xft.hintstyle: hintslight
!*pointerColorBackground:S_base01
!*pointerColorForeground:S_base1
-!!! black dark/light
+! black dark/light
!*color0: S_base02
!*color8: S_base03
-!!!! red dark/light
+!! red dark/light
!*color1: S_red
!*color9: S_orange
-!!!! green dark/light
+!! green dark/light
!*color2: S_green
!*color10: S_base01
-!!!! yellow dark/light
+!! yellow dark/light
!*color3: S_yellow
!*color11: S_base00
-!!!! blue dark/light
+!! blue dark/light
!*color4: S_blue
!*color12: S_base0
-!!!! magenta dark/light
+!! magenta dark/light
!*color5: S_magenta
!*color13: S_violet
-!!!! cyan dark/light
+!! cyan dark/light
!*color6: S_cyan
!*color14: S_base1
-!!!! white dark/light
+!! white dark/light
!*color7: S_base2
!*color15: S_base3
-
! Zenburn Theme
!!-------------------------------------------------------------------------------
-*foreground: #dcdccc
-*background: #2f2f2f
-*colorUL: #c5f779
-*underlineColor: #c5f779
-
-*color0: #3f3f3f
-*color1: #705050
-*color2: #60b48a
-*color3: #dfaf8f
-*color4: #506070
-*color5: #dc8cc3
-*color6: #8cd0d3
-*color7: #DCDCCC
-
-*color8: #709080
-*color9: #cc9393
-*color10: #7f9f7f
-*color11: #f0dfaf
-*color12: #94bff3
-*color13: #ec93d3
-*color14: #93e0e3
-*color15: #ffffff
+!*foreground: #dcdccc
+!*background: #2f2f2f
+!*colorUL: #c5f779
+!*underlineColor: #c5f779
+
+!*color0: #3f3f3f
+!*color1: #705050
+!*color2: #60b48a
+!*color3: #dfaf8f
+!*color4: #506070
+!*color5: #dc8cc3
+!*color6: #8cd0d3
+!*color7: #DCDCCC
+
+!*color8: #709080
+!*color9: #cc9393
+!*color10: #7f9f7f
+!*color11: #f0dfaf
+!*color12: #94bff3
+!*color13: #ec93d3
+!*color14: #93e0e3
+!*color15: #ffffff
!-------------------------------------------------------------------------------
!! URxvt settings
!-------------------------------------------------------------------------------
+URxvt*loginShell: true
URxvt*termName: rxvt-256color
URxvt*xftAntialias: true
+URxvt.perl-ext-common:default,clipboard,url-select,keyboard-select
+
+URxvt.keysym.M-Tab: perl:keyboard-select:activate
+URxvt.keysym.M-s: perl:keyboard-select:search
+
+URxvt.url-select.launcher:google-chrome
+URxvt.clipboard.autocopy: true
+URxvt.keysym.M-u: perl:url-select:select_next
-URxvt.urlLauncher:google-chrome
-!URxvt.matcher.button:1
-URxvt.perl-ext-common:default,clipboard,url-select,keyboard-select,matcher
-!URxvt.tabbed.tab-fg:12
-!URxvt.tabbed.tab-bg:0
-!URxvt.tabbed.tabber:4
-URxvt.iconFile:/home/zach/Icons/Terminal.png
+URxvt.keysym.M-c: perl:clipboard:copy
+URxvt.keysym.M-v: perl:clipboard:paste
+URxvt.keysym.M-C-v: perl:clipboard:paste_escaped
+URxvt.clipboard.copycmd: xclip -i -selection clipboard
+URxvt.clipboard.pastecmd: xclip -o -selection clipboard
+
+URxvt.tabbed.tab-fg:12
+URxvt.tabbed.tab-bg:0
+URxvt.tabbed.tabber:4
URxvt.scrollBar:True
URxvt.scrollBar_right:True
@@ -177,13 +187,10 @@ URxvt.borderLess:False
!URxvt.transparent: true
!URxvt.shading: 99
-URxvt.font:xft:Monaco For Powerline:pixelsize=15:antialias=true,xft:文泉驿等宽正黑:size=12:style=Regular:antialias=true
-URxvt.boldfont:xft:Monaco For Powerline:pixelsize=15: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: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*boldFont: xft:Monaco for Powerline:bold:size=12
!-------------------------------------------------------------------------------
@@ -238,3 +245,33 @@ Xterm*color15: #FFFFFF
!-------------------------------------------------------------------------------
Xcursor.theme: Neutral_Plus
Xcursor.size: 22
+
+! 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
2  gitconfig
View
@@ -111,3 +111,5 @@
protocol = https
[apply]
whitespace = nowarn
+[credential]
+ helper = cache --timeout=3600
24 tmux.conf
View
@@ -18,21 +18,6 @@ set -g mouse-select-pane on
# status bar
set-option -g status-utf8 on
-# default statusbar colors
-#set -g status-fg white
-#set -g status-bg default
-#set -g status-attr bright
-
-# default window title colors
-#set-window-option -g window-status-fg white
-#set-window-option -g window-status-bg default
-#set-window-option -g window-status-attr dim
-
-# active window title colors
-#set-window-option -g window-status-current-fg white
-#set-window-option -g window-status-current-bg default
-#set-window-option -g window-status-current-attr bright
-
### COLOUR (Solarized dark)
# default statusbar colors
@@ -73,17 +58,18 @@ set -g status-left-length 20
set -g status-right-length 140
set -g status-left '#[fg=green]#H #[fg=black]•'
set -g status-right '#[fg=green,bg=black,bright]#(tmux-mem-cpu-load 1) #[fg=red,dim]#(uptime | cut -f 4-5 -d " " | cut -f 1 -d ",") #[fg=blue]%a%l:%M:%S %p#[default] #[fg=blue]%Y-%m-%d'
+
# set-option -g status-left-length 80
# set-option -g status-right-length 70
# set-option -g status-left "#(~/Dotfile/tmux-powerline/powerline.sh left)"
# set-option -g status-right "#(~/Dotfile/tmux-powerline/powerline.sh right)"
-
-set-option -g default-command "reattach-to-user-namespace -l zsh"
+# set-option -g default-command "reattach-to-user-namespace -l zsh"
# paste clipboard into tmux buffer
-bind v run-shell "reattach-to-user-namespace -l zsh -c 'tmux set-buffer \\"$(pbpaste)\\"; tmux paste-buffer'"
+# bind v run-shell "reattach-to-user-namespace -l zsh -c 'tmux set-buffer \\"$(pbpaste)\\"; tmux paste-buffer'"
# put tmux buffer into x clipboard
-bind y run-shell "reattach-to-user-namespace -l zsh -c 'tmux show-buffer | pbcopy'"
+# bind y run-shell "reattach-to-user-namespace -l zsh -c 'tmux show-buffer | pbcopy'"
+
# easily toggle synchronization (mnemonic: e is for echo)
# sends input to all panes in a given window.
28 vimrc
View
@@ -49,7 +49,7 @@ Bundle 'scrooloose/nerdtree'
Bundle 'scrooloose/syntastic'
" from tpope
-Bundle 'tpope/vim-rbenv'
+" Bundle 'tpope/vim-rbenv'
Bundle 'tpope/vim-tbone'
Bundle 'tpope/vim-eunuch'
Bundle 'tpope/vim-commentary'
@@ -190,8 +190,7 @@ if MySys() == "mac"
elseif MySys() == "windows"
set gfn=Bitstream\ Vera\ Sans\ Mono:h10
elseif MySys() == "linux"
- set gfn=Monospace\ 10
- set shell=/bin/zsh
+ set gfn=Monaco\ for\ Powerline\ 10
endif
if has("gui_running")
@@ -201,17 +200,18 @@ if has("gui_running")
if MySys() == "mac"
colorscheme solarized
elseif MySys() == "linux"
- colorscheme Tomorrow-Night
+ colorscheme zenburn
endif
-else
- set background=dark
+ELSE
+ "SET T_cO=16
if MySys() == "mac"
colorscheme Tomorrow-Night
-
elseif MySys() == "linux"
colorscheme Tomorrow-Night
endif
+ set background=dark
endif
+colorscheme Tomorrow-Night
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
" => Encodings and Filetypes and Menus
@@ -500,13 +500,6 @@ nmap <leader>cw :cw 10<cr>
nmap <leader>lw :lw<cr>
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" => Gundo
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-"nnoremap <leader>g :GundoToggle<CR>
-"let g:gundo_right = 1
-"let g:gundo_preview_bottom = 1
-
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
" => Tagbar
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
let g:tagbar_usearrows = 1
@@ -578,6 +571,7 @@ let g:delimitMate_expand_cr = 1
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
let g:indent_guides_auto_colors = 1
let g:indent_guides_guide_size = 1
+nnoremap <silent> <leader>i :IndentGuidesToggle<CR>
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
" => Tabular
@@ -667,3 +661,9 @@ let g:UltiSnipsListSnippets="<c-l>"
"let g:multi_cursor_prev_key='<C-k>'
"let g:multi_cursor_skip_key='<C-x>'
"let g:multi_cursor_quit_key='<C-[>'
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" => vim-session
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+let g:miniBufExplMapCTabSwitchWindows = 1
+"let g:miniBufExplMapCTabSwitchBufs = 1
15 zshrc
View
@@ -5,7 +5,7 @@ ZSH_THEME="nanotech"
DISABLE_AUTO_UPDATE="true"
COMPLETION_WAITING_DOTS="true"
-plugins=(vagrant powder gem git rails3 pip brew gem npm history-substring-search sublime composer pear)
+plugins=(debian vagrant gem git pip npm history-substring-search sublime composer pear)
source $ZSH/oh-my-zsh.sh
source ~/Dotfile/z/z.sh
@@ -17,14 +17,14 @@ typeset -U PATH
export PATH="$HOME/bin:$PATH"
export PATH="/usr/local/sbin:/usr/local/bin:$PATH"
-export PATH="/usr/local/share/npm/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 /Users/zach/.nvm/nvm.sh ]] && . /Users/zach/.nvm/nvm.sh # This loads NVM
+[[ -s $HOME/.nvm/nvm.sh ]] && . $HOME/.nvm/nvm.sh # This loads NVM
export LANG=en_US.UTF-8
export LC_ALL=en_US.UTF-8
@@ -35,7 +35,6 @@ export TERM=xterm-256color
# setup platform
export PLATFORM=`uname`
-export GOPATH="$HOME/gocode"
export GOBIN="$HOME/gocode/bin"
export PATH="$GOBIN:$PATH"
@@ -50,6 +49,11 @@ if [ $PLATFORM = "Linux" ]; then
alias awesomerc='vim ~/.config/awesome/rc.lua'
alias xmod='xmodmap ~/.Xmodmap'
eval `dircolors ~/Dotfile/dircolors-solarized/dircolors.256dark`
+ alias emacs="/usr/bin/emacs -nw"
+ alias emacsclient="/usr/bin/emacsclient"
+ alias e="emacsclient -t"
+ alias ec="emacsclient -c"
+ alias ep2conf="sudo vim /etc/apache2/sites-enabled/eportal.com"
else
export EDITOR="mvim -v"
alias emacs="/usr/local/Cellar/emacs/24.3/Emacs.app/Contents/MacOS/Emacs -nw"
@@ -60,6 +64,7 @@ else
alias ls='gls --color=auto'
eval `gdircolors ~/Dotfile/dircolors-solarized/dircolors.256dark`
fi
+
alias zshrc="vim ~/.zshrc"
alias szrc="source ~/.zshrc"
alias vimrc="vim ~/.vimrc"
@@ -98,3 +103,5 @@ function cdl { cd $1; ls; }
#bindkey '^S' history-incremental-search-forward
#bindkey '^P' history-search-backward
#bindkey '^N' history-search-forward
+
+PATH=$PATH:$HOME/.rvm/bin # Add RVM to PATH for scripting
Please sign in to comment.
Something went wrong with that request. Please try again.