diff --git a/gvimrc b/gvimrc index d7c6f8e..7bb7506 100644 --- a/gvimrc +++ b/gvimrc @@ -1,8 +1,8 @@ " Iosevka Term ss10 if has('win32') - set guifont=Fantasque_Sams_Mono:h12 + set guifont=Fantasque_Sans_Mono:h11 else - set guifont=Fantasque\ Sans\ Mono\ 12 + set guifont=Fantasque\ Sans\ Mono\ 11 endif let g:lightline = { 'colorscheme': 'solarized', } set guiheadroom=0 guioptions=aei mouse=a diff --git a/tmux.conf b/tmux.conf index 6d62fdb..bf70919 100644 --- a/tmux.conf +++ b/tmux.conf @@ -1,7 +1,7 @@ unbind C-b set -g update-environment "DISPLAY SSH_ASKPASS SSH_AGENT_PID SSH_CONNECTION WINDOWID XAUTHORITY" -set -g prefix C-Space -bind C-Space send-prefix +set -g prefix C-g +bind C-g send-prefix bind s split-window -v bind v split-window -h bind h select-pane -L @@ -13,18 +13,6 @@ bind > resize-pane -R 5 bind - resize-pane -D 5 bind + resize-pane -U 5 bind e choose-session -bind m set-option -g mode-mouse on\; set-option -g mouse-select-pane on\; set-option -g mouse-select-window on\; set-option -g mouse-resize-pane on\; display-message "mouse mode ON" -bind M set-option -g mode-mouse off\; set-option -g mouse-select-pane off\; set-option -g mouse-select-window off\; set-option -g mouse-resize-pane off\; display-message "mouse mode OFF" -bind M-0 join-pane -t 0 -bind M-1 join-pane -t 1 -bind M-2 join-pane -t 2 -bind M-3 join-pane -t 3 -bind M-4 join-pane -t 4 -bind M-5 join-pane -t 5 -bind M-6 join-pane -t 6 -bind M-7 join-pane -t 7 -bind M-8 join-pane -t 8 -bind M-9 join-pane -t 9 bind -n M-w next-window bind -n M-q previous-window bind -n M-j next-window @@ -36,7 +24,6 @@ set -g set-titles "on" set -g set-titles-string "#h" set -g escape-time "0" set -g history-limit "10000" -set -g set-titles "off" set -g status-left-length "20" set -g status-right-length "40" set -g default-terminal "tmux" diff --git a/vimplugins b/vimplugins index 1ced0d1..4179e9e 100644 --- a/vimplugins +++ b/vimplugins @@ -48,10 +48,3 @@ let g:signify_sign_change='~' " easy-align options xmap a (EasyAlign) nmap a (EasyAlign) - -" neomake -nmap i :Neomake -let g:neomake_open_list = 7 -let g:neomake_error_sign = { 'text': 'e>', 'texthl': 'ErrorMsg' } -let g:neomake_warning_sign = { 'text': 'w>', 'texthl': 'WarningMsg' } -let g:neomake_info_sign = { 'text': 'i>', 'texthl': 'InfoMsg' } diff --git a/vimrc b/vimrc index 0dca6dd..db76c22 100644 --- a/vimrc +++ b/vimrc @@ -1,5 +1,5 @@ " various settings -set nobackup number nomodeline cursorline backspace=indent,eol,start +set nobackup number nomodeline backspace=indent,eol,start set foldmethod=marker ttymouse=xterm2 mouse= " hidden characters set list listchars=tab:\|_,nbsp:x,trail:*