Compare commits

..

No commits in common. "a41a2376fb6eb13812d240ddc5f8439bffa23312" and "9660893b91342334a9a7faf030c1170210b639e3" have entirely different histories.

4 changed files with 68 additions and 72 deletions

View file

@ -1,18 +1,17 @@
{ {
"blink-cmp-git": { "branch": "master", "commit": "59c19ac2c26cf32ae05362b4b85e14370f83bf80" }, "blink.cmp": { "branch": "main", "commit": "cb5e346d9e0efa7a3eee7fd4da0b690c48d2a98e" },
"blink.cmp": { "branch": "main", "commit": "4f38ce99a472932d5776337f08f7a8180f1f571a" }, "catppuccin": { "branch": "main", "commit": "c9e205fe035d622b3c2d66ee42edf368c0c31fd5" },
"catppuccin": { "branch": "main", "commit": "1bf070129c0b6f77cc23f6a2212dcdc868308c52" },
"ccc.nvim": { "branch": "main", "commit": "af2cf5a963f401aad868c065222ee13d4bbc9050" }, "ccc.nvim": { "branch": "main", "commit": "af2cf5a963f401aad868c065222ee13d4bbc9050" },
"conform.nvim": { "branch": "master", "commit": "a6f5bdb78caa305496357d17e962bbc4c0b392e2" }, "conform.nvim": { "branch": "master", "commit": "a6f5bdb78caa305496357d17e962bbc4c0b392e2" },
"diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
"flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" }, "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" },
"friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
"gitsigns.nvim": { "branch": "main", "commit": "7ce11abbb8b038a9de4fb6f75d8289c58d81aed7" }, "gitsigns.nvim": { "branch": "main", "commit": "ee28ba3e70ecea811b8f6d7b51d81976e94b121c" },
"kanagawa": { "branch": "master", "commit": "cc3b68b08e6a0cb6e6bf9944932940091e49bb83" }, "kanagawa": { "branch": "master", "commit": "cc3b68b08e6a0cb6e6bf9944932940091e49bb83" },
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
"lualine.nvim": { "branch": "master", "commit": "15884cee63a8c205334ab13ab1c891cd4d27101a" }, "lualine.nvim": { "branch": "master", "commit": "15884cee63a8c205334ab13ab1c891cd4d27101a" },
"mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
"mini.nvim": { "branch": "main", "commit": "473cdbff498ed120f1768c75ef65fa42859aa14f" }, "mini.nvim": { "branch": "main", "commit": "90ab64f944a5a63a9efebe6735e1f2c6d4db3613" },
"newpaper.nvim": { "branch": "main", "commit": "d8f2a29001f795a59e4f28713427c200c15449ea" }, "newpaper.nvim": { "branch": "main", "commit": "d8f2a29001f795a59e4f28713427c200c15449ea" },
"nvim-lint": { "branch": "master", "commit": "9dfb77ef6c5092a19502883c02dc5a02ec648729" }, "nvim-lint": { "branch": "master", "commit": "9dfb77ef6c5092a19502883c02dc5a02ec648729" },
"nvim-treesitter": { "branch": "master", "commit": "94ea4f436d2b59c80f02e293466c374584f03b8c" }, "nvim-treesitter": { "branch": "master", "commit": "94ea4f436d2b59c80f02e293466c374584f03b8c" },

View file

@ -1,7 +1,6 @@
-- Shows context of code line -- Shows context of code line
-- Docs: https://github.com/nvim-treesitter/nvim-treesitter-context -- Docs: https://github.com/nvim-treesitter/nvim-treesitter-context
return { return {
"nvim-treesitter/nvim-treesitter-context", "nvim-treesitter/nvim-treesitter-context",
event = { "BufReadPre", "BufNewFile" }, event = { "BufReadPre", "BufNewFile" },
enabled = false,
} }

View file

@ -1,67 +1,66 @@
-- Treesitter -- Treesitter
return { return {
"nvim-treesitter/nvim-treesitter", "nvim-treesitter/nvim-treesitter",
build = ":TSUpdate", build = ":TSUpdate",
event = { "BufReadPre", "BufNewFile" }, event = { "BufReadPre", "BufNewFile" },
enabled = false, dependencies = {
dependencies = { "nvim-treesitter/nvim-treesitter-textobjects",
"nvim-treesitter/nvim-treesitter-textobjects", },
}, config = function()
config = function() local treesitter = require("nvim-treesitter.configs")
local treesitter = require("nvim-treesitter.configs")
treesitter.setup({ treesitter.setup({
highlight = { enable = true }, highlight = { enable = true },
indent = { enable = true }, indent = { enable = true },
auto_install = false, auto_install = false,
-- language list: https://github.com/nvim-treesitter/nvim-treesitter#supported-languages -- language list: https://github.com/nvim-treesitter/nvim-treesitter#supported-languages
ensure_installed = { ensure_installed = {
"lua", "lua",
"comment", -- used for TODO/FIXME/NOTE etc "comment", -- used for TODO/FIXME/NOTE etc
"vim", "vim",
"vimdoc", "vimdoc",
"bash", "bash",
"diff", "diff",
"gitignore", "gitignore",
"markdown", "markdown",
"markdown_inline", "markdown_inline",
"elixir", "elixir",
"eex", "eex",
"heex", "heex",
"yaml", "yaml",
"html", "html",
"javascript", "javascript",
"css", "css",
"dockerfile", "dockerfile",
"query", "query",
"hcl", "hcl",
"bicep", "bicep",
"csv", "csv",
"properties", "properties",
"ini", "ini",
"python", "python",
"regex", "regex",
"json", "json",
"go", "go",
"gomod", "gomod",
"gosum", "gosum",
"tcl", "tcl",
"editorconfig", "editorconfig",
"http", "http",
"make", "make",
"toml", "toml",
"latex", "latex",
"sql", "sql",
}, },
incremental_selection = { incremental_selection = {
enable = true, enable = true,
keymaps = { keymaps = {
init_selection = "<C-space>", init_selection = "<C-space>",
node_incremental = "<C-space>", node_incremental = "<C-space>",
scope_incremental = false, scope_incremental = false,
node_decremental = "<bs>", node_decremental = "<bs>",
}, },
}, },
}) })
end, end,
} }

View file

@ -1,5 +1,4 @@
return { return {
"RRethy/vim-illuminate", "RRethy/vim-illuminate",
event = { "BufReadPre", "BufNewFile" }, event = { "BufReadPre", "BufNewFile" }
enabled = false,
} }