diesdas

home/nvim/config.vim

@@ -23,8 +23,8 @@ set splitright
 set tabstop=2
 set updatetime=300
 
-" set foldmethod=expr
-" set foldexpr=nvim_treesitter#foldexpr()
+set foldmethod=expr
+set foldexpr=nvim_treesitter#foldexpr()
 
 let g:netrw_liststyle = 3
 let g:netrw_fastbrowse = 0

home/nvim/default.nix

@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ pkgs, lib, ... }:
 
 {
   home.packages = with pkgs; [
@@ -73,7 +73,7 @@
           nnoremap <silent> [og :Goyo 80<return>
           nnoremap <silent> ]og :Goyo!<return>
         '';
-      }
+     }
       {
         plugin = limelight-vim;
         config = ''
@@ -115,7 +115,23 @@
         '';
       }
 
-      (nvim-treesitter.withPlugins (p: [ p.nix p.lua p.r p.typescript ]))
+      {
+        plugin = (nvim-treesitter.withPlugins (p: [ p.nix p.lua p.r p.typescript ]));
+        type = "lua";
+        config = ''
+          vim.api.nvim_create_autocmd('FileType', {
+            pattern = { 'nix', 'markdown', 'lua', 'r' },
+            callback = function()
+              -- Enable Tree-sitter-based folding
+              vim.o.foldexpr = 'v:lua.vim.treesitter.foldexpr()'
+              vim.o.foldmethod = 'expr'
+              -- Optional: configure fold behavior
+              vim.o.foldlevel = 99
+              vim.o.foldlevelstart = 99
+            end,
+          })
+        '';
+      }
 
       {
         plugin = papercolor-theme;
@@ -154,7 +170,10 @@
         '';
       }
 
-      vim-fish
+      {
+        plugin = vim-fish;
+      }
+
       vim-nix
 
       {

home/nvim/nvim-cmp.lua

@@ -8,18 +8,15 @@ cmp.setup({
     end,
   },
 
-  window = {
-    -- completion = cmp.config.window.bordered(),
-    -- documentation = cmp.config.window.bordered(),
-  },
-
-  mapping = cmp.mapping.preset.insert({
-    ['<C-b>'] = cmp.mapping.scroll_docs(-4),
-    ['<C-f>'] = cmp.mapping.scroll_docs(4),
-    ['<C-Space>'] = cmp.mapping.complete(),
-    ['<C-e>'] = cmp.mapping.abort(),
-    ['<Tab>'] = cmp.mapping.confirm({ select = true }),
-  }),
+  mapping = cmp.mapping.preset.insert(
+    {
+      ['<C-b>'] = cmp.mapping.scroll_docs(-4),
+      ['<C-f>'] = cmp.mapping.scroll_docs(4),
+      ['<C-Space>'] = cmp.mapping.complete(),
+      ['<C-e>'] = cmp.mapping.abort(),
+      ['<Tab>'] = cmp.mapping.confirm({ select = false }),
+    }
+  ),
 
   sources = cmp.config.sources({
     { name = 'cmp_pandoc' },
@@ -34,17 +31,6 @@ cmp.setup({
 
 })
 
--- To use git you need to install the plugin petertriho/cmp-git and uncomment lines below
--- Set configuration for specific filetype.
---[[ cmp.setup.filetype('gitcommit', {
-  sources = cmp.config.sources({
-    { name = 'git' },
-  }, {
-    { name = 'buffer' },
-  })
-})
-require("cmp_git").setup() ]]--
-
 -- Use buffer source for `/` and `?` (if you enabled `native_menu`, this won't work anymore).
 cmp.setup.cmdline({ '/', '?' }, {
   mapping = cmp.mapping.preset.cmdline(),
@@ -66,8 +52,3 @@ cmp.setup.cmdline(':', {
 
 -- Set up lspconfig.
 local capabilities = require('cmp_nvim_lsp').default_capabilities()
--- Replace <YOUR_LSP_SERVER> with each lsp server you've enabled.
--- vim.lsp.config('<YOUR_LSP_SERVER>', {
---   capabilities = capabilities
--- })
--- vim.lsp.enable('<YOUR_LSP_SERVER>')