diff --git a/src/apps/personal/vim.nix b/src/apps/personal/vim.nix
index 5ab446c..92a645e 100644
--- a/src/apps/personal/vim.nix
+++ b/src/apps/personal/vim.nix
@@ -85,6 +85,15 @@
             extended_mode = true,
             max_file_lines = nil,
           },
+          incremental_selection = {
+            enable = true,
+            keymaps = {
+              init_selection = "gnn",
+              node_incremental = "grn",
+              scope_incremental = "grc",
+              node_decremental = "grm",
+            },
+          },
           indent = {
             enable = true,
           },
@@ -92,6 +101,9 @@
 
         require('git-conflict').setup()
       EOF
+
+      set foldmethod=expr
+      set foldexpr=nvim_treesitter#foldexpr()
     '';
 
     plugins = [