aboutsummaryrefslogtreecommitdiff
path: root/lua
diff options
context:
space:
mode:
Diffstat (limited to 'lua')
-rw-r--r--lua/gabrielgio/formatter.lua1
-rw-r--r--lua/gabrielgio/init.lua1
-rw-r--r--lua/gabrielgio/linter.lua1
-rw-r--r--lua/gabrielgio/mini.lua47
-rw-r--r--lua/gabrielgio/settable.lua2
-rw-r--r--lua/gabrielgio/telescope.lua31
6 files changed, 45 insertions, 38 deletions
diff --git a/lua/gabrielgio/formatter.lua b/lua/gabrielgio/formatter.lua
index 893b837..cf5f849 100644
--- a/lua/gabrielgio/formatter.lua
+++ b/lua/gabrielgio/formatter.lua
@@ -34,6 +34,7 @@ formatter.setup({
go = { go.gofumpt, go.goimports },
terraform = { terraformfmt },
yaml = { require("formatter.filetypes.yaml").yamlfmt },
+ zig = { require("formatter.filetypes.zig").zigfmt },
typespec = { tspfmt },
},
["*"] = {
diff --git a/lua/gabrielgio/init.lua b/lua/gabrielgio/init.lua
index fcdce8c..5864ae7 100644
--- a/lua/gabrielgio/init.lua
+++ b/lua/gabrielgio/init.lua
@@ -16,7 +16,6 @@ later(require_func("gabrielgio.formatter"))
later(require_func("gabrielgio.treesitter"))
later(require_func("gabrielgio.mini"))
later(require_func("gabrielgio.go"))
-later(require_func("gabrielgio.telescope"))
later(require_func("gabrielgio.undotree"))
later(require_func("gabrielgio.so"))
later(require_func("gabrielgio.trouble"))
diff --git a/lua/gabrielgio/linter.lua b/lua/gabrielgio/linter.lua
index 8828f73..66c7233 100644
--- a/lua/gabrielgio/linter.lua
+++ b/lua/gabrielgio/linter.lua
@@ -1,7 +1,6 @@
local lint = require("lint")
lint.linters_by_ft = {
- go = { "golangcilint" },
lua = { "luacheck" },
fish = { "fish" },
markdown = { "vale" },
diff --git a/lua/gabrielgio/mini.lua b/lua/gabrielgio/mini.lua
index 4d151e8..b52152a 100644
--- a/lua/gabrielgio/mini.lua
+++ b/lua/gabrielgio/mini.lua
@@ -1,25 +1,64 @@
+local key = require("gabrielgio.key")
+
local ai = require("mini.ai")
local cmp = require("mini.completion")
+local cursorword = require("mini.cursorword")
local diff = require("mini.diff")
+local files = require("mini.files")
+local hipatterns = require("mini.hipatterns")
local icons = require("mini.icons")
local indentscope = require("mini.indentscope")
local notify = require("mini.notify")
+local pairs = require("mini.pairs")
+local pick = require("mini.pick")
local snippets = require("mini.snippets")
local status = require("mini.statusline")
local tabline = require("mini.tabline")
local trailspace = require("mini.trailspace")
ai.setup()
-cmp.setup()
+cursorword.setup()
diff.setup({ view = { style = "sign" } })
+files.setup()
icons.setup()
+indentscope.setup({ draw = { animation = indentscope.gen_animation.none() } })
notify.setup()
+pairs.setup()
+pick.setup()
snippets.setup()
status.setup()
tabline.setup()
trailspace.setup()
-indentscope.setup({
- draw = {
- animation = indentscope.gen_animation.none(),
+
+hipatterns.setup({
+ highlighters = {
+ fixme = { pattern = "%f[%w]()FIXME()%f[%W]", group = "MiniHipatternsFixme" },
+ hack = { pattern = "%f[%w]()HACK()%f[%W]", group = "MiniHipatternsHack" },
+ todo = { pattern = "%f[%w]()TODO()%f[%W]", group = "MiniHipatternsTodo" },
+ note = { pattern = "%f[%w]()NOTE()%f[%W]", group = "MiniHipatternsNote" },
+ hex_color = hipatterns.gen_highlighter.hex_color(),
},
})
+
+cmp.setup({ lsp_completition = {
+ snippet_isert = vim.snippet.expand,
+} })
+
+key.nnoremap("<leader>ff", ":Pick files<CR>")
+key.nnoremap("<leader>fs", ":Pick grep_live<CR>")
+key.nnoremap("<leader>n", ":Telescope file_browser<CR>")
+
+local minifiles_toggle = function()
+ if not MiniFiles.close() then
+ MiniFiles.open(nil, false)
+ end
+end
+
+local minifiles_toggle_dir = function()
+ if not MiniFiles.close() then
+ MiniFiles.open(vim.api.nvim_buf_get_name(0), false)
+ end
+end
+
+key.nnoremap("<leader>n", minifiles_toggle)
+key.nnoremap("<leader>m", minifiles_toggle_dir)
diff --git a/lua/gabrielgio/settable.lua b/lua/gabrielgio/settable.lua
index 387e47d..238a05f 100644
--- a/lua/gabrielgio/settable.lua
+++ b/lua/gabrielgio/settable.lua
@@ -48,7 +48,7 @@ vim.opt.foldmethod = "expr"
vim.opt.foldexpr = "nvim_treesitter#foldexpr()"
vim.opt.foldenable = false
vim.o.shell = "fish"
-vim.o.background = "dark"
+vim.o.background = "light"
if 1 == 1 then
vim.cmd("colorscheme edge")
else
diff --git a/lua/gabrielgio/telescope.lua b/lua/gabrielgio/telescope.lua
deleted file mode 100644
index d8089d1..0000000
--- a/lua/gabrielgio/telescope.lua
+++ /dev/null
@@ -1,31 +0,0 @@
-local key = require("gabrielgio.key")
-local builtins = require("telescope.builtin")
-local telescope = require("telescope")
-
-telescope.setup{
- defaults = {
- file_ignore_patterns = {
- 'vendor/',
- '\\.git/'
- },
- vimgrep_arguments = {
- "rg",
- "--color=never",
- "--no-heading",
- "--with-filename",
- "--line-number",
- "--column",
- "--smart-case",
- "--hidden"
- }
- },
-}
-
-telescope.load_extension("file_browser")
-
-key.nnoremap("<leader>ff", builtins.find_files)
-key.nnoremap("<leader>fs", builtins.live_grep)
-key.nnoremap("<leader>fc", ":Telescope lsp_dynamic_workspace_symbols<CR>")
-key.nnoremap("<leader>fd", ":Telescope buffers<CR>")
-key.nnoremap("<leader>n", ":Telescope file_browser<CR>")
-key.nnoremap("<leader>m", ":Telescope file_browser path=%:p:h select_buffer=true<CR>")