update: nvim

1 files changed, 22 insertions, 26 deletions

diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index b8ac67f..0e2e3cf 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -36,7 +36,14 @@ require("lazy").setup({
 
     {
         "windwp/nvim-autopairs",
-        opts = {},
+        config = function()
+            local npairs = require("nvim-autopairs")
+            npairs.setup({})
+
+            local Rule = require("nvim-autopairs.rule")
+            npairs.remove_rule("`")
+            npairs.add_rule(Rule("`", "`") :with_pair(function(opts) return opts.filetype ~= "markdown" end))
+        end,
     },
 
     {
@@ -124,27 +131,8 @@ require("lazy").setup({
 
     {
         "nvim-treesitter/nvim-treesitter",
-        branch = "master",
+        branch = "main",
         lazy = false,
-        build = ":TSUpdate",
-
-        config = function()
-            require("nvim-treesitter.configs").setup({
-                ensure_installed = {
-                    "bash",
-                    "c",
-                    "cpp",
-                    "lua",
-                    "markdown",
-                    "python",
-                    "rust",
-                    "vim",
-                },
-
-                highlight = { enable = true },
-                indent = { enable = false },
-            })
-        end,
     },
 
     {
@@ -215,7 +203,10 @@ require("lazy").setup({
 
     {
         "folke/todo-comments.nvim",
-        dependencies = { "nvim-lua/plenary.nvim" },
+
+        dependencies = {
+            "nvim-lua/plenary.nvim",
+        },
 
         opts = {
             signs = true,
@@ -239,7 +230,6 @@ require("lazy").setup({
         "nvimdev/lspsaga.nvim",
 
         dependencies = {
-            "nvim-treesitter/nvim-treesitter",
             "nvim-tree/nvim-web-devicons",
         },
 
@@ -377,10 +367,14 @@ require("lazy").setup({
                 settings = {
                     ["rust-analyzer"] = {
                         cargo = {
-                            buildScripts = { enable = true },
+                            buildScripts = {
+                                enable = true,
+                            },
                         },
 
-                        procMacro = { enable = true },
+                        procMacro = {
+                            enable = true,
+                        },
                     },
                 },
             })
@@ -520,6 +514,8 @@ local telescope = require("telescope.builtin")
 
 -- General
 map("n", "<Esc>", "<cmd>nohlsearch<CR>")
+map({ "n", "v" }, "j", "gj")
+map({ "n", "v" }, "k", "gk")
 
 -- Telescope
 map("n", "<leader>ff", telescope.find_files, {
@@ -697,4 +693,4 @@ vim.api.nvim_set_hl(0, "SagaBorder", {
 -- Current indent scope
 vim.api.nvim_set_hl(0, "MiniIndentscopeSymbol", {
     fg = "#666666",
-})
\ No newline at end of file
+})