diff --git a/apps/neovim/bindings.vim b/apps/neovim/bindings.vim index 24c2988..8dbd3ac 100644 --- a/apps/neovim/bindings.vim +++ b/apps/neovim/bindings.vim @@ -134,7 +134,7 @@ inoremap inoremap " clear search higlight -nnoremap / :let @/ = "" +nnoremap / :let @/ = "": " remap jk/jj and its variants to escape inoremap jj diff --git a/apps/neovim/init.vim b/apps/neovim/init.vim index 054dc70..feed84c 100644 --- a/apps/neovim/init.vim +++ b/apps/neovim/init.vim @@ -1,4 +1,3 @@ - if has('nvim') if empty(glob('~/.config/nvim/autoload/plug.vim')) silent !curl -fLo ~/.config/nvim/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim @@ -171,8 +170,8 @@ let g:jsx_ext_required = 0 " allow JSX in normal JS files Plug 'hail2u/vim-css3-syntax', {'for': ['styl', 'stylus', 'css', 'vue']} Plug 'kchmck/vim-coffee-script', {'for': ['coffee', 'coffeescript', 'vue']} Plug 'posva/vim-vue', {'for': ['vue']} -Plug 'elixir-lang/vim-elixir', {'for': ['elixir', 'eelixir']} -Plug 'elixir-lang/', {'for': ['elixir', 'eelixir']} +Plug 'elixir-lang/vim-elixir', {'for': ['elixir', 'ex', 'exs']} +Plug 'slashmili/alchemist.vim', {'for': ['elixir', 'ex', 'exs']} Plug 'mattn/emmet-vim', {'for': ['html']} Plug 'wavded/vim-stylus', {'for': ['styl', 'stylus', 'vue']} Plug 'quabug/vim-gdscript', {'for': ['gd', 'gdscript']} diff --git a/scripts/arch-linux/provisioning/tmux-plugins.bash b/scripts/arch-linux/provisioning/tmux-plugins.bash index 9278f8d..6a26cd7 100755 --- a/scripts/arch-linux/provisioning/tmux-plugins.bash +++ b/scripts/arch-linux/provisioning/tmux-plugins.bash @@ -1,12 +1,20 @@ #!/usr/bin/env bash +mkdir -p "$HOME/.config/systemd/user" + # tmux plugin manager git clone https://github.com/tmux-plugins/tpm "$HOME/.tmux/plugins/tpm" # load tmux config -tmux source "$HOME/.tmux.conf" +tmux source-file "$HOME/.tmux.conf" # clean, install, and update plugins bash "$HOME/.tmux/plugins/tpm/bindings/clean_plugins" bash "$HOME/.tmux/plugins/tpm/bindings/install_plugins" bash "$HOME/.tmux/plugins/tpm/bindings/update_plugins" + +# load tmux config +tmux source-file "$HOME/.tmux.conf" + +systemctl --user enable tmux.service +systemctl --user restart tmux.service diff --git a/shell/tmux.conf b/shell/tmux.conf index be85e03..9b69036 100644 --- a/shell/tmux.conf +++ b/shell/tmux.conf @@ -51,6 +51,7 @@ set -g status-right-length 20 set -g status-interval 1 # set status-interval 1 +# 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 '#[fg=colour4]#W #[fg=colour18]#[bg=default]|#[fg=colour7] #(#{DOTFILES_PATH}/scripts/bin/tmux-session-list #S)' set -g status-right-length 200