From c16b670cd82ca3bbb415a453c4e68922d1b97ea8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=2E=20Fernando=20S=C3=A1nchez?= Date: Wed, 18 Dec 2013 10:46:01 +0100 Subject: [PATCH] Added GPG + turtle/n3 --- Xresources | 23 +++++++- bin/i3-secondary-to-primary | 10 ++++ i3/config | 6 +++ vim/syntax/n3.vim | 102 ++++++++++++++++++++++++++++++++++++ vimrc | 52 +++++++++++++++++- zshrc | 8 ++- 6 files changed, 196 insertions(+), 5 deletions(-) create mode 100755 bin/i3-secondary-to-primary create mode 100644 vim/syntax/n3.vim diff --git a/Xresources b/Xresources index 8a4583a..836cd1d 100644 --- a/Xresources +++ b/Xresources @@ -52,7 +52,7 @@ URxvt.cursorUnderline: false ! Pointer URxvt.pointerBlank: true -!!Source http://github.com/altercation/solarized +!!!Source http://github.com/altercation/solarized *background: #002b36 *foreground: #657b83 @@ -93,3 +93,24 @@ URxvt.pointerBlank: true !! white dark/light *color7: #eee8d5 *color15: #fdf6e3 + +! Tomorrow-Night +!*foreground: #c5c8c6 +!*background: #1d1f21 +!*cursorColor: #aeafad +!*color0: #000000 +!*color1: #912226 +!*color2: #778900 +!*color3: #ae7b00 +!*color4: #1d2594 +!*color5: #682a9b +!*color6: #2b6651 +!*color7: #929593 +!*color8: #666666 +!*color9: #cc6666 +!*color10: #b5bd68 +!*color11: #f0c674 +!*color12: #81a2be +!*color13: #b294bb +!*color14: #8abeb7 +!*color15: #ecebec diff --git a/bin/i3-secondary-to-primary b/bin/i3-secondary-to-primary new file mode 100755 index 0000000..c852847 --- /dev/null +++ b/bin/i3-secondary-to-primary @@ -0,0 +1,10 @@ +#!/bin/sh +i3-msg 'workspace "1: Term" output eDP1' +i3-msg 'workspace "2: Web" output eDP1' +i3-msg 'workspace "3: Edit" output eDP1' +i3-msg 'workspace "4: Viewer" output DP1' +i3-msg 'workspace "5: Files" output DP1' +i3-msg 'workspace "6: Music" output DP1' +i3-msg 'workspace "7: Chat" output DP1' +i3-msg 'workspace "8: Misc Big" output eDP1' +i3-msg 'workspace "9: Misc Small" output DP1' diff --git a/i3/config b/i3/config index 664531f..37fd9e2 100644 --- a/i3/config +++ b/i3/config @@ -55,6 +55,11 @@ bindsym Mod1+F2 exec dmenu_run -fn "-*-cure-medium-*-*-*-11-*-*-*-*-*-*-*" -nb # Arandr magic bindsym Mod1+F5 exec dual-monitor bindsym Mod1+F6 exec single-monitor +bindsym Mod1+F7 exec i3-secondary-to-primary + +# Move to displays +bindsym $mod+Mod1+l move workspace to output right +bindsym $mod+Mod1+h move workspace to output left # change focus bindsym $mod+h focus left @@ -219,5 +224,6 @@ exec --no-startup-id nm-applet exec --no-startup-id dropbox start exec --no-startup-id volti exec --no-startup-id clipit +exec --no-startup-id syndaemon -i 0.5 -d exec xautolock -time 10 -locker 'i3lock -t -c 000000 -i ~/Pictures/Wallpapers/Game\ Over\ Hacker.png' & exec urxvt -e tmux attach diff --git a/vim/syntax/n3.vim b/vim/syntax/n3.vim new file mode 100644 index 0000000..b7a09cd --- /dev/null +++ b/vim/syntax/n3.vim @@ -0,0 +1,102 @@ +" Vim syntax file +" Language: RDF Notation 3 +" Version: 1.1 +" SeeAlso: +" Maintainer: Niklas Lindstrom +" Created: 2004-03-24 +" Updated: 2006-01-12 + +" TODO: +" * string value specials +" * fix XML Literal syntax (triplequoutes PLUS ^^rdfs:XMLLiteral) +" * "@"-prefix of verbs (?) +" * grouping e.g. statements to ebable folding, error checking etc. + + +if version < 600 + syntax clear +elseif exists("b:current_syntax") + finish +endif + + +syn keyword n3Verb a has is of +syn match n3Separator "[][;,)(}{^!]" +syn match n3EndStatement "\." +syn match n3Declaration "@keywords\|@prefix" +syn match n3Quantifier "@forAll\|@forSome" +"syn match n3LName "\(:\?\)\@<=[a-zA-Z_][a-zA-Z0-9_]*" +syn match n3ClassName "\(:\?\)\@<=[A-Z][a-zA-Z0-9_-]*" +syn match n3PropertyName "\(:\?\)\@<=[a-z][a-zA-Z0-9_-]*" +syn match n3Prefix "\([a-zA-Z_][a-zA-Z0-9_]*\)\?:" +syn match n3Comment "#.*$" contains=n3Todo +syn keyword n3Todo TODO FIXME XXX contained +syn match n3Deprecated "@this" + +" URI:s, strings, numbers, variables +syn match n3Number "[-+]\?[0-9]\+\(\.[0-9]\+\)\?\(e[-+]\?[0-9]\+\)\?" +syn match n3Variable "?[a-zA-Z_][a-zA-Z0-9_]*" +syn region n3URI matchgroup=n3URI start=+<+ end=+>+ skip=+\\\\\|\\"+ contains=n3URITokens +" TODO: n3URITokens +syn region n3String matchgroup=n3StringDelim start=+"+ end=+"+ skip=+\\\\\|\\"+ contains=n3Escape +" TODO: n3Escape + +syn match n3Verb "<=\|=>\|=" + +" Lang notation +syn match n3Langcode +\("\s*\)\@<=@[a-zA-Z0-9]\+\(-[a-zA-Z0-9]\+\)\?+ + +" Type notation +syn match n3Datatype +\("\s*\)\@<=^^+ +" TODO: then follows: explicituri | qname + +" XMLLiterals +" FIXME: make this work regardless of if this script resides in runtime or .vim/syntax +if filereadable(expand(":p:h")."/xml.vim") + unlet! b:current_syntax + syn include @n3XMLLiteral :p:h/xml.vim + syn region n3XMLLiteralRegion matchgroup=n3StringDelim start=+"""+ end=+"""+ contains=@n3XMLLiteral +endif + + +" Highlight Links + +if version >= 508 || !exists("did_n3_syn_inits") + if version <= 508 + let did_n3_syn_inits = 1 + command -nargs=+ HiLink hi link + else + command -nargs=+ HiLink hi def link + endif + + " The default methods for highlighting. Can be overridden later + HiLink n3Verb keyword + HiLink n3Quantifier keyword + HiLink n3Separator Operator + HiLink n3EndStatement Special + "hi n3EndStatement gui=underline,bold " TODO: just remove? + HiLink n3Declaration PreCondit + HiLink n3Prefix Special + "HiLink n3LName Normal + HiLink n3ClassName Type + HiLink n3PropertyName Function + HiLink n3Comment Comment + HiLink n3Todo Todo + HiLink n3Deprecated Error + HiLink n3Number Number + HiLink n3Variable Identifier + HiLink n3URI Label + HiLink n3String String + HiLink n3StringDelim Constant + HiLink n3Langcode Type + HiLink n3Datatype Type + HiLink n3XMLLiteralRegion String + + delcommand HiLink +endif + + +let b:current_syntax = "n3" + + +" EOF diff --git a/vimrc b/vimrc index df1ca7e..4fb3c0e 100644 --- a/vimrc +++ b/vimrc @@ -30,6 +30,9 @@ Bundle "kien/ctrlp.vim.git" Bundle "klen/python-mode" Bundle "flazz/vim-colorschemes" Bundle "Lokaltog/vim-distinguished" +Bundle "jamessan/vim-gnupg" +Bundle "Lokaltog/vim-easymotion" +"Bundle "fholgado/minibufexpl.vim" filetype plugin indent on " required! @@ -39,9 +42,11 @@ highlight SpecialKey ctermfg=DarkGray set listchars=tab:>-,trail:~ set list set tabstop=4 +set softtabstop=4 set shiftwidth=4 autocmd BufRead *.py set smartindent cinwords=if,elif,else,for,while,try,except,finally,def,class au FileType py set textwidth=79 +au FileType html set tabstop=2 shiftwidth=2 autocmd Filetype javascript set ts=4 sts=4 sw=4 expandtab smartindent cinwords=if,elif,else,for,while,try,except,finally,def,class set expandtab set smarttab @@ -50,7 +55,6 @@ set smartindent syntax on set ignorecase set smartcase -set softtabstop=4 set number "set paste set mouse=a @@ -126,7 +130,7 @@ set sessionoptions+=resize,winpos " Color and shit set t_Co=256 set background=dark -colo solarized +colo solarized "hi SpellBad ctermfg=Red "Statusline @@ -159,3 +163,47 @@ let g:ctrlp_cmd = 'CtrlPMRU' set guifont=DejaVu\ Sans\ Mono set foldmethod=syntax + +" Matching for html +if !exists('g:loaded_matchit') && findfile('plugin/matchit.vim', &rtp) ==# '' + runtime! macros/matchit.vim +endif + +"""""""""""""""""""" +" GnuPG Extensions " +"""""""""""""""""""" + +" Tell the GnuPG plugin to armor new files. +let g:GPGPreferArmor=1 + +" Tell the GnuPG plugin to sign new files. +let g:GPGPreferSign=1 + +augroup GnuPGExtra +" Set extra file options. + autocmd BufReadCmd,FileReadCmd *.\(gpg\|asc\|pgp\) call SetGPGOptions() +" Automatically close unmodified files after inactivity. + autocmd CursorHold *.\(gpg\|asc\|pgp\) quit +augroup END + +" RDF Notation 3 Syntax +augroup filetypedetect + au BufNewFile,BufRead *.n3 setfiletype n3 + au BufNewFile,BufRead *.ttl setfiletype n3 +augroup END + + +function SetGPGOptions() +" Set updatetime to 1 minute. + set updatetime=60000 +" Fold at markers. + "set foldmethod=marker + setlocal foldmethod=expr + setlocal foldexpr=(getline(v:lnum)=~'^$')?-1:((indent(v:lnum)'.indent(v:lnum+1)):indent(v:lnum)) + set foldtext=getline(v:foldstart) + +" Automatically close all folds. + set foldclose=all +" Only open folds with insert commands. + set foldopen=insert +endfunction diff --git a/zshrc b/zshrc index 7d5cca7..814467b 100644 --- a/zshrc +++ b/zshrc @@ -44,13 +44,17 @@ source $ZSH/oh-my-zsh.sh #bindkey "^R" history-incremental-search-backward # Customize to your needs... +autoload -U zmv +alias mmv='noglob zmv -W' PYTHONSTARTUP=~/.pythonrc.py export PYTHONSTARTUP -ssh-add -l >/dev/null || alias ssh='ssh-add -l >/dev/null || ssh-add && unalias ssh; ssh' +ssh-add -l >/dev/null || alias ssh='ssh-add -l >/dev/null || ssh-add && unalias ssh; ssh'; alias mosh='ssh-add -l >/dev/null || ssh-add && unalias mosh; mosh' ### Added by the Heroku Toolbelt -export PATH="$PATH:/usr/local/heroku/bin" +export PATH="$PATH:/usr/local/heroku/bin:$HOME/.cabal/bin" + +setopt extended_glob ### Get RVM to work with zsh [[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm"