From c8adf8f55d146582a5aa9397dc8a2a759bf78baa Mon Sep 17 00:00:00 2001 From: S4NKALP Date: Sun, 21 Jan 2024 21:46:27 +0545 Subject: [PATCH] remove(nvim): conceal level for json files because of new lazyvim --- config/nvim/.github/README.md | 1 + config/nvim/after/ftplugin/json.lua | 2 -- config/nvim/after/ftplugin/jsonc.lua | 2 -- config/nvim/lazy-lock.json | 12 +++++------ config/nvim/lua/plugins/extras/lang/sql.lua | 23 +++++++++++++-------- 5 files changed, 21 insertions(+), 19 deletions(-) diff --git a/config/nvim/.github/README.md b/config/nvim/.github/README.md index 5cd659c3..5892e623 100644 --- a/config/nvim/.github/README.md +++ b/config/nvim/.github/README.md @@ -1,3 +1,4 @@ + # :herb: ‎ About diff --git a/config/nvim/after/ftplugin/json.lua b/config/nvim/after/ftplugin/json.lua index fcaaccd4..80dcf64b 100644 --- a/config/nvim/after/ftplugin/json.lua +++ b/config/nvim/after/ftplugin/json.lua @@ -1,5 +1,3 @@ -vim.opt.conceallevel = 0 - -- When creating a new line with o, make sure there is a trailing comma on the current line vim.keymap.set("n", "o", function() local line = vim.api.nvim_get_current_line() diff --git a/config/nvim/after/ftplugin/jsonc.lua b/config/nvim/after/ftplugin/jsonc.lua index fcaaccd4..80dcf64b 100644 --- a/config/nvim/after/ftplugin/jsonc.lua +++ b/config/nvim/after/ftplugin/jsonc.lua @@ -1,5 +1,3 @@ -vim.opt.conceallevel = 0 - -- When creating a new line with o, make sure there is a trailing comma on the current line vim.keymap.set("n", "o", function() local line = vim.api.nvim_get_current_line() diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json index 7637a821..46ffce2a 100644 --- a/config/nvim/lazy-lock.json +++ b/config/nvim/lazy-lock.json @@ -22,7 +22,7 @@ "conform.nvim": { "branch": "master", "commit": "cbc5745bf7519acaf3a5cbaaa677fd556aa813d7" }, "crates.nvim": { "branch": "main", "commit": "9bad17fd404d318e222b6cc057cc0a929be2d8e9" }, "dashboard-nvim": { "branch": "master", "commit": "63df28409d940f9cac0a925df09d3dc369db9841" }, - "debugprint.nvim": { "branch": "main", "commit": "13378f67edc112bf0d043bc0c018f8923dc2198d" }, + "debugprint.nvim": { "branch": "main", "commit": "0c81cd2bab372bba99815f505eb1fe759d38dd88" }, "dial.nvim": { "branch": "master", "commit": "27eb570085db2ef44bff4f620d3806039184651c" }, "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, "dooku.nvim": { "branch": "main", "commit": "632ac0e27a96e77d8be47c42583fb58c3be9d85f" }, @@ -46,7 +46,7 @@ "inc-rename.nvim": { "branch": "main", "commit": "6f9b5f9cb237e12935144cdc535322b8c93c1b25" }, "indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" }, "kitty-scrollback.nvim": { "branch": "main", "commit": "3e6adf12ef20ad8e682674ea4dbed4ac06a7341e" }, - "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, + "lazy.nvim": { "branch": "main", "commit": "28126922c9b54e35a192ac415788f202c3944c9f" }, "live-server.nvim": { "branch": "main", "commit": "f6f00a3f541251f0320910bb0d03c4ae14ee6d10" }, "lsp-lens.nvim": { "branch": "main", "commit": "48bb1a7e271424c15f3d588d54adc9b7c319d977" }, "lualine.nvim": { "branch": "master", "commit": "566b7036f717f3d676362742630518a47f132fff" }, @@ -77,7 +77,7 @@ "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" }, "nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" }, "nvim-ansible": { "branch": "main", "commit": "d115cb9bb3680c990e2684f58cf333663fff03b8" }, - "nvim-autopairs": { "branch": "master", "commit": "9fd41181693dd4106b3e414a822bb6569924de81" }, + "nvim-autopairs": { "branch": "master", "commit": "eac31b4797ce4fa9dd546f7b98ec32305527b19e" }, "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, "nvim-dap": { "branch": "master", "commit": "9adbfdca13afbe646d09a8d7a86d5d031fb9c5a5" }, "nvim-dap-go": { "branch": "main", "commit": "a5cc8dcad43f0732585d4793deb02a25c4afb766" }, @@ -99,7 +99,7 @@ "nvim-regexplainer": { "branch": "main", "commit": "78fff711edcb986a05a03253c28a90e32c4ce31f" }, "nvim-scissors": { "branch": "main", "commit": "63d05e732d1403fcd7c7e1fb6b55763adcd08b64" }, "nvim-spectre": { "branch": "master", "commit": "d8906855f1949ac97b1e77aaf8d3fe12ed158ddc" }, - "nvim-treesitter": { "branch": "master", "commit": "5cc562748729b6dc9563ea5a3d676ff102ab38b1" }, + "nvim-treesitter": { "branch": "master", "commit": "5d5eba78a7eee55df2c18d62cfc81ce9318bddd6" }, "nvim-treesitter-context": { "branch": "master", "commit": "85cf977181fb8e816e47ac05df7f756e9cb72caf" }, "nvim-treesitter-endwise": { "branch": "master", "commit": "4c344ffc8d54d7e1ba2cefaaa2c10ea93aa1cc2d" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "19a91a38b02c1c28c14e0ba468d20ae1423c39b2" }, @@ -143,11 +143,11 @@ "telescope-luasnip.nvim": { "branch": "master", "commit": "2ef7da3a363890686dbaad18ddbf59177cfe4f78" }, "telescope-undo.nvim": { "branch": "main", "commit": "d3afc1c105535a90caec092ce27a113f77ba7b84" }, "telescope-zoxide": { "branch": "main", "commit": "68966349aa1b8e9ade403e18479ecf79447389a7" }, - "telescope.nvim": { "branch": "master", "commit": "24778fd72fcf39a0b1a6f7c6f4c4e01fef6359a2" }, + "telescope.nvim": { "branch": "master", "commit": "0902bb39ebaf76e655addc65130eb79b29abe6d2" }, "text-case.nvim": { "branch": "main", "commit": "6bc91cde614bbec6f0befbaf7fcd302415d803fb" }, "theme-loader.nvim": { "branch": "master", "commit": "ad8774ec8267a447d469b4e6603b43f49b946e53" }, "todo-comments.nvim": { "branch": "main", "commit": "4a6737a8d70fe1ac55c64dfa47fcb189ca431872" }, - "tokyonight.nvim": { "branch": "main", "commit": "5c74eb7ab33f4e5bc62198a8296fddb60595898c" }, + "tokyonight.nvim": { "branch": "main", "commit": "67c6050e1ca41260c919236a098ba278472c7520" }, "tree-sitter-hyprlang": { "branch": "master", "commit": "e60fc858e6327a15c0b26f99ec96945fecd1e4ee" }, "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, "ts-node-action": { "branch": "master", "commit": "e37eb458378de5d994df459a53711b2546abef0f" }, diff --git a/config/nvim/lua/plugins/extras/lang/sql.lua b/config/nvim/lua/plugins/extras/lang/sql.lua index 5d15470f..335c9476 100644 --- a/config/nvim/lua/plugins/extras/lang/sql.lua +++ b/config/nvim/lua/plugins/extras/lang/sql.lua @@ -31,6 +31,19 @@ return { }) end, }, + { + "hrsh7th/nvim-cmp", + opts = function(_, opts) + local autocomplete_group = vim.api.nvim_create_augroup("vimrc_autocompletion", { clear = true }) + vim.api.nvim_create_autocmd("FileType", { + pattern = sql_ft, + callback = function() + table.insert(opts.sources, { name = "vim-dadbod-completion" }) + end, + group = autocomplete_group, + }) + end, + }, { "tpope/vim-dadbod", cmd = { "DBUI", "DBUIToggle", "DBUIAddConnection", "DBUIFindBuffer" }, @@ -39,19 +52,11 @@ return { { "kristijanhusak/vim-dadbod-completion", ft = sql_ft }, { "jsborjesson/vim-uppercase-sql", ft = sql_ft }, }, - init = function() + config = function() vim.g.db_ui_save_location = vim.fn.stdpath("data") .. "/db_ui" vim.g.db_ui_use_nerd_fonts = true vim.g.db_ui_execute_on_save = false vim.g.db_ui_use_nvim_notify = true - - vim.api.nvim_create_autocmd("FileType", { - pattern = sql_ft, - callback = function() - ---@diagnostic disable-next-line: missing-fields - require("cmp").setup.buffer({ sources = { { name = "vim-dadbod-completion" } } }) - end, - }) end, keys = { { "Da", "DBUIAddConnection", desc = "Add Connection" },