diff --git a/init.lua b/init.lua index eff10b2..87357b3 100644 --- a/init.lua +++ b/init.lua @@ -59,3 +59,17 @@ vim.keymap.set('n', 'db', function() widgets.centered_float(widgets.scopes) end) +local lspconfig = require 'lspconfig' +local configs = require 'lspconfig.configs' +if not configs.drupal then + configs.drupal = { + default_config = { + cmd = {'drupal-lsp'}, + filetypes = { 'php'}, + root_dir = function(fname) + return lspconfig.util.root_pattern('composer.json', '.git')(fname) + end + }; + } + end +lspconfig.drupal.setup{autostart = true } diff --git a/lazy-lock.json b/lazy-lock.json index 7ae83a0..ca25e5d 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,6 +1,7 @@ { "LuaSnip": { "branch": "master", "commit": "2737edc9e674e537dc0a97e3405658d57d2d31ed" }, "alpha-nvim": { "branch": "main", "commit": "bf3c8bb8c02ed3d9644cc5bbc48e2bdc39349cd7" }, + "calendar-vim": { "branch": "master", "commit": "a7e73e02c92566bf427b2a1d6a61a8f23542cc21" }, "catppuccin": { "branch": "main", "commit": "637d99e638bc6f1efedac582f6ccab08badac0c6" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, @@ -25,6 +26,7 @@ "nvim-treesitter": { "branch": "master", "commit": "bb06afa3f1111780932b3c5493ad65473ce85f9d" }, "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, + "telekasten.nvim": { "branch": "main", "commit": "6a10a7929421d6e696e46bbc5aa5627a8cbcf61d" }, "telescope-dap.nvim": { "branch": "master", "commit": "783366bd6c1e7fa0a5c59c07db37f49c805a28df" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, diff --git a/lua/dan/completion.lua b/lua/dan/completions.lua similarity index 100% rename from lua/dan/completion.lua rename to lua/dan/completions.lua diff --git a/lua/dan/core.lua b/lua/dan/core.lua index b611ec5..9a3a189 100644 --- a/lua/dan/core.lua +++ b/lua/dan/core.lua @@ -15,6 +15,7 @@ vim.cmd("set relativenumber") vim.cmd("set rnu") vim.cmd("set number relativenumber") vim.cmd("set nu rnu") +-- vim.cmd("set guicursor=a:blinkon100") vim.api.nvim_set_option("clipboard","unnamed") vim.api.nvim_create_user_command("DiagnosticsToggle", function() local config = vim.diagnostic.config @@ -25,3 +26,18 @@ vim.api.nvim_create_user_command("DiagnosticsToggle", function() signs = not vt, } end, { desc = "toggle diagnostic" }) +-- Launch panel if nothing is typed after z +vim.keymap.set("n", "z", "Telekasten panel") + +-- Most used functions +vim.keymap.set("n", "zf", "Telekasten find_notes") +vim.keymap.set("n", "zg", "Telekasten search_notes") +vim.keymap.set("n", "zd", "Telekasten goto_today") +vim.keymap.set("n", "zz", "Telekasten follow_link") +vim.keymap.set("n", "zn", "Telekasten new_note") +vim.keymap.set("n", "zc", "Telekasten show_calendar") +vim.keymap.set("n", "zb", "Telekasten show_backlinks") +vim.keymap.set("n", "zI", "Telekasten insert_img_link") + +-- Call insert link automatically when we start typing a link +vim.keymap.set("i", "[[", "Telekasten insert_link") diff --git a/lua/plugins/calendar.lua b/lua/plugins/calendar.lua new file mode 100644 index 0000000..22adbe7 --- /dev/null +++ b/lua/plugins/calendar.lua @@ -0,0 +1,3 @@ +return { + "renerocksai/calendar-vim" +} diff --git a/lua/plugins/completions.lua b/lua/plugins/completions.lua index d873844..d16819e 100644 --- a/lua/plugins/completions.lua +++ b/lua/plugins/completions.lua @@ -12,7 +12,7 @@ return { "saadparwaiz1/cmp_luasnip", }, config = function() - require "dan.completion" + require "dan.completions" end } } diff --git a/lua/plugins/notes.lua b/lua/plugins/notes.lua new file mode 100644 index 0000000..bd452c0 --- /dev/null +++ b/lua/plugins/notes.lua @@ -0,0 +1,9 @@ +return { + 'renerocksai/telekasten.nvim', + dependencies = {'nvim-telescope/telescope.nvim'}, + config = function() + require('telekasten').setup({ + home = vim.fn.expand("~/Personal/Notes/Notebook"), -- Put the name of your notes directory here + }) + end +} diff --git a/lua/plugins/strudel.lua b/lua/plugins/strudel.lua index a564707..97aeadd 100644 --- a/lua/plugins/strudel.lua +++ b/lua/plugins/strudel.lua @@ -1 +1,2 @@ -return {} +return { +}