Compare commits
No commits in common. "20eb4e54d89d8c5a88f48bc336f989a2d07f04f8" and "0a3753f35b73805062d4146687daa2cb169ab229" have entirely different histories.
20eb4e54d8
...
0a3753f35b
@ -12,11 +12,11 @@
|
|||||||
|
|
||||||
" Vundle Installation {{{
|
" Vundle Installation {{{
|
||||||
" Bootstrap Vundle if it's not installed
|
" Bootstrap Vundle if it's not installed
|
||||||
if empty(glob("~/.vim/autoload/plug.vim"))
|
if empty(system("grep lazy_load ~/.vim/bundle/Vundle.vim/autoload/vundle.vim"))
|
||||||
echo "No vim-plug, getting it ..."
|
silent !mkdir -p ~/.vim/bundle
|
||||||
execute '!curl -fLo ~/.vim/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
|
silent !rm -rf ~/.vim/bundle/Vundle.vim
|
||||||
echo "Getting vim-plug ... done"
|
silent !git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim
|
||||||
endif
|
endif
|
||||||
" }}}
|
" }}}
|
||||||
|
|
||||||
" Base settings {{{
|
" Base settings {{{
|
||||||
@ -40,41 +40,44 @@
|
|||||||
|
|
||||||
" Vundle setup - Preamble {{{
|
" Vundle setup - Preamble {{{
|
||||||
|
|
||||||
call plug#begin()
|
set runtimepath+=~/.vim/bundle/Vundle.vim
|
||||||
|
call vundle#begin()
|
||||||
|
|
||||||
|
Plugin 'VundleVim/Vundle.vim'
|
||||||
|
|
||||||
" }}}
|
" }}}
|
||||||
|
|
||||||
" Vundle setup - Packages {{{
|
" Vundle setup - Packages {{{
|
||||||
|
|
||||||
Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' }
|
Plugin 'scrooloose/nerdtree'
|
||||||
Plug 'tpope/vim-fugitive'
|
Plugin 'tpope/vim-fugitive'
|
||||||
Plug 'mhinz/vim-signify'
|
Plugin 'mhinz/vim-signify'
|
||||||
Plug 'tmhedberg/matchit'
|
Plugin 'tmhedberg/matchit'
|
||||||
Plug 'spf13/vim-colors'
|
Plugin 'spf13/vim-colors'
|
||||||
Plug 'ajmwagar/vim-deus.git'
|
Plugin 'ajmwagar/vim-deus.git'
|
||||||
Plug 'tpope/vim-surround'
|
Plugin 'tpope/vim-surround'
|
||||||
Plug 'tpope/vim-repeat'
|
Plugin 'tpope/vim-repeat'
|
||||||
Plug 'drmikehenry/vim-fontsize'
|
Plugin 'drmikehenry/vim-fontsize'
|
||||||
Plug 'jiangmiao/auto-pairs'
|
Plugin 'jiangmiao/auto-pairs'
|
||||||
Plug 'terryma/vim-multiple-cursors'
|
Plugin 'terryma/vim-multiple-cursors'
|
||||||
Plug 'vim-airline/vim-airline'
|
Plugin 'vim-airline/vim-airline'
|
||||||
Plug 'vim-airline/vim-airline-themes'
|
Plugin 'vim-airline/vim-airline-themes'
|
||||||
"Plug 'roxma/vim-hug-neovim-rpc'
|
Plugin 'roxma/vim-hug-neovim-rpc'
|
||||||
"Plug 'roxma/nvim-yarp'
|
Plugin 'roxma/nvim-yarp'
|
||||||
"Plug 'Shougo/denite.nvim'
|
Plugin 'Shougo/denite.nvim'
|
||||||
Plug 'ctrlpvim/ctrlp.vim'
|
Plugin 'pR0Ps/molokai-dark'
|
||||||
Plug 'pR0Ps/molokai-dark'
|
Plugin 'flrnprz/plastic.vim'
|
||||||
Plug 'flrnprz/plastic.vim'
|
Plugin 'nathanaelkane/vim-indent-guides'
|
||||||
Plug 'nathanaelkane/vim-indent-guides'
|
Plugin 'luochen1990/rainbow'
|
||||||
Plug 'luochen1990/rainbow'
|
Plugin 'vhda/verilog_systemverilog.vim'
|
||||||
Plug 'vhda/verilog_systemverilog.vim'
|
Plugin 'nanotech/jellybeans.vim'
|
||||||
Plug 'nanotech/jellybeans.vim'
|
|
||||||
|
|
||||||
" }}}
|
" }}}
|
||||||
|
|
||||||
" Vundle - Closing {{{
|
" Vundle - Closing {{{
|
||||||
|
|
||||||
call plug#end()
|
call vundle#end() " required
|
||||||
|
filetype plugin indent on " required
|
||||||
|
|
||||||
" }}}
|
" }}}
|
||||||
|
|
||||||
@ -88,7 +91,7 @@
|
|||||||
elseif has("win32")
|
elseif has("win32")
|
||||||
set guifont=Iosevka\ Term\ Regular\ 13
|
set guifont=Iosevka\ Term\ Regular\ 13
|
||||||
else
|
else
|
||||||
set guifont=Iosevka\ Term\ Regular\ 13.5
|
set guifont=Iosevka\ Term\ Regular\ 10.5
|
||||||
end
|
end
|
||||||
|
|
||||||
set columns=120 lines=54
|
set columns=120 lines=54
|
||||||
@ -110,9 +113,6 @@
|
|||||||
set guioptions=iaA
|
set guioptions=iaA
|
||||||
else
|
else
|
||||||
set background=dark
|
set background=dark
|
||||||
if has('vcon')
|
|
||||||
set termguicolors
|
|
||||||
endif
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
" check to make sure vim has been compiled with colorcolumn support
|
" check to make sure vim has been compiled with colorcolumn support
|
||||||
@ -121,8 +121,8 @@
|
|||||||
set colorcolumn=120
|
set colorcolumn=120
|
||||||
endif
|
endif
|
||||||
|
|
||||||
colorscheme molokai-dark
|
"colorscheme molokai-dark
|
||||||
"colorscheme deus
|
colorscheme deus
|
||||||
set norelativenumber
|
set norelativenumber
|
||||||
set number
|
set number
|
||||||
|
|
||||||
@ -219,10 +219,8 @@
|
|||||||
nnoremap <S-F8> <C-w>s
|
nnoremap <S-F8> <C-w>s
|
||||||
nnoremap <F8> <C-w>v
|
nnoremap <F8> <C-w>v
|
||||||
|
|
||||||
"nnoremap <F9> :Denite buffer<CR>
|
nnoremap <F9> :Denite buffer<CR>
|
||||||
"nnoremap <leader>b :Denite buffer<CR>
|
nnoremap <leader>b :Denite buffer<CR>
|
||||||
nnoremap <F9> :CtrlPMixed<CR>
|
|
||||||
nnoremap <leader>b :CtrlPBuffer<CR>
|
|
||||||
|
|
||||||
nnoremap <S-F10> :set wrap!<CR>
|
nnoremap <S-F10> :set wrap!<CR>
|
||||||
nnoremap <S-F1> :set spell!<CR>
|
nnoremap <S-F1> :set spell!<CR>
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
# TMUX Configuration file
|
# TMUX Configuration file
|
||||||
#
|
#
|
||||||
# General settings {{{
|
# General settings {{{
|
||||||
set -g default-terminal "xterm-256color"
|
set -g default-terminal "screen-256color"
|
||||||
set -g prefix C-a
|
set -g prefix C-a
|
||||||
unbind-key C-b
|
unbind-key C-b
|
||||||
bind-key C-a send-prefix
|
bind-key C-a send-prefix
|
||||||
@ -10,6 +10,7 @@
|
|||||||
set -as terminal-overrides ",*:U8=0"
|
set -as terminal-overrides ",*:U8=0"
|
||||||
|
|
||||||
set -g mouse on
|
set -g mouse on
|
||||||
|
bind r source-file ~/.tmux.conf
|
||||||
set -g status-position top
|
set -g status-position top
|
||||||
# set -g status-windows-justify middle
|
# set -g status-windows-justify middle
|
||||||
|
|
||||||
@ -40,17 +41,6 @@
|
|||||||
bind -n M-j select-pane -D
|
bind -n M-j select-pane -D
|
||||||
bind -n M-k select-pane -U
|
bind -n M-k select-pane -U
|
||||||
bind -n M-l select-pane -R
|
bind -n M-l select-pane -R
|
||||||
|
|
||||||
# Clipboard integration
|
|
||||||
# ctrl+c to send to clipboard
|
|
||||||
|
|
||||||
# Selection with mouse should copy to clipboard right away, in addition to the default action.
|
|
||||||
unbind -n -Tcopy-mode-vi MouseDragEnd1Pane
|
|
||||||
bind -Tcopy-mode-vi MouseDragEnd1Pane send -X copy-selection-and-cancel\; run "tmux save-buffer - | xclip -i -sel clipboard > /dev/null"
|
|
||||||
|
|
||||||
# Middle click to paste from the clipboard
|
|
||||||
unbind-key MouseDown2Pane
|
|
||||||
bind-key -n MouseDown2Pane run "tmux set-buffer \"$(xclip -o -sel clipboard)\"; tmux paste-buffer"
|
|
||||||
# }}}
|
# }}}
|
||||||
|
|
||||||
# Footer {{{
|
# Footer {{{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user