commit - 03477d5fbd6c290f7205db58321782833b9a2e80
commit + fdbea6e35661543d6a3921bfb6ac32e51efbaca0
blob - 690224c418f1b80533ab673bc198cf36e38acaf0
blob + 185d7381d7474226e73d0f99e338338f4b47dadf
--- init.lua
+++ init.lua
require('plugins/mini'),
require('plugins/autopairs'),
require('plugins/gitsigns'),
+ require('plugins/diffview'),
require('plugins/colors')
-- I'm not using treesitter anymore
-- require('plugins/treesitter'),
blob - 3d4972aed395a1f5ef31995bfc63c427ed9d357c
blob + c6971e5682b31865278c77bb83767e196fc94b17
--- lazy-lock.json
+++ lazy-lock.json
{
- "conform.nvim": { "branch": "master", "commit": "6feb2f28f9a9385e401857b21eeac3c1b66dd628" },
- "gitsigns.nvim": { "branch": "main", "commit": "8bdaccdb897945a3c99c1ad8df94db0ddf5c8790" },
+ "conform.nvim": { "branch": "master", "commit": "0e93e0d12d2f7ebdea9e3e444dfaff0050cefbe6" },
+ "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
+ "gitsigns.nvim": { "branch": "main", "commit": "d0f90ef51d4be86b824b012ec52ed715b5622e51" },
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
- "mason-lspconfig.nvim": { "branch": "main", "commit": "60eaff7a470b8e78ddff09d847d17a011f560759" },
+ "mason-lspconfig.nvim": { "branch": "main", "commit": "bef29b653ba71d442816bf56286c2a686210be04" },
"mason-tool-installer.nvim": { "branch": "main", "commit": "93a9ff9b34c91c0cb0f7de8d5f7e4abce51d8903" },
"mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" },
- "mini.nvim": { "branch": "main", "commit": "c39f7f506939f065d0d1af237e2ea3f252edd3d4" },
+ "mini.nvim": { "branch": "main", "commit": "c3d398d8bfbd18ae24cb22a17cde1aaad3764cd3" },
"nvim-autopairs": { "branch": "master", "commit": "4d74e75913832866aa7de35e4202463ddf6efd1b" },
- "nvim-lspconfig": { "branch": "master", "commit": "03bc581e05e81d33808b42b2d7e76d70adb3b595" },
- "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
+ "nvim-lspconfig": { "branch": "master", "commit": "036885e8e5456d3907626b634693234f628afef6" },
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
"telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
"telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
- "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
+ "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
"vim-plan9": { "branch": "master", "commit": "8263b2459ca48bc9dca6dad8fa34a28935426193" }
}
blob - 8684c32267bc01ab9ec022afc38c3df86614775f
blob + a90b89791d10824b8b55c2f4ef6fcfef614f631a
--- lua/config/keymaps.lua
+++ lua/config/keymaps.lua
-- Core navigation (single-key, no prefix)
lsp_map('gd', require('telescope.builtin').lsp_definitions, 'Go to Definition')
lsp_map('gD', vim.lsp.buf.declaration, 'Go to Declaration')
+ lsp_map('gt', vim.lsp.buf.type_definition, 'Go to Type Definition')
lsp_map('gi', require('telescope.builtin').lsp_implementations, 'Go to Implementation')
lsp_map('gr', require('telescope.builtin').lsp_references, 'Get References')
lsp_map('K', vim.lsp.buf.hover, 'Show hover documentation')
blob - f052dc21a8a93422fcc33990c64fbf2478693a48
blob + b803d15de173c9fcaf4cd20aa6eea05d5748e0c6
--- lua/plugins/conform.lua
+++ lua/plugins/conform.lua
go = { 'gofmt' },
typescript = { 'prettier' },
javascript = { 'prettier' },
+ vue = { 'prettier' },
python = { 'black' },
},
},
blob - /dev/null
blob + e787d2e9fa4892aba0cbb41caa8233d7252ba642 (mode 644)
--- /dev/null
+++ lua/plugins/diffview.lua
+return {
+ "sindrets/diffview.nvim",
+}
blob - 6b3f8f26db2ae0ef0531eb900e99673d4eaed7f5
blob + 7e90ced2b4d476d10bebe6d09b2197e005774040
--- lua/plugins/lspconfig.lua
+++ lua/plugins/lspconfig.lua
globalStoragePath = os.getenv('HOME') .. '/.local/share/intelephense',
},
},
+ vuels = {
+ filetypes = { 'vue' },
+ init_options = {
+ config = {
+ vetur = {
+ validation = {
+ template = true,
+ script = true,
+ style = true,
+ },
+ },
+ },
+ },
+ },
}
local lspconfig = require('lspconfig')
for server_name, server_config in pairs(servers) do
blob - 1e548810fb6551094baf9ad752f06e642473966c
blob + c2e6a2ee5d2a9c0bc89965e07bdb3954ee4c72c5
--- lua/plugins/telescope.lua
+++ lua/plugins/telescope.lua
return {
'nvim-telescope/telescope.nvim',
- branch = '0.1.x',
+ branch = 'master',
dependencies = {
'nvim-lua/plenary.nvim',
{ 'nvim-telescope/telescope-ui-select.nvim' },
require('telescope').setup({
defaults = {
layout_strategy = 'horizontal',
- file_ignore_patterns = { 'node_modules', '^package%-lock%.json$' },
+ file_ignore_patterns = {
+ 'node_modules',
+ '^package%-lock%.json$',
+ '__init__.py'
+ },
mappings = {
i = {
['<C-j>'] = 'move_selection_next',
},
},
pickers = {
- find_files = {
- theme = "ivy"
- }
+ -- find_files = {
+ -- theme = "ivy"
+ -- }
},
extensions = {
['ui-select'] = {