diff --git a/apps/neovim/init.vim b/apps/neovim/init.vim index 52ed674..e4bae87 100644 --- a/apps/neovim/init.vim +++ b/apps/neovim/init.vim @@ -124,10 +124,10 @@ let g:indent_guides_enable_on_vim_startup = 1 " Plug 'scrooloose/syntastic' " syntax checker Plug 'w0rp/ale' " syntax checker -let g:ale_fixers = { -\ 'javascript': ['prettier', 'eslint'], -\ 'elixir': ['mix_format'], -\} +let g:ale_sign_column_always = 0 +let g:ale_set_signs = 0 +highlight clear ALEErrorSign +highlight clear ALEWarningSign Plug 'bkad/CamelCaseMotion' " camel case and underscore word movements Plug 'vim-scripts/LargeFile' " gracefully handle very large files Plug 'vim-scripts/utl.vim' " allow for inter-file linking (I meant to use this instead of vimwiki) @@ -163,6 +163,7 @@ let g:fzf_layout = { 'window': 'enew' } " plugins for specific file types +Plug 'junegunn/vader.vim', {'for': ['vader', 'vimscript', 'vim']} Plug 'othree/html5.vim', {'for': ['jade', 'pug', 'html', 'vue']} Plug 'mxw/vim-jsx', {'for': ['jsx', 'javascript', 'js', 'javascript.jsx']} let g:jsx_ext_required = 0 " allow JSX in normal JS files diff --git a/scripts/bin/tmux-session-list b/scripts/bin/tmux-session-list index f601191..146778d 100755 --- a/scripts/bin/tmux-session-list +++ b/scripts/bin/tmux-session-list @@ -12,13 +12,13 @@ fi export CUR_TMUX_SESSION TMUX_SESSION_LIST="$(tmux list-sessions | awk \ - -v cursesh="${CUR_TMUX_SESSION}" \ + -v curSesh="${CUR_TMUX_SESSION}" \ -v aspre="${ANY_SESSION_PREFIX}" \ -v assuf="${ANY_SESSION_SUFFIX}" \ -v cspre="${CUR_SESSION_PREFIX}" \ -v cssuf="${CUR_SESSION_SUFFIX}" \ '{s=substr($1,0,length($1)-1); -if(s==cursesh){ +if(s==curSesh){ s=cspre" "s" "cssuf }else{ s=aspre" "s" "assuf diff --git a/shell/tmux.conf b/shell/tmux.conf index 699ac80..0242fea 100644 --- a/shell/tmux.conf +++ b/shell/tmux.conf @@ -3,8 +3,6 @@ unbind C-b set -g prefix C-s bind-key s send-prefix -# statusbar on bottom -set-option -g status-position top set-option -g mouse on # honestly not sure @@ -42,24 +40,25 @@ set -g message-bg colour0 set -g message-fg colour7 # status bar configuration +set-option -g status-position top # set -g status-utf8 on -set -g status-justify left +# set -g status-justify right # status bar colors set -g status-bg colour0 set -g status-fg colour8 -set -g status-interval 1 -set -g status-left '#[fg=colour18]#[bg=colour4] #(date +"%Y-%M-%d %H:%M:%S") #[fg=default]#[bg=default]' -set -g status-left-length 80 -set -g status-right '#[fg=colour4]#W #[fg=colour18]#[bg=default]|#[fg=colour7] #(#{DOTFILES_PATH}/scripts/bin/tmux-session-list #S)' -set -g status-right-length 200 - setw -g window-status-current-fg colour7 setw -g window-status-current-bg colour2 # setw -g window-status-current-attr bold setw -g window-status-current-format '' +set -g status-interval 5 +# set -g status-left-length 80 +# set -g status-left "#[fg=colour18]#[bg=colour4] #(date +"%Y-%M-%d %H:%M:%S") #[fg=default]#[bg=default]" +set -g status-right-length 200 +set -g status-right "#[fg=colour4]#W #[fg=colour18]#[bg=default]|#[fg=colour7] #(~/.config/dotfiles/scripts/bin/tmux-session-list #S)" + # vim copying setw -g mode-keys vi