summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEkaitz Zarraga <ekaitz@elenq.tech>2023-09-08 18:35:57 +0200
committerEkaitz Zarraga <ekaitz@elenq.tech>2023-09-08 18:35:57 +0200
commit4329eada45e7f3ce6989e0656a7c72d4eaee1762 (patch)
tree665bf76b52cb3db8209432664b8161212cab3909
parente8d8af47edb0d431c6f8be00c8acb8530ff9c5bb (diff)
nvim: Update config with new paredit and zig
-rw-r--r--nvim/nvim/ftplugin/c.vim1
-rw-r--r--nvim/nvim/init.vim17
2 files changed, 13 insertions, 5 deletions
diff --git a/nvim/nvim/ftplugin/c.vim b/nvim/nvim/ftplugin/c.vim
deleted file mode 100644
index 16ffc97..0000000
--- a/nvim/nvim/ftplugin/c.vim
+++ /dev/null
@@ -1 +0,0 @@
-setlocal foldmethod=syntax
diff --git a/nvim/nvim/init.vim b/nvim/nvim/init.vim
index 8bd3b37..baf3402 100644
--- a/nvim/nvim/init.vim
+++ b/nvim/nvim/init.vim
@@ -15,7 +15,8 @@ Plug 'nvim-treesitter/nvim-treesitter' ", {'do': ':TSUpdate'}
" Plug 'kchmck/vim-coffee-script'
" Paredit for Clojure and Lisp
-Plug 'vim-scripts/paredit.vim'
+" Plug 'vim-scripts/paredit.vim'
+Plug 'kovisoft/paredit'
" Clojure REPL integration ---> Conjure does this and more
" Plug 'tpope/vim-fireplace'
@@ -38,6 +39,10 @@ Plug 'zaid/vim-rec'
" Guix
Plug 'https://gitlab.com/Efraim/guix.vim'
+" Zig
+Plug 'ziglang/zig.vim'
+let g:zig_fmt_autosave = 0
+
" Conjure: lispy things! this is what I wanted to do with combustion!
Plug 'Olical/conjure'
let g:conjure#client_on_load = v:false
@@ -161,8 +166,8 @@ set autoindent
" Show matching parenthesis and brackets on close
set showmatch
-" Disable modelines (they have vulnerabilities)
-set nomodeline
+" Enable modelines (they have vulnerabilities, but it should be fine LOL)
+set modeline
" Allow saving of files as sudo
" TODO LOOK FOR A BETTER WAY TO DO THIS
@@ -173,6 +178,9 @@ set nomodeline
" Search through files in the current tree (like :find)
set path+=**
+" Ignore .go files (guile object)
+set wildignore+=*.go
+
" Make ctags so we can search with ^] and g^] and ^t
command! MakeTags !ctags -R .
@@ -229,7 +237,8 @@ autocmd BufWinLeave * call clearmatches()
lua << ENDMARK
require'nvim-treesitter.configs'.setup {
-- A list of parser names, or "all"
- ensure_installed = { "c", "cpp", "lua", "python", "scheme", "javascript", fennel },
+ ensure_installed = { "c", "cpp", "lua", "python", "scheme", "javascript",
+ "fennel", "zig" },
-- Install parsers synchronously (only applied to `ensure_installed`)
sync_install = false,