Skip to content

Commit

Permalink
Yeah
Browse files Browse the repository at this point in the history
  • Loading branch information
rstacruz committed Jun 9, 2015
1 parent eb3631f commit 9505ab0
Show file tree
Hide file tree
Showing 12 changed files with 199 additions and 19 deletions.
6 changes: 6 additions & 0 deletions UltiSnips/javascript.snippets
Expand Up @@ -57,3 +57,9 @@ snippet umd! "universal module loader with deps" b

}))
endsnippet

snippet forof "for"
for (const ${2:item} of ${1:list}) {
${VISUAL}$0
}
endsnippet
11 changes: 11 additions & 0 deletions UltiSnips/text.snippets
@@ -0,0 +1,11 @@
snippet vimhelp "vim help text"
*${1:hello}.txt* ${2:asynchronous execution plugin for Vim}

==============================================================================
INTRODUCTION *$1*

*$1* is $2.

==============================================================================
vim:tw=78:ts=8:ft=help:norl:
endsnippet
6 changes: 6 additions & 0 deletions _highlight_test/javascript.js
@@ -0,0 +1,6 @@
function createNode(params) {
if (typeof x === 'undefined') {
this.control();
};
return true;
}
12 changes: 12 additions & 0 deletions _highlight_test/ruby.rb
@@ -0,0 +1,12 @@
class MyClass < ApplicationController
include EventManager

before_filter :authenticate_user!

# Returns something t osomeone
def index
@var = User.find(params[:affiliate_program_id])
@affiliate = Affiliate.new
end
end

6 changes: 4 additions & 2 deletions bin/restore
@@ -1,6 +1,6 @@
#!/bin/sh
# Generated by vim-plug
# Sun May 31 13:18:44 2015
# Sun May 31 22:51:23 2015

vim +PlugUpdate +qa

Expand Down Expand Up @@ -29,6 +29,7 @@ cd $PLUG_HOME/vim-airline/ && git reset --hard 67de5f2
cd $PLUG_HOME/vim-autotag/ && git reset --hard 22ebd96
cd $PLUG_HOME/vim-bracketed-paste/ && git reset --hard 36779ba
cd $PLUG_HOME/vim-bundler/ && git reset --hard 207e213
cd $PLUG_HOME/vim-closer/ && git reset --hard 69ba062
cd $PLUG_HOME/vim-coffee-script/ && git reset --hard 32fe889
cd $PLUG_HOME/vim-colors/ && git reset --hard 9522f2f
cd $PLUG_HOME/vim-commentary/ && git reset --hard 9c68513
Expand All @@ -42,7 +43,7 @@ cd $PLUG_HOME/vim-fish/ && git reset --hard 825853f
cd $PLUG_HOME/vim-fugitive/ && git reset --hard 21b6dd7
cd $PLUG_HOME/vim-gotham/ && git reset --hard 6486e10
cd $PLUG_HOME/vim-haml/ && git reset --hard 204e327
cd $PLUG_HOME/vim-hyperstyle/ && git reset --hard ba9483b
cd $PLUG_HOME/vim-hyperstyle/ && git reset --hard 67662a0
cd $PLUG_HOME/vim-indent-object/ && git reset --hard 78fffa6
cd $PLUG_HOME/vim-jade/ && git reset --hard 0aa231c
cd $PLUG_HOME/vim-javascript/ && git reset --hard 8a409f7
Expand All @@ -56,6 +57,7 @@ cd $PLUG_HOME/vim-pathogen/ && git reset --hard b9fb0df
cd $PLUG_HOME/vim-projectionist/ && git reset --hard d6e419c
cd $PLUG_HOME/vim-python-combined/ && git reset --hard 3f7aefa
cd $PLUG_HOME/vim-rails/ && git reset --hard 6092275
cd $PLUG_HOME/vim-remux/ && git reset --hard 218e94a
cd $PLUG_HOME/vim-repeat/ && git reset --hard 7a6675f
cd $PLUG_HOME/vim-sensible/ && git reset --hard d0beb8a
cd $PLUG_HOME/vim-signify/ && git reset --hard a05b780
Expand Down
65 changes: 65 additions & 0 deletions colors/lol.vim
@@ -0,0 +1,65 @@
set background=dark
hi clear
if exists("syntax_on") | syntax reset | endif
let g:colors_name = "lol"

" Main colors
hi! _normal ctermfg=none ctermbg=none
hi! _mute ctermfg=black ctermbg=none

" Base colors
hi! _base0 ctermfg=DarkCyan
hi! _base1 ctermfg=5
hi! _base2 ctermfg=13
hi! _base3 ctermfg=Cyan

" Accent colors
hi! _accent1 ctermfg=LightGreen
hi! _accent2 ctermfg=White
hi! _red ctermfg=Red

hi! _highlight cterm=underline ctermbg=black gui=underline

" General colors
hi! link Normal _normal
hi! link NonText _mute
hi! link LineNr _mute
hi! link Statement _mute " class, return, ...
hi! link Ignore _mute " ?
hi! link Search _highlight " search highlight
hi! link Comment _base0 " comments
hi! link Constant _base1 " string, chars, bool, ...
hi! link Special _base1 " prototype, doctags, throw
hi! link Operator _base2 " ( ) = typeof
hi! link PreProc _base2 " require, include
hi! link Identifier _base3 " @instancevars, vim vars
hi! link Type _accent1 " ClassName
hi! link Function _accent2 " builtin functions, function names
hi! link Repeat _accent2 " ?
hi! link Cursor _mute
hi! link Error _red
hi! link Todo _red

