diff options
Diffstat (limited to 'vim/lua')
| -rw-r--r-- | vim/lua/configs/conform.lua | 6 | ||||
| -rw-r--r-- | vim/lua/configs/telescope.lua | 6 | ||||
| -rw-r--r-- | vim/lua/plugins/init.lua | 11 |
3 files changed, 18 insertions, 5 deletions
diff --git a/vim/lua/configs/conform.lua b/vim/lua/configs/conform.lua index 411336e..b6fa6bb 100644 --- a/vim/lua/configs/conform.lua +++ b/vim/lua/configs/conform.lua | |||
| @@ -1,12 +1,12 @@ | |||
| 1 | local options = { | 1 | local options = { |
| 2 | formatters_by_ft = { | 2 | formatters_by_ft = { |
| 3 | lua = { "stylua" }, | 3 | lua = { "stylua" }, |
| 4 | css = { "prettier" }, | ||
| 5 | html = { "prettier" }, | ||
| 6 | markdown = { "prettier" }, | ||
| 7 | sh = {"shfmt"}, | 4 | sh = {"shfmt"}, |
| 8 | bash = {"shfmt"}, | 5 | bash = {"shfmt"}, |
| 9 | zsh = {"shfmt"}, | 6 | zsh = {"shfmt"}, |
| 7 | markdown = { "prettier" }, | ||
| 8 | css = { "prettier" }, | ||
| 9 | html = { "prettier" }, | ||
| 10 | }, | 10 | }, |
| 11 | 11 | ||
| 12 | -- format_on_save = { | 12 | -- format_on_save = { |
diff --git a/vim/lua/configs/telescope.lua b/vim/lua/configs/telescope.lua index 60828e9..70eddf4 100644 --- a/vim/lua/configs/telescope.lua +++ b/vim/lua/configs/telescope.lua | |||
| @@ -6,6 +6,10 @@ return { | |||
| 6 | -- ["<c-k>"] = "move_selection_previous", | 6 | -- ["<c-k>"] = "move_selection_previous", |
| 7 | ["<C-w>"] = require("telescope.actions.layout").toggle_preview, | 7 | ["<C-w>"] = require("telescope.actions.layout").toggle_preview, |
| 8 | ["<C-u>"] = false, | 8 | ["<C-u>"] = false, |
| 9 | ["<C-o>"] = function(p_bufnr) | ||
| 10 | require("telescope.actions").send_selected_to_qflist(p_bufnr) | ||
| 11 | vim.cmd.cfdo("edit") | ||
| 12 | end, | ||
| 9 | }, | 13 | }, |
| 10 | }, | 14 | }, |
| 11 | layout_config = { | 15 | layout_config = { |
| @@ -45,7 +49,7 @@ return { | |||
| 45 | }, | 49 | }, |
| 46 | }, | 50 | }, |
| 47 | }, | 51 | }, |
| 48 | on_attach = function () | 52 | on_attach = function() |
| 49 | require("telescope").load_extension("aerial") | 53 | require("telescope").load_extension("aerial") |
| 50 | end | 54 | end |
| 51 | } | 55 | } |
diff --git a/vim/lua/plugins/init.lua b/vim/lua/plugins/init.lua index f54e21d..c74e8d4 100644 --- a/vim/lua/plugins/init.lua +++ b/vim/lua/plugins/init.lua | |||
| @@ -138,6 +138,14 @@ return { | |||
| 138 | -- end | 138 | -- end |
| 139 | -- return tostring(os.time()) .. suffix | 139 | -- return tostring(os.time()) .. suffix |
| 140 | end, | 140 | end, |
| 141 | -- Optional, for templates (see below). | ||
| 142 | templates = { | ||
| 143 | folder = "templates", | ||
| 144 | date_format = "%Y-%m-%d", | ||
| 145 | time_format = "%H:%M", | ||
| 146 | -- A map for custom variables, the key should be the variable and the value a function | ||
| 147 | substitutions = {}, | ||
| 148 | }, | ||
| 141 | }, | 149 | }, |
| 142 | }, | 150 | }, |
| 143 | 151 | ||
| @@ -209,9 +217,10 @@ return { | |||
| 209 | opts = { | 217 | opts = { |
| 210 | automatically_installation = true, | 218 | automatically_installation = true, |
| 211 | ensure_installed = { | 219 | ensure_installed = { |
| 220 | "vim-language-server", | ||
| 221 | "lua-language-server", | ||
| 212 | "css-lsp", | 222 | "css-lsp", |
| 213 | "html-lsp", | 223 | "html-lsp", |
| 214 | "lua-language-server", | ||
| 215 | "prettier", | 224 | "prettier", |
| 216 | "stylua", | 225 | "stylua", |
| 217 | }, | 226 | }, |