Skip to content

Commit

Permalink
Resolve #7 Remove legacy options in nvim settigns
Browse files Browse the repository at this point in the history
  • Loading branch information
camagu committed Jan 5, 2016
1 parent e93790e commit 84442c1
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 40 deletions.
5 changes: 0 additions & 5 deletions nvim/init.vim
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,6 @@ set autoread
set hidden
set switchbuf=useopen

if $TMUX == ''
" use system registry for clipboard (not available in tmux)
set clipboard+=unnamed
endif

set encoding=utf8
set ffs=unix,dos,mac

Expand Down
10 changes: 0 additions & 10 deletions nvim/plugin/settings/term-cursor.vim
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,6 @@ if $TERM_PROGRAM == 'Apple_Terminal'
autocmd BufEnter,WinEnter,InsertLeave * match Cursor /\%#/
endif

" tmux
" ----
"
" tmux captures escape sequences sent from vim, so we need to forward them to
" the emulator.
if exists('$TMUX') && s:si != '' && s:ei != ''
let s:si="\<Esc>Ptmux;\<Esc>".s:si."\<Esc>\\"
let s:ei="\<Esc>Ptmux;\<Esc>".s:ei."\<Esc>\\"
endif

" Use escape sequencess if they where declared.
if s:si != '' && s:ei != ''
let &t_SI=s:si
Expand Down
22 changes: 0 additions & 22 deletions nvim/plugin/settings/tmuxline.vim

This file was deleted.

5 changes: 2 additions & 3 deletions zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ZSH=$HOME/.oh-my-zsh
# Theme
ZSH_THEME="robbyrussell"

# Disable window auto title, normally set by tmux
# Disable window auto title
DISABLE_AUTO_TITLE="true"

# Disable corrections, they are annoying
Expand All @@ -31,8 +31,7 @@ alias c='clear'
# Global settings
# ===============

# Ensure locales are UTF-8 compilant, tmux generates remnant characters if it
# isn't
# Ensure locales are UTF-8 compilant
export LC_ALL=en_US.UTF-8
export LANG=en_US.UTF-8
export LANGUAGE=en_US.UTF-8
Expand Down

0 comments on commit 84442c1

Please sign in to comment.