" Common groups that link to default highlighting.
" You can specify other highlighting easily.
hi! link String Constant
hi! link Character Constant
hi! link Number Constant
hi! link Boolean Constant
hi! link Float Number
hi! link Conditional Repeat
hi! link Label Statement
hi! link Keyword Statement
hi! link Exception Statement
hi! link Include PreProc
hi! link Define PreProc
hi! link Macro PreProc
hi! link PreCondit PreProc
hi! link StorageClass Type
hi! link Structure Type
hi! link Typedef Type
hi! link Tag Special
hi! link SpecialChar Special
hi! link Delimiter Special
hi! link SpecialComment Special
hi! link Debug Special
6 changes: 6 additions & 0 deletions plugin/customizations.vim
Expand Up @@ -77,3 +77,9 @@ autocmd Filetype ruby setlocal foldmethod=manual
"

nnoremap <Enter> :
"
" Useful for creating color schemes
"

nmap <Leader>ss :echo map(synstack(line('.'), col('.')), 'synIDattr(v:val, "name")')<CR>
35 changes: 35 additions & 0 deletions plugin/number-switch.vim
@@ -0,0 +1,35 @@
augroup numberswitch
au!
au FileType javascript,ruby,python
\ call <SID>set_number_switch()
augroup END

function! s:set_number_switch()
" makes symbols easier to type, no shift key needed
imap <buffer> 1 !
imap <buffer> 2 @
imap <buffer> 3 #
imap <buffer> 4 $
imap <buffer> 5 %
imap <buffer> 6 ^
imap <buffer> 7 &
imap <buffer> 8 *
imap <buffer> 9 (
imap <buffer> 0 )
" hold alt to get the numbers
inoremap <buffer> ¡ 1
inoremap <buffer> 2
inoremap <buffer> £ 3
inoremap <buffer> ¢ 4
inoremap <buffer> 5
inoremap <buffer> § 6
inoremap <buffer> 7
inoremap <buffer> 8
inoremap <buffer> ª 9
inoremap <buffer> º 0
" no shift key for curly braces
inoremap <buffer> [[ {
inoremap <buffer> ]] }
endfunction
12 changes: 7 additions & 5 deletions plugin/theme.vim
Expand Up @@ -9,10 +9,12 @@ let g:airline_theme='solarized'
"

if !has("gui_running")
set t_Co=256
set background=light
color elflord
color lol
hi VertSplit cterm=none ctermbg=none
hi NonText ctermfg=11
hi Conceal ctermbg=none ctermfg=1
endif

"
Expand All @@ -26,15 +28,15 @@ if has("gui_running") && (has("gui_macvim") || has("gui_vimr"))
set guioptions+=m " menu bar
set guioptions+=e " nice gui tabs

color Tomorrow-Night
color gotham

set antialias
" set guifont=Envy\ Code\ R\ for\ Powerline:h13 noantialias linespace=0
set guifont=InputMonoNarrow:h12 linespace=3
" set guifont=InputMonoNarrow:h12 linespace=3
let g:airline_theme='base16'
" set guifont=Monaco:h12 linespace=0
set guifont=Monaco:h12 linespace=0
" set guifont=Inconsolata:h14 linespace=0
" set guifont=Menlo:h12 linespace=0
" set guifont=Ubuntu\ Mono:h14 linespace=0
" set guifont=Droid\ Sans\ Mono:h10 linespace=1
endif

12 changes: 0 additions & 12 deletions plugin/tmux.vim

This file was deleted.

45 changes: 45 additions & 0 deletions plugin/z-javascript-functions.vim
@@ -0,0 +1,45 @@
augroup javascript_shortcuts
au!
au FileType javascript call <SID>set_js_shortcuts()
au FileType javascript set conceallevel=2
augroup END

function! s:set_js_shortcuts()
inoremap <buffer> @. this.
imap <buffer> fn( function (
imap <buffer> fn() function ()
imap <buffer> fn(){ function () {
imap <buffer> fn()[ function () {
imap <buffer> fn()<Space>{ function () {
imap <buffer> fn()<Space>[ function () {
imap <buffer> function()[ function () {
imap <buffer> function()<Space>[ function () {
imap <buffer> fn<Space>( function (
imap <buffer> fn<Space>() function ()
imap <buffer> fn<Space>(){ function () {
imap <buffer> fn<Space>()[ function () {
imap <buffer> fn<Space>()<Space>{ function () {
imap <buffer> fn<Space>()<Space>[ function () {
imap <buffer> function<Space>()[ function () {
imap <buffer> function<Space>()<Space>[ function () {
imap <buffer> fn9 function (
imap <buffer> fn90 function ()
imap <buffer> fn90{ function () {
imap <buffer> fn90[ function () {
imap <buffer> fn90<Space>{ function () {
imap <buffer> fn90<Space>[ function () {
imap <buffer> function90[ function () {
imap <buffer> function90<Space>[ function () {
imap <buffer> fn<Space>9 function (
imap <buffer> fn<Space>90 function ()
imap <buffer> fn<Space>90{ function () {
imap <buffer> fn<Space>90[ function () {
imap <buffer> fn<Space>90<Space>{ function () {
imap <buffer> fn<Space>90<Space>[ function () {
imap <buffer> function<Space>90[ function () {
imap <buffer> function<Space>90<Space>[ function () {
endfunction
2 changes: 2 additions & 0 deletions vimrc.vim
Expand Up @@ -46,6 +46,8 @@ if $VIM_MINIMAL == ''
Plug 'rstacruz/named-media-queries'
Plug 'rstacruz/vim-hyperstyle'
Plug 'rstacruz/vim-opinion'
Plug 'rstacruz/vim-closer'
Plug 'rstacruz/vim-remux'
Plug 'scrooloose/syntastic'
Plug 'sjl/vitality.vim'
Plug 'terryma/vim-multiple-cursors'
Expand Down

0 comments on commit 9505ab0

Please sign in to comment.