commit 48e12a4646657b75ffb74a7b0b8b5365029f3358
author Skyler Grey <skyler3665@gmail.com> Mon Feb 13 06:51:56 2023 +0000
committer Skyler Grey <skyler3665@gmail.com> Sun Feb 26 13:09:38 2023 +0000
tree 1baa9567be28d18c6bd52250bb58204b884a10d8
parent ea00ad5f70172782d5841e8dc57ad542ea2d1950

Update neovim keybinds

modules/neovim.nix

diff --git a/modules/neovim.nix b/modules/neovim.nix
index 4b364a0..99c1df9 100644
--- a/modules/neovim.nix
+++ b/modules/neovim.nix
@@ -2,12 +2,9 @@
 , lib
 , home
 , username
+, utils
 , ...
-}:
-let
-  utils = import ../utils lib;
-in
-{
+}: {
   config = {
     environment = {
       variables = {

modules/neovim/coc/keybinds.vim

diff --git a/modules/neovim/coc/keybinds.vim b/modules/neovim/coc/keybinds.vim
index a97d6b7..cf06158 100644
--- a/modules/neovim/coc/keybinds.vim
+++ b/modules/neovim/coc/keybinds.vim
@@ -20,7 +20,7 @@
       \ coc#jumpable() ? "\<Esc>:call coc#snippet#next()\<CR>" :
       \ tablemode#table#IsTable('.') && !(tablemode#spreadsheet#GetLastRow(".") == line('.')) && !(tablemode#spreadsheet#GetLastRow(".") == 0) ? "\<Esc>:call tablemode#spreadsheet#cell#Motion('j')\<CR>:call tablemode#spreadsheet#MoveToStartOfCell()\<CR>" . mode() :
       \ tablemode#table#IsTable('.') ? "<Esc>$a<CR>" :
-      \ "\<C-G>u\<Plug>(PearTreeExpand)"
+      \ "\<Plug>(PearTreeExpand)"
 
 inoremap <silent><expr> <S-CR> tablemode#table#IsTable('.') ? "\<Esc>:call tablemode#spreadsheet#cell#Motion('k')\<CR>:call tablemode#spreadsheet#MoveToStartOfCell()\<CR>" . mode() : "\<S-CR>"
 
@@ -28,8 +28,7 @@
 let g:codeium_tab_fallback = ""
 inoremap <silent><expr> <Tab>
       \ coc#pum#visible() ? coc#pum#next(0) :
-      \ coc#expandableOrJumpable() ? "\<C-G>u\<C-r>=coc#rpc#request('doKeymap', ['snippets-expand-jump',''])\<CR>" :
-      \ codeium#Accept() != "" ? "\<C-G>u" . codeium#Accept() :
+      \ coc#expandableOrJumpable() ? "\<C-G>u<C-r>=coc#rpc#request('doKeymap', ['snippets-expand-jump',''])\<CR>" :
       \ pear_tree#GetSurroundingPair() != [] ? pear_tree#insert_mode#JumpOut() : 
       \ tablemode#table#IsTable('.') ? "\<Esc>:call tablemode#spreadsheet#cell#Motion('l')\<CR>" . mode() :
       \ CheckBackSpace() ? "\<TAB>" : coc#refresh()
@@ -42,13 +41,15 @@
 inoremap <silent><expr> <S-Tab> coc#pum#visible() ? coc#pum#prev(0) : 
       \ coc#jumpable() ? "\<Esc>:call coc#snippet#prev()\<CR>" :
       \ tablemode#table#IsTable('.') ? "\<Esc>:call tablemode#spreadsheet#cell#Motion('h')\<CR>" . mode() :
+      \ codeium#Accept() != "" ? "\<C-G>u" . codeium#Accept() :
       \ "\<Plug>(PearTreeJump)"
+
 xnoremap <silent> <Tab> <Plug>(coc-snippets-select)
 
 nnoremap <silent><expr> <CR> coc#jumpable() ?
       \ ":call coc#snippet#next()\<CR>" :
       \ tablemode#table#IsTable('.') ? "\<Esc>:call tablemode#spreadsheet#cell#Motion('j')\<CR>:call tablemode#spreadsheet#MoveToStartOfCell()\<CR>" :
-      \ "\<C-G>u\<CR>"
+      \ "\<CR>"
 
 nnoremap <silent><expr> <S-CR> tablemode#table#IsTable('.') ? "\<Esc>:call tablemode#spreadsheet#cell#Motion('k')\<CR>:call tablemode#spreadsheet#MoveToStartOfCell()\<CR>" : "\<S-CR>"
 
@@ -65,7 +66,7 @@
 
 snoremap <silent><expr> <CR> coc#jumpable() ?
       \ "\<Esc>:call coc#snippet#next()\<CR>" :
-      \ "\<C-G>u\<CR>"
+      \ "\<CR>"
 
 snoremap <silent><expr> <Tab> coc#jumpable() ?
       \ "\<Esc>:call coc#snippet#next()\<CR>" :

modules/neovim/tree-sitter/default.nix

diff --git a/modules/neovim/tree-sitter/default.nix b/modules/neovim/tree-sitter/default.nix
index f90982e..7de3444 100644
--- a/modules/neovim/tree-sitter/default.nix
+++ b/modules/neovim/tree-sitter/default.nix
@@ -6,7 +6,7 @@
 }:
 let
   disabledGrammars = [
-    "sql"
+    /* "sql" */
   ];
 in
 {

modules/neovim/tree-sitter/setup.lua

diff --git a/modules/neovim/tree-sitter/setup.lua b/modules/neovim/tree-sitter/setup.lua
index 85cd84e..b0c7ef7 100644
--- a/modules/neovim/tree-sitter/setup.lua
+++ b/modules/neovim/tree-sitter/setup.lua
@@ -2,7 +2,7 @@
   highlight = {
     enable = true,
     additional_vim_regex_highlighting = {'org'},
-    disable = {'sql', 'lua', 'sh', 'bash'},
+    disable = {'lua', 'sh', 'bash'},
   },
   rainbow = {
     enable = true,