From 52e998c85b587d83b3919b675c8887ea0a8eadc6 Mon Sep 17 00:00:00 2001
From: pegasust <pegasucksgg@gmail.com>
Date: Wed, 12 Oct 2022 17:47:16 -0700
Subject: [PATCH] remove tabnine

---
 neovim/init.lua        |  9 ++++++---
 neovim/scripts/deps.sh | 11 +++++++----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/neovim/init.lua b/neovim/init.lua
index 79675c2..3581a84 100644
--- a/neovim/init.lua
+++ b/neovim/init.lua
@@ -101,6 +101,8 @@ Plug('tpope/vim-dispatch') -- Allows quick build/compile/test vim commands
 Plug('clojure-vim/vim-jack-in') -- Clojure: ":Boot", ":Clj", ":Lein"
 Plug('radenling/vim-dispatch-neovim') -- Add support for neovim's terminal emulator
 Plug('Olical/conjure') -- REPL on the source for Clojure (and other LISPs)
+Plug('gennaro-tedesco/nvim-jqx') -- JSON formatter (use :Jqx*)
+Plug('kylechui/nvim-surround') -- surrounds with tags/parenthesis
 
 -- UI & colorscheme
 Plug('gruvbox-community/gruvbox') -- theme provider
@@ -276,7 +278,7 @@ require('nvim-treesitter.configs').setup {
   ensure_installed = {
     'tsx', 'toml', 'lua', 'typescript', 'rust', 'go', 'yaml', 'json', 'php', 'css',
     'python', 'prisma', 'html', "dockerfile", "c", "cpp", "hcl", "svelte", "astro",
-    "clojure", "fennel"
+    "clojure", "fennel", "bash"
   },
   sync_install = false,
   highlight = { enable = true },
@@ -365,7 +367,6 @@ require('neogit').setup {}
 remap('n', '<leader>gs', function() require('neogit').open({}) end);
 
 -- LSP settings
-require('nvim-lsp-installer').setup {}
 -- This function gets run when an LSP connects to a particular buffer.
 local on_attach = function(_client, bufnr)
   -- NOTE: Remember that lua is a real programming language, and as such it is possible
@@ -422,7 +423,7 @@ local capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protoco
 -- })
 -- default language servers
 local servers = { 'clangd', 'rust_analyzer', 'pyright', 'tsserver', 'sumneko_lua', 'cmake', 'tailwindcss', 'prismals',
-  'rnix', 'eslint', 'terraform-ls', 'tflint', 'svelte', 'astro', 'clojure_lsp' }
+  'rnix', 'eslint', 'terraform-ls', 'tflint', 'svelte', 'astro', 'clojure_lsp', "bashls" }
 require("mason").setup({
   ui = {
     icons = {
@@ -644,3 +645,5 @@ require('lualine').setup {
     lualine_z = {},
   }
 }
+
+require('nvim-surround').setup {}
diff --git a/neovim/scripts/deps.sh b/neovim/scripts/deps.sh
index 98017b3..7a39f30 100644
--- a/neovim/scripts/deps.sh
+++ b/neovim/scripts/deps.sh
@@ -4,12 +4,15 @@
 echo "Please run this in sudo mode for sudo apt* commands"
 
 # Pip and Python3
-PYTHON_3=${PYTHON_3:-"python3.10"}
-apt install $PYTHON_3
-$PYTHON_3 -m ensurepip --upgrade
-$PYTHON_3 -m pip install --upgrade pip
+if [ ! python3 --version ] ; then
+    PYTHON_3=${PYTHON_3:-"python3.10"}
+    apt install $PYTHON_3
+    $PYTHON_3 -m ensurepip --upgrade
+    $PYTHON_3 -m pip install --upgrade pip
+fi
 
 # Neovim vim-plug
 sh -c 'curl -fLo "${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug.vim --create-dirs \
        https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
 
+