diff --git a/.gitignore b/.gitignore deleted file mode 100644 index e033bc6..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -lazy-lock.json diff --git a/after/ftplugin/lua.lua b/after/ftplugin/lua.lua new file mode 100644 index 0000000..c4b3a6d --- /dev/null +++ b/after/ftplugin/lua.lua @@ -0,0 +1,3 @@ +vim.opt.shiftwidth = 2 +vim.opt.expandtab = true + diff --git a/init.lua b/init.lua index 158b349..f4e1a02 100644 --- a/init.lua +++ b/init.lua @@ -3,8 +3,8 @@ vim.o.relativenumber = true vim.o.wrap = false vim.o.swapfile = false vim.g.mapleader = " " +vim.g.maplocalleader = "\\" vim.keymap.set('n', 'o', ':update :source') - require("config.lazy") diff --git a/lazy-lock.json b/lazy-lock.json new file mode 100644 index 0000000..0297f35 --- /dev/null +++ b/lazy-lock.json @@ -0,0 +1,12 @@ +{ + "blink.cmp": { "branch": "main", "commit": "e9556f9b981f395e22a6bfd69fd5f3008a2a6cd9" }, + "comfy-line-numbers.nvim": { "branch": "main", "commit": "9adedbaf1f410cdaacf4fb2ca8eb44f3d5f6d010" }, + "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" }, + "fzf-lua": { "branch": "main", "commit": "1eba927866251bae1b61dffc5b673b8dbd0f3f48" }, + "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, + "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" }, + "melange-nvim": { "branch": "master", "commit": "ce42f6b629beeaa00591ba73a77d3eeac4cf28ce" }, + "nvim-lspconfig": { "branch": "master", "commit": "ead0f5f342d8d323441e7d4b88f0fc436a81ad5f" }, + "nvim-tree.lua": { "branch": "master", "commit": "4b30847c91d498446cb8440c03031359b045e050" }, + "nvim-web-devicons": { "branch": "master", "commit": "737cf6c657898d0c697311d79d361288a1343d50" } +} diff --git a/lua/plugins/blink.lua b/lua/plugins/blink.lua new file mode 100644 index 0000000..5d1197a --- /dev/null +++ b/lua/plugins/blink.lua @@ -0,0 +1,32 @@ +return { + "saghen/blink.cmp", + + dependencies = { 'rafamadriz/friendly-snippets' }, + + event = { "InsertEnter", "CmdlineEnter" }, + opts = { + keymap = { preset = 'default' }, + + appearance = { + -- 'mono' (default) for 'Nerd Font Mono' or 'normal' for 'Nerd Font' + -- Adjusts spacing to ensure icons are aligned + nerd_font_variant = 'mono' + }, + + -- (Default) Only show the documentation popup when manually triggered + completion = { documentation = { auto_show = true, auto_show_delay_ms = 200, } }, + + -- Default list of enabled providers defined so that you can extend it + -- elsewhere in your config, without redefining it, due to `opts_extend` + sources = { + default = { "lsp", "path", "snippets", "buffer" }, + }, + + fuzzy = { + implementation = "lua" + } + }, + + opts_extend = { "sources.default" } + +} diff --git a/lua/plugins/comfy-line.lua b/lua/plugins/comfy-line.lua new file mode 100644 index 0000000..4b47114 --- /dev/null +++ b/lua/plugins/comfy-line.lua @@ -0,0 +1,20 @@ +return { + 'mluders/comfy-line-numbers.nvim', + + opts = { + labels = { + '1', '2', '3', '4', '5', '11', '12', '13', '14', '15', '21', '22', '23', + '24', '25', '31', '32', '33', '34', '35', '41', '42', '43', '44', '45', + '51', '52', '53', '54', '55', '111', '112', '113', '114', '115', '121', + '122', '123', '124', '125', '131', '132', '133', '134', '135', '141', + '142', '143', '144', '145', '151', '152', '153', '154', '155', '211', + '212', '213', '214', '215', '221', '222', '223', '224', '225', '231', + '232', '233', '234', '235', '241', '242', '243', '244', '245', '251', + '252', '253', '254', '255', + }, + + up_key = 'k', + down_key = 'j', + + } +} diff --git a/lua/plugins/lualine.lua b/lua/plugins/lualine.lua new file mode 100644 index 0000000..3aed7dd --- /dev/null +++ b/lua/plugins/lualine.lua @@ -0,0 +1,8 @@ +return { + 'nvim-lualine/lualine.nvim', + dependencies = { 'nvim-tree/nvim-web-devicons' }, + + config = function () + require('lualine').setup() + end +} diff --git a/lua/plugins/melange.lua b/lua/plugins/melange.lua new file mode 100644 index 0000000..2bf80e4 --- /dev/null +++ b/lua/plugins/melange.lua @@ -0,0 +1,6 @@ +return { + "savq/melange-nvim", + config = function() + vim.cmd.colorscheme 'melange' + end, +} diff --git a/lua/plugins/nvim-lspconfig.lua b/lua/plugins/nvim-lspconfig.lua index d5dcfea..02ba97c 100644 --- a/lua/plugins/nvim-lspconfig.lua +++ b/lua/plugins/nvim-lspconfig.lua @@ -1,7 +1,18 @@ return { "neovim/nvim-lspconfig", + dependencies = { 'saghen/blink.cmp' }, + + config = function() + vim.lsp.config('lua_ls', { + cmd = {"lua-language-server"}, + filetypes = {"lua"}, + }) vim.lsp.enable('lua_ls') + + vim.lsp.enable('basedpyright') + + end, }