Merge branch 'main' of github.com:esensar/dotfiles

Makefile

@@ -175,6 +175,11 @@ link_bin: check_os
 	@echo "Linking bin script files..."
 	$(call link,bin,bin)
 
+.PHONY: link_termux
+link_termux: check_os link_apps_config
+	@echo "Linking termux config files..."
+	$(call link,config/termux,.termux)
+
 .PHONY: link_xconfig
 link_xconfig: check_os
 	@echo "Linking X config files..."

symlinks/config/termux/.gitignore

@@ -0,0 +1 @@
+shell

symlinks/config/termux/colors.properties

@@ -0,0 +1,37 @@
+! -----------------------------------------------------------------------------
+! File: gruvbox-dark.xresources
+! Description: Retro groove colorscheme generalized
+! Author: morhetz <morhetz@gmail.com>
+! Source: https://github.com/morhetz/gruvbox-generalized
+! Last Modified: 6 Sep 2014
+! -----------------------------------------------------------------------------
+
+! hard contrast: background: #1d2021
+background: #1d2021
+! background: #282828
+! soft contrast: background: #32302f
+foreground: #ebdbb2
+! Black + DarkGrey
+color0:  #282828
+color8:  #928374
+! DarkRed + Red
+color1:  #cc241d
+color9:  #fb4934
+! DarkGreen + Green
+color2:  #98971a
+color10: #b8bb26
+! DarkYellow + Yellow
+color3:  #d79921
+color11: #fabd2f
+! DarkBlue + Blue
+color4:  #458588
+color12: #83a598
+! DarkMagenta + Magenta
+color5:  #b16286
+color13: #d3869b
+! DarkCyan + Cyan
+color6:  #689d6a
+color14: #8ec07c
+! LightGrey + White
+color7:  #a89984
+color15: #ebdbb2

symlinks/config/termux/termux.properties

@@ -1,4 +1,7 @@
+back-key=escape
+
 extra-keys=[ \
  ['ESC','|','/','HOME','UP','END','PGUP','DEL'], \
  ['TAB','CTRL','ALT','LEFT','DOWN','RIGHT','PGDN','BKSP'] \
 ]
+

symlinks/vim/plugins.vim

@@ -51,7 +51,9 @@ Plug 'tpope/vim-speeddating'
 " -----------------------------------------------------------------------------
 "     - Autocompletion -
 " -----------------------------------------------------------------------------
+if !exists('g:loaded_node_provider') || g:loaded_node_provider != 0
    Plug 'neoclide/coc.nvim', {'branch': 'release'}
+endif
 Plug 'ervandew/supertab'
 
 " -----------------------------------------------------------------------------
@@ -75,8 +77,10 @@ Plug 'tpope/vim-sleuth'
 " -----------------------------------------------------------------------------
 "     - Snippets -
 " -----------------------------------------------------------------------------
+if !exists('g:loaded_python3_provider') || g:loaded_python3_provider != 0
    Plug 'SirVer/ultisnips'
    Plug 'honza/vim-snippets'
+endif
 
 " -----------------------------------------------------------------------------
 "     - Language support -

symlinks/vim/vimrc

@@ -13,6 +13,10 @@ let $LOCAL_VIMRC = $HOME."/.vimrc.local"
 " -----------------------------------------------------------------------------
 "     - Load up plugins -
 " -----------------------------------------------------------------------------
+" Use local vimrc for overrides if available and desired
+if filereadable($LOCAL_VIMRC)
+  source $LOCAL_VIMRC
+endif
 source $VIMPLUGINS
 
 " -----------------------------------------------------------------------------
@@ -124,6 +128,3 @@ if &term =~ '256color'
   " render properly when inside 256-color tmux and GNU screen.
   set t_ut=
 endif
-
-" Use local vimrc for overrides if available and desired
-runtime $LOCAL_VIMRC