فهرست منبع

bug: fix nvim-cmp snippet tool to use luasnip instead of vim-snip

Douglas A 3 سال پیش
والد
کامیت
03596571e0
4فایلهای تغییر یافته به همراه49 افزوده شده و 8 حذف شده
  1. 4 0
      bash/bashrc
  2. 32 0
      bash/bashrc.backup
  3. 1 0
      nvim/init.vim
  4. 12 8
      nvim/lua/init.lua

+ 4 - 0
bash/bashrc

@@ -30,3 +30,7 @@ source "$HOME/.cargo/env"
 export MOZ_X11_EGL=1
 . "$HOME/.cargo/env"
 
+
+export PATH=$PATH:/home/cmte/bin
+
+source '/home/cmte/lib/azure-cli/az.completion'

+ 32 - 0
bash/bashrc.backup

@@ -0,0 +1,32 @@
+# Default bashrc file
+DOTFILES=/home/cmte/dotfiles/bash; export DOTFILES
+
+# Set bash-completion
+if ! shopt -oq posix; then
+  if [ -f /usr/share/bash-completion/bash_completion ]; then
+    . /usr/share/bash-completion/bash_completion
+  elif [ -f /etc/bash_completion ]; then
+    . /etc/bash_completion
+  fi
+fi
+
+# Set Bash history
+HISTCONTROL=ignoredups
+HISTSIZE=10000
+HISTFILE_SIZE=20000
+shopt -s checkwinsize
+
+# Set PS1 variable
+export PS1="[\u@\h \W]\\$ \[$(tput sgr0)\]"
+
+# Read configurations
+[ -f $DOTFILES/aliases ] && . $DOTFILES/aliases
+[ -f $DOTFILES/paths ] && . $DOTFILES/paths
+[ -f $DOTFILES/environment ] && . $DOTFILES/environment
+[ -f $DOTFILES/ps1 ] && . $DOTFILES/ps1
+source "$HOME/.cargo/env"
+
+# enable firefox hw renderer
+export MOZ_X11_EGL=1
+. "$HOME/.cargo/env"
+

+ 1 - 0
nvim/init.vim

@@ -14,6 +14,7 @@ call plug#begin('~/.vim/plugged')
 	Plug 'hrsh7th/cmp-cmdline'
 
 	" For vsnip users.
+    Plug 'L3MON4D3/LuaSnip' 
     Plug 'saadparwaiz1/cmp_luasnip'
 	""Plug 'hrsh7th/vim-vsnip'
 

+ 12 - 8
nvim/lua/init.lua

@@ -23,15 +23,15 @@ local capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protoco
 local cmp = require'cmp'
 
 cmp.setup({
-snippet = {
+        snippet = {
 -- REQUIRED - you must specify a snippet engine
-expand = function(args)
-vim.fn["vsnip#anonymous"](args.body) -- For `vsnip` users.
-require('luasnip').lsp_expand(args.body) -- For `luasnip` users.
--- require('snippy').expand_snippet(args.body) -- For `snippy` users.
--- vim.fn["UltiSnips#Anon"](args.body) -- For `ultisnips` users.
-end,
-},
+                expand = function(args)
+                --vim.fn["vsnip#anonymous"](args.body) -- For `vsnip` users.
+                require('luasnip').lsp_expand(args.body) -- For `luasnip` users.
+                -- require('snippy').expand_snippet(args.body) -- For `snippy` users.
+                -- vim.fn["UltiSnips#Anon"](args.body) -- For `ultisnips` users.
+        end,
+        },
 mapping = {
 ['<C-b>'] = cmp.mapping(cmp.mapping.scroll_docs(-4), { 'i', 'c' }),
 ['<C-f>'] = cmp.mapping(cmp.mapping.scroll_docs(4), { 'i', 'c' }),
@@ -63,6 +63,10 @@ require('lspconfig')['rust_analyzer'].setup {
 	capabilities = capabilities
 }
 
+require('lspconfig')['jedi_language_server'].setup {
+	capabilities = capabilities
+}
+
 require('lspconfig')['clangd'].setup {
 	capabilities = capabilities
 }