diff --git a/Makefile b/Makefile index 68a4499..5f1e582 100644 --- a/Makefile +++ b/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..." diff --git a/symlinks/config/termux/.gitignore b/symlinks/config/termux/.gitignore new file mode 100644 index 0000000..1b96f7b --- /dev/null +++ b/symlinks/config/termux/.gitignore @@ -0,0 +1 @@ +shell diff --git a/symlinks/config/termux/colors.properties b/symlinks/config/termux/colors.properties new file mode 100644 index 0000000..8b5bd43 --- /dev/null +++ b/symlinks/config/termux/colors.properties @@ -0,0 +1,37 @@ +! ----------------------------------------------------------------------------- +! File: gruvbox-dark.xresources +! Description: Retro groove colorscheme generalized +! Author: morhetz +! 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 \ No newline at end of file diff --git a/symlinks/config/termux/font.ttf b/symlinks/config/termux/font.ttf new file mode 100644 index 0000000..9e06893 Binary files /dev/null and b/symlinks/config/termux/font.ttf differ diff --git a/symlinks/config/termux/termux.properties b/symlinks/config/termux/termux.properties index bfb3a6c..42f90e6 100644 --- a/symlinks/config/termux/termux.properties +++ b/symlinks/config/termux/termux.properties @@ -1,4 +1,7 @@ -extra-keys = [ \ +back-key=escape + +extra-keys=[ \ ['ESC','|','/','HOME','UP','END','PGUP','DEL'], \ ['TAB','CTRL','ALT','LEFT','DOWN','RIGHT','PGDN','BKSP'] \ ] + diff --git a/symlinks/vim/plugins.vim b/symlinks/vim/plugins.vim index 41d6222..568c763 100644 --- a/symlinks/vim/plugins.vim +++ b/symlinks/vim/plugins.vim @@ -51,7 +51,9 @@ Plug 'tpope/vim-speeddating' " ----------------------------------------------------------------------------- " - Autocompletion - " ----------------------------------------------------------------------------- -Plug 'neoclide/coc.nvim', {'branch': 'release'} +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 - " ----------------------------------------------------------------------------- -Plug 'SirVer/ultisnips' -Plug 'honza/vim-snippets' +if !exists('g:loaded_python3_provider') || g:loaded_python3_provider != 0 + Plug 'SirVer/ultisnips' + Plug 'honza/vim-snippets' +endif " ----------------------------------------------------------------------------- " - Language support - diff --git a/symlinks/vim/vimrc b/symlinks/vim/vimrc index 823eb9a..ee6a0fc 100644 --- a/symlinks/vim/vimrc +++ b/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