diff --git a/lazy-lock.json b/lazy-lock.json index 7f95523..3aa7548 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,38 +1,42 @@ { - "LuaSnip": { "branch": "master", "commit": "50fcf17db7c75af80e6b6109acfbfb4504768780" }, + "LuaSnip": { "branch": "master", "commit": "ce0a05ab4e2839e1c48d072c5236cce846a387bc" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, + "auto-pairs": { "branch": "master", "commit": "39f06b873a8449af8ff6a3eee716d3da14d63a76" }, "bufferline.nvim": { "branch": "main", "commit": "99337f63f0a3c3ab9519f3d1da7618ca4f91cffe" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, - "codeium.vim": { "branch": "main", "commit": "7a01ffb1e6538fe634f294908a50a7b680039284" }, - "conform.nvim": { "branch": "master", "commit": "cd75be867f2331b22905f47d28c0c270a69466aa" }, + "codeium.vim": { "branch": "main", "commit": "e0342fde9474fdd0a36ff9692fe0031b7611a19f" }, + "conform.nvim": { "branch": "master", "commit": "310e2e95a4f832163f3f7a9fedebb1a4afc0db69" }, "csvlens.nvim": { "branch": "main", "commit": "987375e2cf6399850f7f801b53b89c981ed652fa" }, - "fd": { "branch": "master", "commit": "f8270a6a447648a087c968552aa80325277a5588" }, - "feline.nvim": { "branch": "main", "commit": "8bc28b94a16304aad2f53b8c3653b14803748c28" }, - "gitsigns.nvim": { "branch": "main", "commit": "47c8e3e571376b24de62408fd0c9d12f0a9fc0a3" }, - "lazy.nvim": { "branch": "main", "commit": "c501b429cf995c645454539b924aaefae45bb9eb" }, - "lazydev.nvim": { "branch": "main", "commit": "6184ebbbc8045d70077659b7d30c705a588dc62f" }, - "lsp-zero.nvim": { "branch": "v3.x", "commit": "16de3b18c5f7b6230d89b8e64ce9a4801b6f8d08" }, + "fd": { "branch": "master", "commit": "cfced9787ee544d99f36e455762defec87c6be16" }, + "feline.nvim": { "branch": "main", "commit": "c97c17dc56ca3cf2b9b9192c3447fc59347e8c0d" }, + "gitsigns.nvim": { "branch": "main", "commit": "f4928ba14eb6c667786ac7d69927f6aee6719f1e" }, + "lazy.nvim": { "branch": "main", "commit": "5473e3d77c13e40fc4758fa977a1f2c14d0b4ceb" }, + "lazydev.nvim": { "branch": "main", "commit": "02f1055a777264d4b65896051ec28d0f322f7932" }, + "lsp-zero.nvim": { "branch": "v3.x", "commit": "87701af045b3032515776abeb47eb8c2ddb5e679" }, + "lua-utils.nvim": { "branch": "main", "commit": "e565749421f4bbb5d2e85e37c3cef9d56553d8bd" }, "luarocks.nvim": { "branch": "main", "commit": "1db9093915eb16ba2473cfb8d343ace5ee04130a" }, "luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" }, "mason-conform.nvim": { "branch": "main", "commit": "abce2be529f3b4b336c56d0ba6336a9144e0fee6" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" }, - "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" }, - "neorg": { "branch": "main", "commit": "99b32492b836b64a5ff4544d4c466496f0aec9bd" }, + "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, + "neorg": { "branch": "main", "commit": "efd7bd9c584c206d7aed2c40b02c73a9e5d04e73" }, "nightfox.nvim": { "branch": "main", "commit": "df75a6a94910ae47854341d6b5a6fd483192c0eb" }, - "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" }, + "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, + "nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" }, "nvim-dap": { "branch": "master", "commit": "6f79b822997f2e8a789c6034e147d42bc6706770" }, - "nvim-dap-ui": { "branch": "master", "commit": "b7267003ba4dd860350be86f75b9d9ea287cedca" }, - "nvim-lspconfig": { "branch": "master", "commit": "bd7c76375a511994c9ca8d69441f134dc10ae3bd" }, - "nvim-nio": { "branch": "master", "commit": "7969e0a8ffabdf210edd7978ec954a47a737bbcc" }, + "nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" }, + "nvim-lspconfig": { "branch": "master", "commit": "01e08d4bf1c35e5126b2ad5209725e4c552289ab" }, + "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-tetris": { "branch": "master", "commit": "d17c99fb527ada98ffb0212ffc87ccda6fd4f7d9" }, - "nvim-tree.lua": { "branch": "master", "commit": "2086e564c4d23fea714e8a6d63b881e551af2f41" }, - "nvim-treesitter": { "branch": "master", "commit": "c29989f5d735a30b6d2350b54d5cd50be811f8b2" }, + "nvim-tree.lua": { "branch": "master", "commit": "f9ff00bc06d7cb70548a3847d7a2a05e928bc988" }, + "nvim-treesitter": { "branch": "master", "commit": "7a38515741768c0a0712253de4ce64454cb24c1a" }, "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" }, + "pathlib.nvim": { "branch": "main", "commit": "7a5a6facd29e306bc73a37719fa67c0d2226f852" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" }, - "telescope.nvim": { "branch": "master", "commit": "c392f1b78eaaf870ca584bd698e78076ed301b26" }, + "telescope.nvim": { "branch": "master", "commit": "bfcc7d5c6f12209139f175e6123a7b7de6d9c18a" }, "toggleterm.nvim": { "branch": "main", "commit": "cd55bf6aab3f88c259fa29ea86bbdcb1a325687d" }, - "tree-sitter-hyprlang": { "branch": "master", "commit": "c9012d6dcaaa939f17c21e1fdb17b013d139e6b9" }, + "tree-sitter-hyprlang": { "branch": "master", "commit": "6858695eba0e63b9e0fceef081d291eb352abce8" }, "vim-be-good": { "branch": "master", "commit": "4fa57b7957715c91326fcead58c1fa898b9b3625" }, - "which-key.nvim": { "branch": "main", "commit": "0099511294f16b81c696004fa6a403b0ae61f7a0" } -} \ No newline at end of file + "which-key.nvim": { "branch": "main", "commit": "df77add576a1b2b7c6956be0b07d3c753f034b54" } +} diff --git a/lua/Dario48/options.lua b/lua/Dario48/options.lua index 4af7f16..8121703 100644 --- a/lua/Dario48/options.lua +++ b/lua/Dario48/options.lua @@ -1,24 +1,26 @@ vim.cmd("nnoremap ") -vim.g.mapleader = ' ' -vim.g.maplocalleader = ',' +vim.g.mapleader = " " +vim.g.maplocalleader = "," -vim.cmd("set tabstop=4") -vim.cmd("set softtabstop=0") -vim.cmd("set shiftwidth=0") +vim.opt.tabstop = 4 +vim.opt.softtabstop = 0 +vim.opt.shiftwidth = 0 +vim.opt.shell = "/bin/bash" vim.cmd("set wrap smoothscroll") -vim.keymap.set("n", "+x", ":!chmod +x %", {silent = true}) -vim.keymap.set("n", "+r", ":!chmod +r %", {silent = true}) -vim.keymap.set("n", "+w", ":!chmod +w %", {silent = true}) +vim.keymap.set("n", "+x", ":!chmod +x %", { silent = true }) +vim.keymap.set("n", "+r", ":!chmod +r %", { silent = true }) +vim.keymap.set("n", "+w", ":!chmod +w %", { silent = true }) -vim.keymap.set("n", "-x", ":!chmod -x %", {silent = true}) -vim.keymap.set("n", "-r", ":!chmod -r %", {silent = true}) -vim.keymap.set("n", "-w", ":!chmod -w %", {silent = true}) +vim.keymap.set("n", "-x", ":!chmod -x %", { silent = true }) +vim.keymap.set("n", "-r", ":!chmod -r %", { silent = true }) +vim.keymap.set("n", "-w", ":!chmod -w %", { silent = true }) +vim.opt.rnu = true vim.opt.nu = true vim.cmd([[set listchars=eol:$,tab:>-,trail:~,extends:>,precedes:<,space:•]]) -vim.keymap.set("n", "hc", ":set list!", {silent=true}) +vim.keymap.set("n", "hc", ":set list!", { silent = true }) vim.opt.termguicolors = true @@ -27,8 +29,8 @@ vim.opt.incsearch = true vim.opt.scrolloff = 6 -vim.keymap.set("v", "yo", ":yank +", {silent=true}) -vim.keymap.set("v", "ya", ":yank *", {silent=true}) +vim.keymap.set("v", "yo", ":yank +", { silent = true }) +vim.keymap.set("v", "ya", ":yank *", { silent = true }) vim.cmd("nnoremap j gj") vim.cmd("nnoremap k gk") diff --git a/lua/Dario48/plugins/codeium.lua b/lua/Dario48/plugins/codeium.lua index 4e11f44..44ce0e3 100644 --- a/lua/Dario48/plugins/codeium.lua +++ b/lua/Dario48/plugins/codeium.lua @@ -1,12 +1,37 @@ -return { - 'Exafunction/codeium.vim', - event = 'BufEnter', - config = function () +return { + "Exafunction/codeium.vim", + event = "BufEnter", + config = function() + vim.g.codeium_disable_bindings = 1 end, keys = { - { '', function () return vim.fn['codeium#Accept']() end, { expr = true, silent = true }}, - { '', function() return vim.fn['codeium#CycleCompletions'](1) end, { expr = true, silent = true }}, - { '', function() return vim.fn['codeium#CycleCompletions'](-1) end, { expr = true, silent = true }}, - { '', function() return vim.fn['codeium#Clear']() end, { expr = true, silent = true }} - } + { + "", + function() + return vim.fn["codeium#Accept"]() + end, + { expr = true, silent = true }, + }, + { + "", + function() + return vim.fn["codeium#CycleCompletions"](1) + end, + { expr = true, silent = true }, + }, + { + "", + function() + return vim.fn["codeium#CycleCompletions"](-1) + end, + { expr = true, silent = true }, + }, + { + "", + function() + return vim.fn["codeium#Clear"]() + end, + { expr = true, silent = true }, + }, + }, } diff --git a/lua/Dario48/plugins/conformer.lua b/lua/Dario48/plugins/conformer.lua index 9977fd8..30e3680 100644 --- a/lua/Dario48/plugins/conformer.lua +++ b/lua/Dario48/plugins/conformer.lua @@ -12,12 +12,19 @@ return { css = { "prettier" }, scss = { "prettier" }, js = { "prettier" }, + json = { "prettier" }, + html = { "prettier" }, }, format_on_save = { -- These options will be passed to conform.format() timeout_ms = 500, lsp_format = "fallback", }, + formatters = { + prettier = { + prepend_args = { "--config=/home/Dario48/.config/.prettierrc" }, + }, + }, }, }, { diff --git a/lua/Dario48/plugins/lsp-zero.lua b/lua/Dario48/plugins/lsp-zero.lua index 3a29e72..30f047d 100644 --- a/lua/Dario48/plugins/lsp-zero.lua +++ b/lua/Dario48/plugins/lsp-zero.lua @@ -94,13 +94,15 @@ return { }, }) end, - keys = { { - "qf", - function() - vim.lsp.buf.code_action() - end, - silent = true, - desc = "quickfix", - } }, + keys = { + { + "qf", + function() + vim.lsp.buf.code_action() + end, + silent = true, + desc = "quickfix", + }, + }, }, }