Skip to content

Commit

Permalink
Firefox style update for VimFX
Browse files Browse the repository at this point in the history
Signed-off-by: Tomas Slusny <[email protected]>
  • Loading branch information
deathbeam committed Jan 20, 2017
1 parent a43217d commit c31de32
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 6 deletions.
3 changes: 3 additions & 0 deletions dotfiles/gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ tags
.tags
.tags1
gtags.files
tags.lock
tags.temp
GTAGS
GRTAGS
GPATH
Expand All @@ -41,5 +43,6 @@ Session.vim
*~

# Misc
.editorconfig
.yangcp/
nohup.out
4 changes: 1 addition & 3 deletions dotfiles/tmux.conf
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,6 @@
# Clear screen fix
bind C-l send-keys 'C-l'

# Pipe entire current buffer to vim and load copied text to tmux buffer
bind e run-shell 'tmux capture-pane -S - && tmux split-window -v "tmux show-buffer | sed \'/^\s*$/d\' | reattach-to-user-namespace view - +$ +\"set clipboard=unnamed\"; reattach-to-user-namespace pbpaste | tmux load-buffer -"'
# }}}

# User interface {{{
Expand Down Expand Up @@ -103,6 +100,7 @@

# Plugins {{{

run-shell "$DOTHOME/lib/tmux/custom.tmux"
run-shell "$DOTHOME/lib/tmux/tmux-sensible/sensible.tmux"
run-shell "$DOTHOME/lib/tmux/vim-tmux-navigator/vim-tmux-navigator.tmux"
run-shell "$DOTHOME/lib/tmux/tmux-yank/yank.tmux"
Expand Down
9 changes: 9 additions & 0 deletions lib/tmux/custom.tmux
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/usr/bin/env bash

# Pipe entire current buffer to vim and load copied text to tmux buffer
if [ "$(uname -s)" = Darwin]; then
tmux bind e capture-pane -S - '\;' split-window -v "tmux show-buffer | sed '/^\s*$/d' | reattach-to-user-namespace view
- +'$' +'set clipboard=unnamed'; reattach-to-user-namespace pbpaste | tmux load-buffer -"
else
tmux bind e capture-pane -S - '\;' split-window -v "tmux show-buffer | sed '/^\s*$/d' | view - +'$' +'set clipboard=unnamed'; pbpaste | tmux load-buffer -"
fi
2 changes: 1 addition & 1 deletion lib/vim/base16-vim
Submodule base16-vim updated 67 files
+15 −0 colors/base16-3024.vim
+15 −0 colors/base16-apathy.vim
+15 −0 colors/base16-ashes.vim
+15 −0 colors/base16-atelier-cave.vim
+15 −0 colors/base16-atelier-dune.vim
+15 −0 colors/base16-atelier-estuary.vim
+15 −0 colors/base16-atelier-forest.vim
+15 −0 colors/base16-atelier-heath.vim
+15 −0 colors/base16-atelier-lakeside.vim
+15 −0 colors/base16-atelier-plateau.vim
+15 −0 colors/base16-atelier-savanna.vim
+15 −0 colors/base16-atelier-seaside.vim
+15 −0 colors/base16-atelier-sulphurpool.vim
+15 −0 colors/base16-bespin.vim
+15 −0 colors/base16-brewer.vim
+15 −0 colors/base16-bright.vim
+15 −0 colors/base16-chalk.vim
+15 −0 colors/base16-codeschool.vim
+15 −0 colors/base16-cupcake.vim
+15 −0 colors/base16-darktooth.vim
+16 −1 colors/base16-default-dark.vim
+15 −0 colors/base16-default-light.vim
+15 −0 colors/base16-dracula.vim
+15 −0 colors/base16-eighties.vim
+15 −0 colors/base16-embers.vim
+15 −0 colors/base16-flat.vim
+15 −0 colors/base16-github.vim
+15 −0 colors/base16-google-dark.vim
+15 −0 colors/base16-google-light.vim
+15 −0 colors/base16-grayscale-dark.vim
+15 −0 colors/base16-grayscale-light.vim
+15 −0 colors/base16-green-screen.vim
+15 −0 colors/base16-harmonic16-dark.vim
+15 −0 colors/base16-harmonic16-light.vim
+15 −0 colors/base16-hopscotch.vim
+15 −0 colors/base16-ir-black.vim
+15 −0 colors/base16-isotope.vim
+15 −0 colors/base16-london-tube.vim
+15 −0 colors/base16-macintosh.vim
+15 −0 colors/base16-marrakesh.vim
+15 −0 colors/base16-materia.vim
+15 −0 colors/base16-mexico-light.vim
+15 −0 colors/base16-mocha.vim
+15 −0 colors/base16-monokai.vim
+15 −0 colors/base16-ocean.vim
+15 −0 colors/base16-oceanicnext.vim
+15 −0 colors/base16-onedark.vim
+15 −0 colors/base16-paraiso.vim
+15 −0 colors/base16-phd.vim
+15 −0 colors/base16-pico.vim
+15 −0 colors/base16-pop.vim
+15 −0 colors/base16-railscasts.vim
+15 −0 colors/base16-seti-ui.vim
+15 −0 colors/base16-shapeshifter.vim
+15 −0 colors/base16-solar-flare.vim
+15 −0 colors/base16-solarized-dark.vim
+15 −0 colors/base16-solarized-light.vim
+15 −0 colors/base16-spacemacs.vim
+15 −0 colors/base16-summerfruit-dark.vim
+15 −0 colors/base16-summerfruit-light.vim
+15 −0 colors/base16-tomorrow-night.vim
+15 −0 colors/base16-tomorrow.vim
+15 −0 colors/base16-twilight.vim
+15 −0 colors/base16-unikitty-dark.vim
+15 −0 colors/base16-unikitty-light.vim
+15 −0 colors/base16-woodland.vim
+16 −0 templates/default.mustache
2 changes: 1 addition & 1 deletion lib/vim/ultisnips
2 changes: 1 addition & 1 deletion lib/vim/vim-snippets

0 comments on commit c31de32

Please sign in to comment.