aboutsummaryrefslogtreecommitdiff
path: root/lua
diff options
context:
space:
mode:
Diffstat (limited to 'lua')
-rw-r--r--lua/config/settings.lua13
-rw-r--r--lua/plugins/colorscheme.lua5
-rw-r--r--lua/plugins/colourscheme.lua9
-rw-r--r--lua/plugins/init.lua3
-rw-r--r--lua/plugins/jai.lua3
-rw-r--r--lua/plugins/mini.lua42
-rw-r--r--lua/plugins/mini/clues.lua13
-rw-r--r--lua/plugins/mini/files.lua9
-rw-r--r--lua/plugins/mini/highlight.lua8
-rw-r--r--lua/plugins/mini/pick.lua7
-rw-r--r--lua/plugins/mini/starter.lua30
-rw-r--r--lua/plugins/todotxt.lua4
12 files changed, 70 insertions, 76 deletions
diff --git a/lua/config/settings.lua b/lua/config/settings.lua
index 00fca50..652d522 100644
--- a/lua/config/settings.lua
+++ b/lua/config/settings.lua
@@ -1,3 +1,11 @@
+vim.g.mapleader = " "
+
+-- navigate vim panes better
+vim.keymap.set('n', '<C-k>', ':wincmd k<CR>')
+vim.keymap.set('n', '<C-j>', ':wincmd j<CR>')
+vim.keymap.set('n', '<C-h>', ':wincmd h<CR>')
+vim.keymap.set('n', '<C-l>', ':wincmd l<CR>')
+
-- enable line number and relative line numbers
vim.opt.number = true
vim.opt.relativenumber = true
@@ -13,7 +21,7 @@ vim.opt.splitbelow = true
vim.opt.splitright = true
-- disable line wrapping
-vim.opt.wrap = false
+vim.opt.wrap = true
-- enable global statusline
vim.opt.laststatus = 3
@@ -55,7 +63,7 @@ vim.opt.completeopt = "menuone,noinsert,noselect"
-- enable signcolumn
vim.opt.signcolumn = "yes"
--- enable rounded borders
+-- enable rounded borders (nvim 0.11+)
vim.opt.winborder = "rounded"
-- better file handling
@@ -66,6 +74,7 @@ vim.opt.undofile = true
vim.opt.undodir = vim.fn.expand("~/.local/state/nvim/undo")
vim.opt.autoread = true
vim.opt.autowrite = false
+vim.opt.clipboard = 'unnamedplus'
-- durations for completion and other stuff
vim.opt.updatetime = 300
diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua
deleted file mode 100644
index 464ab75..0000000
--- a/lua/plugins/colorscheme.lua
+++ /dev/null
@@ -1,5 +0,0 @@
-vim.pack.add({
- { src = "https://github.com/rose-pine/neovim", name = "rose-pine" },
-})
-vim.o.background = "dark"
-vim.cmd([[colorscheme rose-pine]])
diff --git a/lua/plugins/colourscheme.lua b/lua/plugins/colourscheme.lua
new file mode 100644
index 0000000..3f7c434
--- /dev/null
+++ b/lua/plugins/colourscheme.lua
@@ -0,0 +1,9 @@
+vim.pack.add({"https://github.com/serhez/teide.nvim"})
+
+local function ColorMyPencils()
+ vim.cmd([[colorscheme teide-darker]])
+ vim.api.nvim_set_hl(0, "Normal", { bg = "none" })
+ vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })
+end
+
+ColorMyPencils()
diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua
index 1ce2bb7..59ef1a3 100644
--- a/lua/plugins/init.lua
+++ b/lua/plugins/init.lua
@@ -1,6 +1,7 @@
-require("plugins.colorscheme")
+require("plugins.colourscheme")
require("plugins.treesitter")
require("plugins.lsp")
+require("plugins.jai")
require("plugins.mini")
require("plugins.mini.init")
require("plugins.markdown")
diff --git a/lua/plugins/jai.lua b/lua/plugins/jai.lua
new file mode 100644
index 0000000..646fcc1
--- /dev/null
+++ b/lua/plugins/jai.lua
@@ -0,0 +1,3 @@
+vim.pack.add({'https://github.com/rluba/jai.vim'})
+
+
diff --git a/lua/plugins/mini.lua b/lua/plugins/mini.lua
index 61f3388..e54a6d9 100644
--- a/lua/plugins/mini.lua
+++ b/lua/plugins/mini.lua
@@ -1,25 +1,29 @@
-vim.pack.add({
- { src = "https://github.com/nvim-mini/mini.nvim" },
-})
-
--- git related stuff
-require("mini.git").setup()
-require("mini.diff").setup()
+vim.pack.add({ { src = "https://github.com/nvim-mini/mini.nvim" } })
-- setup statusline
-require("mini.statusline").setup()
-
--- move lines
-require("mini.move").setup()
-
--- easy split args
-require("mini.splitjoin").setup()
+require('mini.statusline').setup({
+ use_icons = true,
+})
--- surround actions
-require("mini.surround").setup()
+-- colorscheme integration
+require("teide").setup({
+ integration = {
+ mini = true,
+ },
+})
-- amazing fast indent scope highlight plugin
-require("mini.indentscope").setup()
+require('mini.indentscope').setup({
+ draw = {
+ delay = 100,
+ predicate = function(scope) return not scope.body.is_incomplete end,
+ priority = 2,
+ }
+})
+
+-- git related stuff
+require('mini.git').setup()
+require('mini.diff').setup()
--- nice simple notifications inside neovim
-require("mini.notify").setup()
+-- load mini sub-modules
+require("plugins.mini.init")
diff --git a/lua/plugins/mini/clues.lua b/lua/plugins/mini/clues.lua
index e7d32aa..d4bdc38 100644
--- a/lua/plugins/mini/clues.lua
+++ b/lua/plugins/mini/clues.lua
@@ -1,4 +1,4 @@
--- setup mini.clues, whickey but much simpler
+-- setup mini.clue, whichkey but much simpler
local miniclue = require('mini.clue')
miniclue.setup({
triggers = {
@@ -31,27 +31,20 @@ miniclue.setup({
-- `z` key
{ mode = 'n', keys = 'z' },
{ mode = 'x', keys = 'z' },
-
- -- add in support for built in completion
- { mode = 'i', keys = '<C-x>' },
},
clues = {
- -- Enhance this by adding descriptions for <Leader> mapping groups
miniclue.gen_clues.builtin_completion(),
miniclue.gen_clues.g(),
miniclue.gen_clues.marks(),
miniclue.gen_clues.registers(),
miniclue.gen_clues.windows(),
miniclue.gen_clues.z(),
- -- add some clues to custom stuff
+ -- group labels
{ mode = "n", keys = "<Leader>f", desc = "Find" },
{ mode = "n", keys = "<Leader>fg", desc = "Git" },
{ mode = "n", keys = "<Leader>l", desc = "Lsp" },
- { mode = "n", keys = "<Leader>s", desc = "Treesitter" },
- { mode = "n", keys = "<Leader>v", desc = "Visits" },
-
- -- built in completion
+ -- built-in completion hints
{ mode = 'i', keys = '<C-x><C-f>', desc = 'File names' },
{ mode = 'i', keys = '<C-x><C-l>', desc = 'Whole lines' },
{ mode = 'i', keys = '<C-x><C-o>', desc = 'Omni completion' },
diff --git a/lua/plugins/mini/files.lua b/lua/plugins/mini/files.lua
index 4285838..a1ac24f 100644
--- a/lua/plugins/mini/files.lua
+++ b/lua/plugins/mini/files.lua
@@ -27,11 +27,10 @@ vim.api.nvim_create_autocmd('User', {
pattern = 'MiniFilesBufferCreate',
callback = function(args)
local b = args.data.buf_id
- vim.keymap.set('n', 'g~', set_cwd, { buffer = b, desc = 'Set cwd' })
- vim.keymap.set('n', 'gX', ui_open, { buffer = b, desc = 'OS open' })
- vim.keymap.set('n', 'gy', yank_path, { buffer = b, desc = 'Yank path' })
+ vim.keymap.set('n', 'g~', set_cwd, { buffer = b, desc = 'Set cwd' })
+ vim.keymap.set('n', 'gX', ui_open, { buffer = b, desc = 'OS open' })
+ vim.keymap.set('n', 'gy', yank_path, { buffer = b, desc = 'Yank path' })
end,
})
--- setup keybinding for mini.files
-vim.keymap.set("n", "<Leader>e", function() minifiles_toggle() end, { desc = "Toggle mini.files explorer" })
+vim.keymap.set("n", "<leader>e", function() minifiles_toggle() end, { desc = "Toggle mini.files explorer" })
diff --git a/lua/plugins/mini/highlight.lua b/lua/plugins/mini/highlight.lua
index 0c74d33..93c6576 100644
--- a/lua/plugins/mini/highlight.lua
+++ b/lua/plugins/mini/highlight.lua
@@ -2,10 +2,10 @@
local hipatterns = require("mini.hipatterns")
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' },
+ 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(),
},
diff --git a/lua/plugins/mini/pick.lua b/lua/plugins/mini/pick.lua
index e9a1a9f..762ad9b 100644
--- a/lua/plugins/mini/pick.lua
+++ b/lua/plugins/mini/pick.lua
@@ -1,5 +1,8 @@
-- setup picker with icons
-require("mini.icons").setup()
+require("mini.icons").setup({
+ style = 'glyph',
+ use_file_extension = function(ext, file) return true end,
+})
require("mini.pick").setup({
options = {
use_cache = true,
@@ -10,7 +13,7 @@ require("mini.pick").setup({
require("mini.extra").setup()
-- mini.pick keybindings
-local patterns = { "fixme", "hack", "todo", "note", }
+local patterns = { "fixme", "hack", "todo", "note" }
vim.keymap.set("n", "<Leader>ff", ":Pick files<CR>", { desc = "Search file in directory" })
vim.keymap.set("n", "<Leader>fw", ":Pick grep_live<CR>", { desc = "Search for word in directory" })
vim.keymap.set("n", "<Leader>fh", ":Pick help<CR>", { desc = "Search neovim help" })
diff --git a/lua/plugins/mini/starter.lua b/lua/plugins/mini/starter.lua
index 782eddf..0e0ac30 100644
--- a/lua/plugins/mini/starter.lua
+++ b/lua/plugins/mini/starter.lua
@@ -1,38 +1,16 @@
--- minimal session manager
-require("mini.sessions").setup()
-
-vim.keymap.set("n", "<Leader>sc", function() MiniSessions.write() end, { desc = "Create new session/project" })
-vim.keymap.set("n", "<Leader>ss", function() MiniSessions.select("read") end, { desc = "Select session/project" })
-
--- nice file/directory visit tracker
-require("mini.visits").setup()
-
--- setup some basic label keybindings
-local map_vis = function(keys, call, desc)
- local rhs = '<Cmd>lua MiniVisits.' .. call .. '<CR>'
- vim.keymap.set('n', '<Leader>' .. keys, rhs, { desc = desc })
-end
-
-map_vis('vv', 'add_label()', 'Add label')
-map_vis('vV', 'remove_label()', 'Remove label')
-map_vis('vc', 'add_label("core")', 'Add to core')
-map_vis('vC', 'remove_label("core")', 'Remove from core')
-vim.keymap.set("n", "<Leader>fv", ":Pick visit_paths<CR>", { desc = "Search visited files" })
-vim.keymap.set("n", "<Leader>fc", ":Pick visit_paths filter='core'<CR>",
- { desc = "Search visited files with tag 'core'" })
-
--- simple startup startup screen
+-- simple startup screen
local starter = require('mini.starter')
starter.setup({
+ header = "hello, friend",
+ footer = "you're gay for my code, you're code gay.",
evaluate_single = true,
items = {
starter.sections.builtin_actions(),
- starter.sections.sessions(5, true),
starter.sections.recent_files(5, true),
starter.sections.recent_files(5, false),
},
content_hooks = {
starter.gen_hook.adding_bullet(),
- starter.gen_hook.aligning("center", "center")
+ starter.gen_hook.aligning("center", "center"),
},
})
diff --git a/lua/plugins/todotxt.lua b/lua/plugins/todotxt.lua
index 7794ae3..c005690 100644
--- a/lua/plugins/todotxt.lua
+++ b/lua/plugins/todotxt.lua
@@ -3,8 +3,8 @@ vim.pack.add({
})
require("todotxt").setup({
- todotxt = vim.env.HOME .. "/docs/sb/todo/todo.txt",
- donetxt = vim.env.HOME .. "/docs/sb/todo/done.txt",
+ todotxt = vim.env.HOME .. "/dox/todo/todo.txt",
+ donetxt = vim.env.HOME .. "/dox/todo/done.txt",
ghost_text = {
enable = true,
mappings = {