From 1c0377c89809ed7c75b9bae17b4f9987a5a5fdb6 Mon Sep 17 00:00:00 2001 From: "Christophe Buffenoir (kirua)" Date: Tue, 1 Dec 2015 01:02:09 +0100 Subject: [PATCH] New vim config / new mate numix theme --- common/.vim/colors/lucius.vim | 343 ------------------------- common/.vim/syntax/renpy.vim | 141 ---------- common/.vimrc | 4 +- graphic/.themes/numix-mate/index.theme | 12 + update-home.sh | 30 ++- 5 files changed, 42 insertions(+), 488 deletions(-) delete mode 100644 common/.vim/colors/lucius.vim delete mode 100644 common/.vim/syntax/renpy.vim create mode 100644 graphic/.themes/numix-mate/index.theme diff --git a/common/.vim/colors/lucius.vim b/common/.vim/colors/lucius.vim deleted file mode 100644 index dfeee79..0000000 --- a/common/.vim/colors/lucius.vim +++ /dev/null @@ -1,343 +0,0 @@ -" Vim color file -" Maintainer: Jonathan Filip -" Last Modified: Wed Apr 01, 2009 10:03AM -" Version: 2.5 -" -" GUI / 256 color terminal -" -" I started out trying to combine my favorite parts of other schemes and ended -" up with this (oceandeep, moria, peaksea, wombat, zenburn). -" -" This file also tries to have descriptive comments for each higlighting group -" so it is easy to understand what each part does. - - -set background=dark -hi clear -if exists("syntax_on") - syntax reset -endif -let g:colors_name="lucius" - -" blue: 3eb8e5 -" green: 92d400 - - -" Base color -" ---------- -hi Normal guifg=#bcbcbc guibg=NONE -hi Normal ctermfg=250 ctermbg=NONE - - -" Comment Group -" ------------- -" any comment -hi Comment guifg=#808080 gui=none -hi Comment ctermfg=243 cterm=none - - -" Constant Group -" -------------- -" any constant -hi Constant guifg=#50d6de gui=none -hi Constant ctermfg=80 cterm=none -" strings -hi String guifg=#8ad6f2 gui=none -hi String ctermfg=117 cterm=none -" character constant -hi Character guifg=#8ad6f2 gui=none -hi Character ctermfg=117 cterm=none -" numbers decimal/hex -hi Number guifg=#50d6de gui=none -hi Number ctermfg=80 cterm=none -" true, false -hi Boolean guifg=#50d6de gui=none -hi Boolean ctermfg=80 cterm=none -" float -hi Float guifg=#50d6de gui=none -hi Float ctermfg=80 cterm=none - - -" Identifier Group -" ---------------- -" any variable name -hi Identifier guifg=#fcb666 gui=none -hi Identifier ctermfg=215 cterm=none -" function, method, class -hi Function guifg=#fcb666 gui=none -hi Function ctermfg=215 cterm=none - - -" Statement Group -" --------------- -" any statement -hi Statement guifg=#bae682 gui=none -hi Statement ctermfg=150 cterm=none -" if, then, else -hi Conditional guifg=#bae682 gui=none -hi Conditional ctermfg=150 cterm=none -" try, catch, throw, raise -hi Exception guifg=#bae682 gui=none -hi Exception ctermfg=150 cterm=none -" for, while, do -hi Repeat guifg=#bae682 gui=none -hi Repeat ctermfg=150 cterm=none -" case, default -hi Label guifg=#bae682 gui=none -hi Label ctermfg=150 cterm=none -" sizeof, +, * -hi Operator guifg=#bae682 gui=bold -hi Operator ctermfg=150 cterm=bold -" any other keyword -hi Keyword guifg=#bae682 gui=bold -hi Keyword ctermfg=150 cterm=bold - - -" Preprocessor Group -" ------------------ -" generic preprocessor -hi PreProc guifg=#efefaf gui=none -hi PreProc ctermfg=229 cterm=none -" #include -hi Include guifg=#efefaf gui=none -hi Include ctermfg=229 cterm=none -" #define -hi Define guifg=#efefaf gui=none -hi Define ctermfg=229 cterm=none -" same as define -hi Macro guifg=#efefaf gui=none -hi Macro ctermfg=229 cterm=none -" #if, #else, #endif -hi PreCondit guifg=#efefaf gui=none -hi PreCondit ctermfg=229 cterm=none - - -" Type Group -" ---------- -" int, long, char -hi Type guifg=#93e690 gui=none -hi Type ctermfg=114 cterm=none -" static, register, volative -hi StorageClass guifg=#93e690 gui=none -hi StorageClass ctermfg=114 cterm=none -" struct, union, enum -hi Structure guifg=#93e690 gui=none -hi Structure ctermfg=114 cterm=none -" typedef -hi Typedef guifg=#93e690 gui=none -hi Typedef ctermfg=114 cterm=none - - -" Special Group -" ------------- -" any special symbol -hi Special guifg=#cfafcf gui=none -hi Special ctermfg=182 cterm=none -" special character in a constant -hi SpecialChar guifg=#cfafcf gui=none -hi SpecialChar ctermfg=182 cterm=none -" things you can CTRL-] -hi Tag guifg=#cfafcf gui=none -hi Tag ctermfg=182 cterm=none -" character that needs attention -hi Delimiter guifg=#cfafcf gui=none -hi Delimiter ctermfg=182 cterm=none -" special things inside a comment -hi SpecialComment guifg=#cfafcf gui=none -hi SpecialComment ctermfg=182 cterm=none -" debugging statements -hi Debug guifg=#cfafcf guibg=NONE gui=none -hi Debug ctermfg=182 ctermbg=NONE cterm=none - - -" Underlined Group -" ---------------- -" text that stands out, html links -hi Underlined guifg=fg gui=underline -hi Underlined ctermfg=fg cterm=underline - - -" Ignore Group -" ------------ -" left blank, hidden -hi Ignore guifg=#000000 -hi Ignore ctermfg=black - - -" Error Group -" ----------- -" any erroneous construct -hi Error guifg=#dd4040 guibg=NONE gui=none -hi Error ctermfg=160 ctermbg=NONE cterm=none - - -" Todo Group -" ---------- -" todo, fixme, note, xxx -hi Todo guifg=#deee33 guibg=NONE gui=underline -hi Todo ctermfg=190 ctermbg=NONE cterm=underline - - -" Spelling -" -------- -" word not recognized -hi SpellBad guisp=#ee0000 gui=undercurl -hi SpellBad ctermfg=9 ctermbg=NONE cterm=undercurl -" word not capitalized -hi SpellCap guisp=#eeee00 gui=undercurl -hi SpellCap ctermfg=12 ctermbg=NONE cterm=undercurl -" rare word -hi SpellRare guisp=#ffa500 gui=undercurl -hi SpellRare ctermfg=13 ctermbg=NONE cterm=undercurl -" wrong spelling for selected region -hi SpellLocal guisp=#ffa500 gui=undercurl -hi SpellLocal ctermfg=14 ctermbg=NONE cterm=undercurl - - -" Cursor -" ------ -" character under the cursor -hi Cursor guifg=#080808 guibg=#8ac6f2 -hi Cursor ctermfg=232 ctermbg=117 -" like cursor, but used when in IME mode -hi CursorIM guifg=#080808 guibg=#96cdcd -hi CursorIM ctermfg=232 ctermbg=116 -" cursor column -hi CursorColumn guibg=#3d3d4d -hi CursorColumn cterm=NONE ctermbg=236 -" cursor line/row -hi CursorLine guibg=#3d3d4d -hi CursorLine cterm=NONE ctermbg=236 - -hi ColorColumn guibg=#181818 -hi ColorColumn cterm=None ctermbg=233 - - -" Misc -" ---- -" directory names and other special names in listings -hi Directory guifg=#95e494 gui=none -hi Directory ctermfg=114 cterm=none -" error messages on the command line -hi ErrorMsg guifg=#ee0000 guibg=NONE gui=none -hi ErrorMsg ctermfg=196 ctermbg=NONE cterm=none -" column separating vertically split windows -hi VertSplit guifg=#777777 guibg=#444444 gui=none -hi VertSplit ctermfg=244 ctermbg=238 cterm=none -" columns where signs are displayed (used in IDEs) -hi SignColumn guifg=#9fafaf guibg=#181818 gui=none -hi SignColumn ctermfg=145 ctermbg=233 cterm=none -" line numbers -hi LineNr guifg=#857b6f guibg=#444444 -hi LineNr ctermfg=101 ctermbg=238 -" match parenthesis, brackets -hi MatchParen guifg=#00ff00 guibg=NONE gui=none -hi MatchParen ctermfg=46 ctermbg=NONE cterm=none -" text showing what mode you are in -hi MoreMsg guifg=#2e8b57 gui=none -hi MoreMsg ctermfg=29 cterm=none -" the '~' and '@' and showbreak, '>' double wide char doesn't fit on line -hi ModeMsg guifg=#90ee90 guibg=NONE gui=none -hi ModeMsg ctermfg=120 ctermbg=NONE cterm=none -" the 'more' prompt when output takes more than one line -hi NonText guifg=#444444 gui=none -hi NonText ctermfg=238 cterm=none -" the hit-enter prompt (show more output) and yes/no questions -hi Question guifg=fg gui=none -hi Question ctermfg=fg cterm=none -" meta and special keys used with map, unprintable characters -hi SpecialKey guifg=#505050 -hi SpecialKey ctermfg=238 -" titles for output from :set all, :autocmd, etc -hi Title guifg=#3eb8e5 gui=none -hi Title ctermfg=38 cterm=none -"hi Title guifg=#5ec8e5 gui=none -" warning messages -hi WarningMsg guifg=#e5786d gui=none -hi WarningMsg ctermfg=173 cterm=none -" current match in the wildmenu completion -hi WildMenu guifg=#000000 guibg=#cae682 -hi WildMenu ctermfg=16 ctermbg=186 - - -" Diff -" ---- -" added line -hi DiffAdd guifg=fg guibg=#008b8b -hi DiffAdd ctermfg=fg ctermbg=30 -" changed line -hi DiffChange guifg=fg guibg=#008b00 -hi DiffChange ctermfg=fg ctermbg=28 -" deleted line -hi DiffDelete guifg=fg guibg=#000000 -hi DiffDelete ctermfg=fg ctermbg=16 -" changed text within line -hi DiffText guifg=fg -hi DiffText ctermfg=fg - - -" Folds -" ----- -" line used for closed folds -hi Folded guifg=#a0a8b0 guibg=#404040 gui=none -hi Folded ctermfg=145 ctermbg=238 cterm=none -" column on side used to indicated open and closed folds -hi FoldColumn guifg=#b0d0e0 guibg=#080808 gui=none -hi FoldColumn ctermfg=152 ctermbg=232 cterm=none - -" Search -" ------ -" highlight incremental search text; also highlight text replaced with :s///c -hi IncSearch guifg=#66ffff gui=reverse -hi IncSearch ctermfg=87 cterm=reverse -" hlsearch (last search pattern), also used for quickfix -hi Search guibg=#ffaa33 gui=none -hi Search ctermbg=214 cterm=none - -" Popup Menu -" ---------- -" normal item in popup -hi Pmenu guifg=#f6f3e8 guibg=#444444 gui=none -hi Pmenu ctermfg=254 ctermbg=238 cterm=none -" selected item in popup -hi PmenuSel guifg=#000000 guibg=#cae682 gui=none -hi PmenuSel ctermfg=16 ctermbg=186 cterm=none -" scrollbar in popup -hi PMenuSbar guibg=#607b8b gui=none -hi PMenuSbar ctermbg=66 cterm=none -" thumb of the scrollbar in the popup -hi PMenuThumb guibg=#aaaaaa gui=none -hi PMenuThumb ctermbg=247 cterm=none - - -" Status Line -" ----------- -" status line for current window -hi StatusLine guifg=#e0e0e0 guibg=#444444 gui=none -hi StatusLine ctermfg=254 ctermbg=238 cterm=none -" status line for non-current windows -hi StatusLineNC guifg=#777777 guibg=#444444 gui=none -hi StatusLineNC ctermfg=244 ctermbg=238 cterm=none - - -" Tab Lines -" --------- -" tab pages line, not active tab page label -hi TabLine guifg=#b6bf98 guibg=#181818 gui=none -hi TabLine ctermfg=244 ctermbg=233 cterm=none -" tab pages line, where there are no labels -hi TabLineFill guifg=#cfcfaf guibg=#181818 gui=none -hi TabLineFill ctermfg=187 ctermbg=233 cterm=none -" tab pages line, active tab page label -hi TabLineSel guifg=#efefef guibg=#1c1c1b gui=none -hi TabLineSel ctermfg=254 ctermbg=233 cterm=none - -" Visual -" ------ -" visual mode selection -hi Visual guifg=NONE guibg=#444444 -hi Visual ctermfg=NONE ctermbg=238 -" visual mode selection when vim is 'not owning the selection' (x11 only) -hi VisualNOS guifg=fg gui=underline -hi VisualNOS ctermfg=fg cterm=underline - diff --git a/common/.vim/syntax/renpy.vim b/common/.vim/syntax/renpy.vim deleted file mode 100644 index 05bd893..0000000 --- a/common/.vim/syntax/renpy.vim +++ /dev/null @@ -1,141 +0,0 @@ -" Vim syntax file -" Language: Renpy script -" Maintainer: MusashiAharon -" Last Change: 2011 Oct 9 -" Features: Spell-checking (must enable), auto-indenting, TODOs, string tags and interpolations - -" Based on work by Spiky Caterpillar, http://spikycaterpillar.com/renpy.vim - - -if version < 600 - syntax clear -elseif exists("b:current_syntax") - finish -endif - -syn include @Python syntax/python.vim -unlet b:current_syntax - -" Hitting return in an indented section should autoindent four spaces -set tabstop=4 -set shiftwidth=4 -set expandtab - -" Numbers -syn match renpyNumber "-\?\d\+\(\.\d\+\)\?" -syn match renpyNumber "-\?\.\d\+" - -" Variable and label names -syn match renpyIdentifier "[_a-zA-Z][_a-zA-Z0-9]*" - -" String commands and escaped characters -syn match renpyEscape +\\['"%]+ contained -syn match renpyEscape +{/\?[ibsu]}+ contained -syn match renpyEscape +{/\?plain}+ contained -syn match renpyEscape +{\(p\|fast\|nw\|w\)}+ contained -syn match renpyEscape +{\(font\|a\|color\|w\)=[^}]*}+ contained -syn match renpyEscape +{/\(font\|a\|color\|w\)}+ contained -syn match renpyEscape +{/\?=[^}]*}+ contained -syn match renpyEscape +{{+ contained - -" New in Renpy 6.13: square-bracket string interpolation -syn region renpyEscape start=+\[+ end=+\]+ contained -syn match renpyEscape +\[\[+ contained - -" Strings -syn region renpyString start=+'+ end=+'+ skip=+\\'+ contains=renpyEscape,@Spell -syn region renpyString start=+"+ end=+"+ skip=+\\"+ contains=renpyEscape,@Spell - -" Comments -syn match renpyComment "#.*$" contains=renpyTodo,@Spell -syn keyword renpyTodo FIXME TODO NOTE NOTES XXX contained - -" Tabs not allowed in Renpy -syn match renpySpaceError "\t" - -" Operators, keywords and special functions -syn keyword renpyStatement init image python early transform -syn keyword renpyStatement hide show scene -syn keyword renpyStatement menu jump call -syn keyword renpyStatement define return -syn keyword renpyOperator with at from -syn keyword renpyOperator behind fadein fadeout expression -syn keyword renpyOperator channel frames loop alpha -syn keyword renpyOperator xpos ypos xanchor yanchor zoom xzoom yzoom xalign yalign -syn keyword renpyStatement play stop queue -syn keyword renpyOperator sound music -syn keyword renpyFunction Dissolve DynamicDisplayable Fade Fixed Frame -syn keyword renpyFunction Pause -syn keyword renpyFunction ImageDissolve Position RotoZoom -syn keyword renpyFunction Solid SplineMotion Style Text -syn match renpyStatement "label" display nextgroup=renpyIdentifier skipwhite - -" Special variables -syn keyword renpyBuiltin left right center -syn keyword renpyBuiltin moveinright moveinleft moveoutright moveoutleft -syn keyword renpyBuiltin moveoutbottom moveinbottom moveouttop moveintop -syn keyword renpyBuiltin bg black text pause linear -syn keyword renpyBuiltin dissolve fade hpunch vpunch rotate flip - - -" Python lines ($) -syn region pythonStatement start="\$" end="$" contains=@Python - -" Renpy-specific Python functions and variables -syn keyword pythonFunction Animation Character Null -syn keyword pythonFunction ShowingSwitch -syn match pythonFunction "anim\.\(Edge\|SMAnimation\|State\|TransitionAnimation\)" -syn match pythonFunction "anim\.Filmstrip" -syn match pythonFunction "im\.Composite" -syn match pythonFunction "im\.Crop" -syn match pythonFunction "im\.\(FactorScale\|Flip\|Grayscale\)" -syn match pythonFunction "im\.Image" -syn match pythonFunction "im\.MatrixColor" -syn match pythonFunction "im\.matrix\.\(brightness\|contrast\|hue\|invert\|saturation\)" -syn match pythonFunction "im\.Scale" -syn match pythonFunction "layout\.imagemap_main_menu" -syn match pythonFunction "layout\.button_menu" -syn match pythonFunction "renpy\.block_rollback" -syn match pythonFunction "renpy\.\(call_in_new_context\|curry\)" -syn match pythonFunction "renpy\.hide" -syn match pythonFunction "renpy\.\(jump_out_of_context\|jump\)" -syn match pythonFunction "renpy\.music\.\(play\|stop\|queue\|register_channel\|set_volume\)" -syn match pythonFunction "renpy\.pause" -syn match pythonFunction "renpy\.redraw" -syn match pythonFunction "renpy\.random\.\(choice\|randint\)" -syn match pythonFunction "renpy\.restart_interaction" -syn match pythonFunction "renpy\.\(scene\|show\)" -syn match pythonFunction "renpy\.showing" -syn match pythonFunction "renpy\.transition" -syn match pythonFunction "theme\.roundrect" -syn match pythonFunction "ui\.add" -syn match pythonFunction "ui\.\(bar\|button\)" -syn match pythonFunction "ui\.clear" -syn match pythonFunction "ui\.close" -syn match pythonFunction "ui\.\(fixed\|frame\|grid\)" -syn match pythonFunction "ui\.hbox" -syn match pythonFunction "ui\.image" -syn match pythonFunction "ui\.imagebutton" -syn match pythonFunction "ui\.imagemap" -syn match pythonFunction "ui\.interact" -syn match pythonFunction "ui\.\(keymap\|layer\)" -syn match pythonFunction "ui\.null" -syn match pythonFunction "ui\.remove" -syn match pythonFunction "ui\.returns" -syn match pythonFunction "ui\.text" -syn match pythonFunction "ui\.textbutton" -syn match pythonFunction "ui\.timer" -syn match pythonFunction "ui\.\(vbox\|window\)" - -hi def link renpyNumber Number -hi def link renpyString String -hi def link renpyEscape Special -hi def link renpyComment Comment -hi def link renpyTodo Todo -hi def link renpyStatement Statement -hi def link renpyFunction Function -hi def link renpyBuiltin Identifier -hi def link renpyOperator Operator -hi def link renpySpaceError Error - -let b:current_syntax = "renpy" diff --git a/common/.vimrc b/common/.vimrc index 222b837..b95a5ac 100644 --- a/common/.vimrc +++ b/common/.vimrc @@ -213,10 +213,10 @@ map :1;$ s/[\r \t]\+$// ""Supprimer les ^M dans vos fichiers avec la touche w map :1;$ s/\r//g -set rtp+=~/.local/lib/python3.4/site-packages/powerline/bindings/vim - set laststatus=2 " Always display the statusline in all windows "set noshowmode " Hide the default mode text (e.g. -- INSERT -- below the statusline) +let g:airline_powerline_fonts = 1 +let g:airline_theme = "term" if ! has('gui_running') set ttimeoutlen=10 diff --git a/graphic/.themes/numix-mate/index.theme b/graphic/.themes/numix-mate/index.theme new file mode 100644 index 0000000..b243ae0 --- /dev/null +++ b/graphic/.themes/numix-mate/index.theme @@ -0,0 +1,12 @@ +[Desktop Entry] +Name=numix-mate +Type=X-GNOME-Metatheme +Comment= + +[X-GNOME-Metatheme] +GtkTheme=Numix +MetacityTheme=Numix +IconTheme=Numix +GtkColorScheme=fg_color:#e528e528e528,bg_color:#610861086108,text_color:#ffffffffffff,base_color:#739c739c739c,selected_fg_color:#f9f9f9f9f9f9,selected_bg_color:#d6d649493737,tooltip_fg_color:#dededededede,tooltip_bg_color:#2d2d2d2d2d2d +CursorTheme=mate +CursorSize=24 diff --git a/update-home.sh b/update-home.sh index eca12fa..52f1fe9 100755 --- a/update-home.sh +++ b/update-home.sh @@ -19,6 +19,8 @@ touch ~/.zshrc-local pip3 install --upgrade --user jedi +pip3 install --upgrade --user vdirsyncer +pip3 install --upgrade --user khal pip3 install --upgrade --user git+git://github.com/Lokaltog/powerline pip install --upgrade --user git+git://github.com/Lokaltog/powerline pip install --upgrade --user pyCardDav @@ -114,8 +116,8 @@ rm -rf ~/.vim/bundle/closetag git clone https://github.com/vim-scripts/closetag.vim.git ~/.vim/bundle/closetag # Install css3 syntax -rm -rf ~/.vim/bundle/css3-mod -git clone https://github.com/vim-scripts/css3-mod.git ~/.vim/bundle/css3-mod +rm -rf ~/.vim/bundle/vim-css3-syntax +git clone https://github.com/hail2u/vim-css3-syntax ~/.vim/bundle/vim-css3-syntax # Install less syntax rm -rf ~/.vim/bundle/vim-less @@ -139,3 +141,27 @@ git clone https://github.com/godlygeek/csapprox.git ~/.vim/bundle/csapprox # Install support of coffeescript rm -rf ~/.vim/bundle/coffeescript git clone https://github.com/kchmck/vim-coffee-script.git ~/.vim/bundle/coffeescript + +# Install of multiple cursors +rm -rf ~/.vim/bundle/vim-multiple-cursors +git clone https://github.com/terryma/vim-multiple-cursors.git ~/.vim/bundle/vim-multiple-cursors + +# Install of HTML5 colors +rm -rf ~/.vim/bundle/html5.vim +git clone https://github.com/othree/html5.vim.git ~/.vim/bundle/html5.vim + +# Install vim airline +rm -rf ~/.vim/bundle/vim-airline +git clone https://github.com/bling/vim-airline ~/.vim/bundle/vim-airline + +# Install fugitive +rm -rf ~/.vim/bundle/fugitive +git clone https://github.com/tpope/vim-fugitive.git ~/.vim/bundle/fugitive + +# Install vim lucius +rm -rf ~/.vim/bundle/lucius +git clone https://github.com/jonathanfilip/vim-lucius.git ~/.vim/bundle/lucius + +# Install vim renpy +rm -rf ~/.vim/bundle/vim-renpy +git clone https://github.com/chaimleib/vim-renpy ~/.vim/bundle/vim-renpy