Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions dot_config/nvim/lua/config/autocmds.lua
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ create_autocmd({
pattern = "term://*",
command = function()
vim.api.nvim_command("startinsert")
vim.opt.cursorline = true
vim.opt.number = false
end,
})

Expand All @@ -23,7 +21,6 @@ create_autocmd({
pattern = "term://*",
command = function()
vim.api.nvim_command("stopinsert")
vim.opt.cursorline = false
end,
})

Expand All @@ -41,8 +38,7 @@ create_autocmd({
event = { "BufEnter", "WinEnter" },
pattern = "*.R",
command = function()
vim.api.nvim_command("TSToggle highlight")
vim.api.nvim_command("TSToggle highlight")
vim.api.nvim_command("TSDisable highlight")
end,
})

Expand All @@ -51,8 +47,7 @@ create_autocmd({
event = { "BufEnter", "WinEnter" },
pattern = "*.py",
command = function()
vim.api.nvim_command("TSToggle highlight")
vim.api.nvim_command("TSToggle highlight")
vim.api.nvim_command("TSDisable highlight")
end,
})

Expand All @@ -61,8 +56,16 @@ create_autocmd({
event = { "BufEnter", "WinEnter" },
pattern = "*.rb",
command = function()
vim.api.nvim_command("TSToggle highlight")
vim.api.nvim_command("TSToggle highlight")
vim.api.nvim_command("TSDisable highlight")
end,
})

-- Switch back to previous mode and re-enable cursorline when exiting terminal buffer.
create_autocmd({
event = { "BufEnter", "WinEnter"},
pattern = "*(help)",
command = function()
vim.api.nvim_command("vertical resize 80")
end,
})

Expand All @@ -73,6 +76,8 @@ create_autocmd({
command = function()
vim.api.nvim_command("resize 18")
vim.opt.number = false
vim.opt.cursorline = false
vim.opt.signcolumn = "no"
end,
})

Expand Down
2 changes: 1 addition & 1 deletion dot_config/nvim/lua/config/options.lua
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ opt.ruler = true
opt.wrapscan = true
opt.hidden = true
opt.encoding = "utf-8"
opt.equalalways = false
opt.equalalways = true
opt.ttimeoutlen = 0
opt.relativenumber = false
--opt.ffs = "unix,dos,mac"
Expand Down
19 changes: 19 additions & 0 deletions dot_config/nvim/lua/plugins/neo-tree.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
return {
"nvim-neo-tree/neo-tree.nvim",
opts = {
event_handlers = {
{
event = "neo_tree_window_after_close",
handler = function(args)
vim.cmd("wincmd =")
end
},
{
event = "before_render",
handler = function(args)
vim.cmd("wincmd =")
end
},
}
}
}
8 changes: 0 additions & 8 deletions dot_config/nvim/lua/plugins/nvim-treesitter.lua

This file was deleted.

2 changes: 1 addition & 1 deletion dot_config/nvim/lua/plugins/r_nvim_config.lua
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
return {
"R-nvim/R.nvim",
opts = {
nvimpager = "split_h",
nvimpager = "split_v",
rconsole_width = 0,
Rout_more_colors = true,
esc_term = false,
Expand Down