aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAriel D'Alessandro <dalessandro.ariel@gmail.com>2023-03-26 19:37:38 +0200
committerAriel D'Alessandro <dalessandro.ariel@gmail.com>2023-03-26 19:37:38 +0200
commit0cde83cfa15c5c0b8d117c34a8bfae38b4dec39c (patch)
tree08b945b16f7a95b73437f4b7bc8830b8dd1cb71f
parent5d3f2a47e06edf9b9c4eac9b0b0c89b36c2106b7 (diff)
downloadnvim-conf-0cde83cfa15c5c0b8d117c34a8bfae38b4dec39c.tar.gz
nvim-conf-0cde83cfa15c5c0b8d117c34a8bfae38b4dec39c.zip
feat: remove mind since is deprecated
-rw-r--r--.luacheckrc2
-rw-r--r--.luarc.json6
-rw-r--r--lazy-lock.json36
-rw-r--r--lua/alpha/completition/init.lua5
-rw-r--r--lua/alpha/globals.lua16
-rw-r--r--lua/alpha/telescope/actions.lua6
-rw-r--r--lua/alpha/telescope/init.lua14
-rw-r--r--lua/alpha/telescope/mappings.lua1
-rw-r--r--lua/config/options.lua1
-rw-r--r--lua/plugins/mind.lua16
-rw-r--r--lua/plugins/transparent.lua3
-rw-r--r--lua/plugins/vimwiki.lua12
12 files changed, 78 insertions, 40 deletions
diff --git a/.luacheckrc b/.luacheckrc
index 5a6c272..b79a269 100644
--- a/.luacheckrc
+++ b/.luacheckrc
@@ -13,9 +13,9 @@ ignore = {
}
globals = {
- "P",
"R",
"Reload",
+ "dump",
}
-- Global objects defined by the C code
diff --git a/.luarc.json b/.luarc.json
new file mode 100644
index 0000000..0d95c5c
--- /dev/null
+++ b/.luarc.json
@@ -0,0 +1,6 @@
+{
+ "diagnostics.globals": [
+ "vim",
+ "dump"
+ ]
+}
diff --git a/lazy-lock.json b/lazy-lock.json
index 0401d66..ddee939 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -2,7 +2,7 @@
"Comment.nvim": { "branch": "master", "commit": "8d3aa5c22c2d45e788c7a5fe13ad77368b783c20" },
"LuaSnip": { "branch": "master", "commit": "500981ff6cefc7343e3959ef0f939bd0bfd49ba9" },
"SmoothCursor.nvim": { "branch": "main", "commit": "b61173fb107455f18099715b88d86002579f2736" },
- "catppuccin": { "branch": "main", "commit": "eb4e73bfc5c364e86f08fbc8680e975a56638b1b" },
+ "catppuccin": { "branch": "main", "commit": "dc216c6241fd8439fe6018cca834200aca1a04ad" },
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
"cmp-cmdline": { "branch": "main", "commit": "8fcc934a52af96120fe26358985c10c035984b53" },
"cmp-dap": { "branch": "master", "commit": "d16f14a210cd28988b97ca8339d504533b7e09a4" },
@@ -14,7 +14,6 @@
"cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" },
"color-picker.nvim": { "branch": "master", "commit": "6d49c615cb9ff101fdcf85cd7137439e13bdbddc" },
"dressing.nvim": { "branch": "master", "commit": "5f44f829481640be0f96759c965ae22a3bcaf7ce" },
- "fidget.nvim": { "branch": "main", "commit": "688b4fec4517650e29c3e63cfbb6e498b3112ba1" },
"fzf.vim": { "branch": "master", "commit": "dc71692255b62d1f67dc55c8e51ab1aa467b1d46" },
"git-worktree.nvim": { "branch": "master", "commit": "d7f4e2584e81670154f07ca9fa5dd791d9c1b458" },
"gitsigns.nvim": { "branch": "main", "commit": "ca473e28382f1524aa3d2b6f04bcf54f2e6a64cb" },
@@ -22,34 +21,34 @@
"hydra.nvim": { "branch": "master", "commit": "3ced42c0b6a6c85583ff0f221635a7f4c1ab0dd0" },
"icon-picker.nvim": { "branch": "master", "commit": "66d37ceae84099ca76235de44466829eb37118c2" },
"indent-blankline.nvim": { "branch": "master", "commit": "018bd04d80c9a73d399c1061fa0c3b14a7614399" },
- "lazy.nvim": { "branch": "main", "commit": "a80422f21750fcbf0e90b26da877d4024d76f116" },
+ "lazy.nvim": { "branch": "main", "commit": "57cce98dfdb2f2dd05a0567d89811e6d0505e13b" },
"lsp-inlayhints.nvim": { "branch": "main", "commit": "84ca3abe8aaecbb5b30ad89e4701d4a9c821b72c" },
"lspkind-nvim": { "branch": "master", "commit": "c68b3a003483cf382428a43035079f78474cd11e" },
"lualine.nvim": { "branch": "master", "commit": "e99d733e0213ceb8f548ae6551b04ae32e590c80" },
"markdown-preview.nvim": { "branch": "main", "commit": "cc05a30393e2bf9f12e2d59fc35a1aa928ed1727" },
- "mason-lspconfig.nvim": { "branch": "main", "commit": "2b811031febe5f743e07305738181ff367e1e452" },
- "mason-tool-installer.nvim": { "branch": "main", "commit": "6ca38efeb0406dea8da6c97f61d6f6ef30ab0576" },
- "mason.nvim": { "branch": "main", "commit": "9f4e06029b1d8cd3bb4438f6b3de6d5c42d2d8d1" },
+ "mason-lspconfig.nvim": { "branch": "main", "commit": "b64fdede85fd5e0b720ce722919e0a9b95ed6547" },
+ "mason-tool-installer.nvim": { "branch": "main", "commit": "a6c4d7df448a78b0a05fd2065bef11ed52bee51c" },
+ "mason.nvim": { "branch": "main", "commit": "1f8e3a51d6370304ad29ca4f22fcb374018840db" },
"mind.nvim": { "branch": "v2.2", "commit": "79e0ca131d5e37dfa65f3f0e725d99742e4ff783" },
"neogen": { "branch": "main", "commit": "93d997dbddfe084e77ba4541c54a7b8bfd754fb1" },
"null-ls.nvim": { "branch": "main", "commit": "0180603b6f3cee40f83c6fc226b9ac5f85e691c4" },
"nvim-autopairs": { "branch": "master", "commit": "e755f366721bc9e189ddecd39554559045ac0a18" },
"nvim-cmp": { "branch": "main", "commit": "777450fd0ae289463a14481673e26246b5e38bf2" },
"nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" },
- "nvim-dap": { "branch": "master", "commit": "7e81998e31277c7a33b6c34423640900c5c2c776" },
+ "nvim-dap": { "branch": "master", "commit": "7389e85233e3483b31b6a1c4ba69cda77336b7a8" },
"nvim-dap-go": { "branch": "main", "commit": "b4ded7de579b4e2a85c203388233b54bf1028816" },
"nvim-dap-ui": { "branch": "master", "commit": "bdb94e3853d11b5ce98ec182e5a3719d5c0ef6fd" },
"nvim-dap-virtual-text": { "branch": "master", "commit": "8db23ea51203b5f00ad107a0cef7e0b2d7a0476c" },
"nvim-dap-vscode-js": { "branch": "main", "commit": "03bd29672d7fab5e515fc8469b7d07cc5994bbf6" },
- "nvim-lspconfig": { "branch": "master", "commit": "c6105c449683b944b5d2138fcf82f18c657249e9" },
+ "nvim-lspconfig": { "branch": "master", "commit": "e99d1590c7dc4c97b7dbc6a9c7e2dd830e204eea" },
"nvim-notify": { "branch": "master", "commit": "50d037041ada0895aeba4c0215cde6d11b7729c4" },
"nvim-projectconfig": { "branch": "master", "commit": "05fd34831e170db269d1b84597615bcdcdde930e" },
- "nvim-spectre": { "branch": "master", "commit": "2d7d23c1122bb2589880236e932d373933b07937" },
- "nvim-transparent": { "branch": "main", "commit": "b0c869557c962334eb601b9eaee344d1819a3931" },
- "nvim-treesitter": { "branch": "master", "commit": "87cf2abeb6077ac19a1249d0b06f223aa398a0a0" },
+ "nvim-spectre": { "branch": "master", "commit": "8fd64743b6390ab151a607fa91d0d74087a80ba6" },
+ "nvim-transparent": { "branch": "main", "commit": "2d8d650fc8a3b8da6a01031295547295eb473b7d" },
+ "nvim-treesitter": { "branch": "master", "commit": "981f88a0c206e19e99b9990bf95a107e7bc35f14" },
"nvim-treesitter-refactor": { "branch": "master", "commit": "b216290a2a47c856cf95cdc35e0c8d2c6306d89a" },
- "nvim-treesitter-textobjects": { "branch": "master", "commit": "582cbb5a4cb50f6161cac8cc01f55aeaff6d836a" },
- "nvim-various-textobjs": { "branch": "main", "commit": "0b2a34d3281fc065cf19042c2f15aea8b38af18a" },
+ "nvim-treesitter-textobjects": { "branch": "master", "commit": "de9801d4f448df958d09fec60839e0a39d069610" },
+ "nvim-various-textobjs": { "branch": "main", "commit": "1022e42acc62cfe6ddaf6e320c77bec5d47dc1d2" },
"nvim-web-devicons": { "branch": "master", "commit": "95b1e300699be8eb6b5be1758a9d4d69fe93cc7f" },
"php-code-actions.nvim": { "branch": "main", "commit": "31831cb7c3227ac00ddc7590b31f11148ff4a81c" },
"playground": { "branch": "master", "commit": "4044b53c4d4fcd7a78eae20b8627f78ce7dc6f56" },
@@ -58,13 +57,13 @@
"refactoring.nvim": { "branch": "master", "commit": "57c32c6b7a211e5a3a5e4ddc4ad2033daff5cf9a" },
"rest.nvim": { "branch": "main", "commit": "0fdb69f328529b34a2279c14be63b3325dc52740" },
"telescope-dap.nvim": { "branch": "master", "commit": "313d2ea12ae59a1ca51b62bf01fc941a983d9c9c" },
- "telescope-file-browser.nvim": { "branch": "master", "commit": "24389d847f931e3822c5babdd308d20e2e8c638f" },
+ "telescope-file-browser.nvim": { "branch": "master", "commit": "920c705f03c139f21c9b38ceff05c7c743de7d7f" },
"telescope-fzf-native.nvim": { "branch": "main", "commit": "580b6c48651cabb63455e97d7e131ed557b8c7e2" },
"telescope-fzy-native.nvim": { "branch": "master", "commit": "282f069504515eec762ab6d6c89903377252bf5b" },
"telescope-ui-select.nvim": { "branch": "master", "commit": "62ea5e58c7bbe191297b983a9e7e89420f581369" },
"telescope.nvim": { "branch": "master", "commit": "942fe5faef47b21241e970551eba407bc10d9547" },
- "todo-comments.nvim": { "branch": "main", "commit": "14e2cd9a6e5e67483a03660f08471ca9a981c4a5" },
- "trouble.nvim": { "branch": "main", "commit": "7915277a259fdff5d46c6f1d2e100df2ec384d3b" },
+ "todo-comments.nvim": { "branch": "main", "commit": "0874bda6848ff6f3da3ffdf4bd8297a5c951c5d4" },
+ "trouble.nvim": { "branch": "main", "commit": "2ae7237c2917d661f458443c9a88680f8ca2d7b2" },
"vim-blade": { "branch": "master", "commit": "9534101808cc320eef003129a40cab04b026a20c" },
"vim-dadbod": { "branch": "master", "commit": "389a2b0120f82b13d51ff7c07f5c13f9bc9f412f" },
"vim-dadbod-completion": { "branch": "master", "commit": "e71eb6140556c5ced80de6299a1fdfe22bd3c1b1" },
@@ -73,9 +72,10 @@
"vim-dotenv": { "branch": "master", "commit": "5c51cfcf8d87280d6414e03cd6b253eb70ecb800" },
"vim-easy-align": { "branch": "master", "commit": "12dd6316974f71ce333e360c0260b4e1f81169c3" },
"vim-eunuch": { "branch": "master", "commit": "291ef1f8c8996ca7715df1032a35a27b12d7b5cf" },
- "vim-fugitive": { "branch": "master", "commit": "309c68117eca3a95349093012e5886a184c1812d" },
+ "vim-fugitive": { "branch": "master", "commit": "9acbad1335ee6f30a8497733dcb2373c4550c8a2" },
"vim-repeat": { "branch": "master", "commit": "24afe922e6a05891756ecf331f39a1f6743d3d5a" },
"vim-rhubarb": { "branch": "master", "commit": "cad60fe382f3f501bbb28e113dfe8c0de6e77c75" },
"vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
- "vim-test": { "branch": "master", "commit": "3995a9419dbea1d93ab916bc8f53ee9f19435223" }
+ "vim-test": { "branch": "master", "commit": "3995a9419dbea1d93ab916bc8f53ee9f19435223" },
+ "vimwiki": { "branch": "dev", "commit": "dec6a9ecab3e5ec9ceff28b84cabb5c62d05ee9f" }
} \ No newline at end of file
diff --git a/lua/alpha/completition/init.lua b/lua/alpha/completition/init.lua
index eeb9cbe..02c9978 100644
--- a/lua/alpha/completition/init.lua
+++ b/lua/alpha/completition/init.lua
@@ -48,7 +48,10 @@ cmp.setup {
get_bufnrs = function()
local bufs = {}
for _, win in ipairs(vim.api.nvim_list_wins()) do
- bufs[vim.api.nvim_win_get_buf(win)] = true
+ local bufnr = vim.api.nvim_win_get_buf(win)
+ if vim.api.nvim_buf_get_option(bufnr, 'buftype') ~= 'terminal' then
+ bufs[bufnr] = true
+ end
end
return vim.tbl_keys(bufs)
end,
diff --git a/lua/alpha/globals.lua b/lua/alpha/globals.lua
index d6fd70c..b575c0c 100644
--- a/lua/alpha/globals.lua
+++ b/lua/alpha/globals.lua
@@ -1,6 +1,16 @@
-P = function(v)
- print(vim.inspect(v))
- return v
+--- Dumps all values into pretty print
+---@vararg any
+---@return any
+dump = function(...)
+ local args = {...}
+
+ local mapped = {}
+ for _, v in ipairs(args) do
+ table.insert(mapped, vim.inspect(v))
+ end
+ print(unpack(mapped))
+
+ return unpack(args)
end
RELOAD = function(...)
diff --git a/lua/alpha/telescope/actions.lua b/lua/alpha/telescope/actions.lua
index abd3381..c7cdaa8 100644
--- a/lua/alpha/telescope/actions.lua
+++ b/lua/alpha/telescope/actions.lua
@@ -160,4 +160,10 @@ M.enable_plugin = function(prompt_bufnr)
end)
end
+M.create_scratch_file = function(prompt_bufnr)
+ local new_scratch = action_state.get_current_line()
+ actions.close(prompt_bufnr)
+ vim.cmd(string.format("edit ~/.config/nvim/lua/scratchs/%s.lua", new_scratch))
+end
+
return M
diff --git a/lua/alpha/telescope/init.lua b/lua/alpha/telescope/init.lua
index b5087b3..28397b0 100644
--- a/lua/alpha/telescope/init.lua
+++ b/lua/alpha/telescope/init.lua
@@ -8,7 +8,6 @@ local reloader = function()
end
end
-local action_state = require "telescope.actions.state"
local fb_actions = require("telescope").extensions.file_browser.actions
local actions = require "telescope.actions"
local my_actions = require "alpha.telescope.actions"
@@ -94,6 +93,19 @@ function M.my_plugins()
}
end
+function M.scratchs()
+ require("telescope.builtin").find_files {
+ prompt_title = "Scratchs",
+ no_ignore = true,
+ cwd = "~/.config/nvim/lua/scratchs/",
+ attach_mappings = function (_, map)
+ map("i", "<c-t>", my_actions.create_scratch_file)
+
+ return true
+ end
+ }
+end
+
function M.projectionist()
return require("telescope").extensions.projectionist.projectionist()
end
diff --git a/lua/alpha/telescope/mappings.lua b/lua/alpha/telescope/mappings.lua
index 7d0f697..be59eaf 100644
--- a/lua/alpha/telescope/mappings.lua
+++ b/lua/alpha/telescope/mappings.lua
@@ -29,6 +29,7 @@ map_tele("<leader>pf", "projectionist")
map_tele("<leader>rc", "search_config")
map_tele("<leader>rn", "find_nvim_config")
map_tele("<leader>rp", "find_nvim_plugin")
+map_tele("<leader>rs", "scratchs")
map_tele("<leader>ph", "help_tags")
map_tele("<leader>pe", "buffers")
map_tele("<leader>pr", "treesitter")
diff --git a/lua/config/options.lua b/lua/config/options.lua
index c4d1f56..30a3127 100644
--- a/lua/config/options.lua
+++ b/lua/config/options.lua
@@ -36,6 +36,7 @@ opt.laststatus = 3
opt.cmdheight = 1
opt.updatetime = 50
opt.signcolumn = "yes"
+opt.equalalways = false
if vim.fn.has "nvim-0.9.0" == 1 then
opt.splitkeep = "screen"
diff --git a/lua/plugins/mind.lua b/lua/plugins/mind.lua
deleted file mode 100644
index f474e96..0000000
--- a/lua/plugins/mind.lua
+++ /dev/null
@@ -1,16 +0,0 @@
-return {
- "phaazon/mind.nvim",
- branch = "v2.2",
- dependencies = { "nvim-lua/plenary.nvim" },
- cmd = { "MindOpenMain", "MindOpenProject" },
- config = function()
- local dirs = {}
- if vim.fn.isdirectory "/mnt/nas/alpha/mind/data" == 1 then
- dirs = {
- state_path = "/mnt/nas/alpha/mind/mind.json",
- data_dir = "/mnt/nas/alpha/mind/data",
- }
- end
- require("mind").setup { persistence = dirs }
- end,
-}
diff --git a/lua/plugins/transparent.lua b/lua/plugins/transparent.lua
index f1d2139..6a74786 100644
--- a/lua/plugins/transparent.lua
+++ b/lua/plugins/transparent.lua
@@ -1,5 +1,8 @@
return {
"xiyaowong/nvim-transparent",
event = "VeryLazy",
+ init = function ()
+ vim.g.transparent_enabled = true
+ end,
config = true,
}
diff --git a/lua/plugins/vimwiki.lua b/lua/plugins/vimwiki.lua
new file mode 100644
index 0000000..581cd33
--- /dev/null
+++ b/lua/plugins/vimwiki.lua
@@ -0,0 +1,12 @@
+return {
+ "vimwiki/vimwiki",
+ cmd = { "VimwikiIndex" },
+ init = function()
+ vim.g.vimwiki_list = {{
+ path = "/mnt/nas/alpha/wiki",
+ syntax = "markdown",
+ ext = ".md",
+ }}
+ vim.g.vimwiki_global_ext = 0
+ end,
+}