treesitter almost fixed

This commit is contained in:
Tyrel Souza 2023-01-02 15:37:07 -05:00
parent d2c7d381d0
commit cfa2de4792
4 changed files with 36 additions and 19 deletions

0
Makefile Normal file
View File

View File

@ -7,9 +7,10 @@ return function(use)
vim.opt.runtimepath:append(parser_install_dir) vim.opt.runtimepath:append(parser_install_dir)
-- Treesitter is managed by the package config, we just manage configs/deps here -- Treesitter is managed by the package config, we just manage configs/deps here
-- use({ "nvim-treesitter/nvim-treesitter-refactor" }) use({ "nvim-treesitter/nvim-treesitter-refactor" })
-- use({ "RRethy/nvim-treesitter-textsubjects" }) use({ "RRethy/nvim-treesitter-textsubjects" })
-- require("nvim-treesitter.configs").setup({
require("nvim-treesitter.configs").setup({
-- highlight = { enable = true, disable = { "lua" } }, -- highlight = { enable = true, disable = { "lua" } },
-- indent = { enable = true }, -- indent = { enable = true },
-- refactor = { highlight_definitions = { enable = true } }, -- refactor = { highlight_definitions = { enable = true } },
@ -22,8 +23,8 @@ return function(use)
-- ["."] = "textsubjects-smart", -- ["."] = "textsubjects-smart",
-- }, -- },
-- }, -- },
-- parser_install_dir = parser_install_dir, parser_install_dir = parser_install_dir,
-- }) })
use({'atelierbram/vim-colors_atelier-schemes'}) use({'atelierbram/vim-colors_atelier-schemes'})
use({'robertmeta/nofrils'}) use({'robertmeta/nofrils'})

View File

@ -40,7 +40,7 @@ vim.opt.undofile = true
vim.opt.number = true vim.opt.number = true
vim.opt.relativenumber = true vim.opt.relativenumber = true
vim.g.colors = "Atelier_SulphurpoolDark" vim.cmd 'colorscheme Atelier_SulphurpoolDark'
vim.g.floaterm_keymap_toggle = '<F9>' vim.g.floaterm_keymap_toggle = '<F9>'
vim.g.floaterm_width = 0.9 vim.g.floaterm_width = 0.9
vim.g.floaterm_height = 0.9 vim.g.floaterm_height = 0.9

View File

@ -0,0 +1,16 @@
local utils = { }
local scopes = {o = vim.o, b = vim.bo, w = vim.wo}
function utils.opt(scope, key, value)
scopes[scope][key] = value
if scope ~= 'o' then scopes['o'][key] = value end
end
function utils.map(mode, lhs, rhs, opts)
local options = {noremap = true}
if opts then options = vim.tbl_extend('force', options, opts) end
vim.api.nvim_set_keymap(mode, lhs, rhs, options)
end
return utils