diff options
| -rw-r--r-- | Xresources | 9 | ||||
| -rw-r--r-- | bookmarks | 9 | ||||
| -rw-r--r-- | latexmkrc | 1 | ||||
| -rw-r--r-- | mutt/muttrc | 1 | ||||
| -rw-r--r-- | vim/.netrwhist | 11 | ||||
| -rw-r--r-- | vimrc | 7 | ||||
| -rw-r--r-- | zshrc | 31 |
7 files changed, 41 insertions, 28 deletions
@@ -12,6 +12,10 @@ XTerm*selectToClipboard: true ! URXVT ! +! General settings +URxvt.loginShell : true +URxvt.termName : rxvt-256color + ! Custom META key URxvt*modifier: alt @@ -33,14 +37,11 @@ URxvt.keysym.M-p: perl:clipboard:paste URxvt.keysym.F11: perl:fullscreen:switch ! Appearance -! ! URxvt*font: xft:DejaVu Sans Mono:size=12 URxvt*font: xft:monaco:size=11:antialias=false URxvt*scrollBar: false URxvt*internalBorder: 0 - -! Cursor color -URxvt*cursorColor: Green +URxvt.borderColor: black ! True transparency URxvt.depth: 32 @@ -1,5 +1,8 @@ -code : /home/urbain/Dropbox/phd/code/spectral +report : /home/urbain/Dropbox/phd/reports/esa +phd : /home/urbain/Dropbox/phd dotfiles : /home/urbain/dotfiles +presentation : /home/urbain/Dropbox/phd/presentations/spectral paper : /home/urbain/Dropbox/phd/papers/spectral -phd : /home/urbain/Dropbox/phd -report : /home/urbain/Dropbox/phd/reports/esa +code : /home/urbain/Dropbox/phd/code/spectral +develop : /home/urbain/Dropbox/phd/code/spectral/develop +feature : /home/urbain/Dropbox/phd/code/spectral/feature @@ -3,4 +3,3 @@ $pdflatex = 'pdflatex --shell-escape'; $pdf_previewer = 'zathura -s -x "vim --servername SYNC --remote +%{line} %{input}" %O %S'; $clean_ext = "synctex.gz bbl pdf dvi"; $new_viewer_always [0]; - diff --git a/mutt/muttrc b/mutt/muttrc index 417c73e..b12a567 100644 --- a/mutt/muttrc +++ b/mutt/muttrc @@ -86,6 +86,7 @@ bind pager R group-reply # Source mutt solarized `[ "$COLORSCHEME" = "light" ] && echo source $HOME/github/mutt-colors-solarized/mutt-colors-solarized-light-16.muttrc || echo set` `[ "$COLORSCHEME" = "dark" ] && echo source $HOME/github/mutt-colors-solarized/mutt-colors-solarized-dark-16.muttrc || echo set` +`[ "$COLORSCHEME" = "default" ] && echo source $HOME/github/mutt-colors-solarized/mutt-colors-solarized-dark-16.muttrc || echo set` # Colors color index brightblue default "~f edfenergy" diff --git a/vim/.netrwhist b/vim/.netrwhist index 120d736..1fa25b1 100644 --- a/vim/.netrwhist +++ b/vim/.netrwhist @@ -1,7 +1,6 @@ let g:netrw_dirhistmax =10 -let g:netrw_dirhist_cnt =5 -let g:netrw_dirhist_1='/home/urbain/Dropbox/phd/code/spectral/feature' -let g:netrw_dirhist_2='/home/urbain/Dropbox/phd/code/spectral/feature/src' -let g:netrw_dirhist_3='/home/urbain/Dropbox/phd/code/spectral/develop/python' -let g:netrw_dirhist_4='/home/urbain/.antigen' -let g:netrw_dirhist_5='/home/urbain/dotfiles/mutt' +let g:netrw_dirhist_cnt =4 +let g:netrw_dirhist_1='/home/urbain/Dropbox/phd' +let g:netrw_dirhist_2='/home/urbain' +let g:netrw_dirhist_3='/home/urbain/Dropbox/phd/presentations/spectral' +let g:netrw_dirhist_4='/home/urbain/Dropbox/phd/code/spectral/feature/cpp/src' @@ -199,7 +199,7 @@ elseif $COLORSCHEME=="default" silent! colo seoul256 set background=dark endif - + highlight Comment cterm=italic set t_ZH=[3m set t_ZR=[23m @@ -207,9 +207,8 @@ set t_ZR=[23m "" Maps " Definition of leaders -let mapleader = "\\" -let maplocalleader = "-" -nmap <Space> <Leader> +let mapleader = " " +let maplocalleader = "\\" " New pages nnoremap <Leader>pe :tabedit @@ -13,11 +13,17 @@ if ! zgen saved; then zgen oh-my-zsh plugins/vi-mode zgen oh-my-zsh plugins/ubuntu zgen oh-my-zsh plugins/tmux + zgen oh-my-zsh plugins/themes # zsh-users plugins zgen load zsh-users/zsh-completions src zgen load zsh-users/zsh-syntax-highlighting + # Appearance + zgen load mafredri/zsh-async + zgen load sindresorhus/pure + # zgen oh-my-zsh themes/eastwood + # Other plugins zgen load rupa/z zgen load djui/alias-tips @@ -26,11 +32,6 @@ if ! zgen saved; then zgen load uvaes/fzf-marks zgen load joel-porquet/zsh-dircolors-solarized - # Appearance - # zgen load mafredri/zsh-async - # zgen load sindresorhus/pure - zgen oh-my-zsh themes/eastwood - # Save all to init script zgen save fi @@ -46,7 +47,6 @@ zle-line-init() { zle -N zle-line-init # Fzf-marks -bindkey '^g' fzf-marks-navigate # User configuration export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games" @@ -154,10 +154,10 @@ fi # Colors -export TERM=xterm-256color -export COLORSCHEME=dark +# export TERM=xterm-256color +export COLORSCHEME=defau -function cc { +function colo { # Change colors for current session $HOME/.bin/recolor.sh < ~/.Xresources.$1 @@ -169,7 +169,7 @@ function cc { export COLORSCHEME=$1 # Change default environment variable for future sessions - sed -i "s/^export COLORSCHEME=.*$/export COLORSCHEME=$1/g" ~/dotfiles/.zshrc + sed -i --follow-symlinks "s/^export COLORSCHEME=.*$/export COLORSCHEME=$1/g" ~/dotfiles/zshrc } # Fix tmux colors @@ -182,3 +182,14 @@ if [[ -n ${TMUX} && -n ${commands[tmux]} ]];then TERM=screen esac fi + + +# Z +unalias z 2> /dev/null +z() { + if [[ -z "$*" ]]; then + cd "$(_z -l 2>&1 | fzf-tmux +s --tac | sed 's/^[0-9,.]* *//')" + else + _z "$@" + fi +} |