diff options
Diffstat (limited to 'nvim/init.lua')
| -rwxr-xr-x | nvim/init.lua | 143 |
1 files changed, 30 insertions, 113 deletions
diff --git a/nvim/init.lua b/nvim/init.lua index 3f6c3b5..7e16069 100755 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -31,106 +31,43 @@ vim.api.nvim_create_autocmd('LspAttach', { end, }) --- Clone 'mini.nvim' manually in a way that it gets managed by 'mini.deps' -local path_package = vim.fn.stdpath('data') .. '/site/' -local mini_path = path_package .. 'pack/deps/start/mini.nvim' -if not vim.loop.fs_stat(mini_path) then - vim.cmd('echo "Installing `mini.nvim`" | redraw') - local clone_cmd = { - 'git', 'clone', '--filter=blob:none', - 'https://github.com/nvim-mini/mini.nvim', mini_path - } - vim.fn.system(clone_cmd) - vim.cmd('packadd mini.nvim | helptags ALL') - vim.cmd('echo "Installed `mini.nvim`" | redraw') -end - vim.api.nvim_create_autocmd("TextYankPost", { callback = function() vim.highlight.on_yank() end, }) --- Godot --- Function to find Godot project root directory -local function find_godot_project_root() - local cwd = vim.fn.getcwd() - local search_paths = { '', '/..' } - - for _, relative_path in ipairs(search_paths) do - local project_file = cwd .. relative_path .. '/project.godot' - if vim.uv.fs_stat(project_file) then - return cwd .. relative_path - end - end - - return nil -end - --- Function to check if server is already running -local function is_server_running(project_path) - local server_pipe = project_path .. '/server.pipe' - return vim.uv.fs_stat(server_pipe) ~= nil -end +vim.cmd("packadd nvim.undotree") +vim.keymap.set("n", "<leader>u", require("undotree").open) --- Function to start Godot server if needed -local function start_godot_server_if_needed() - local godot_project_path = find_godot_project_root() - - if godot_project_path and not is_server_running(godot_project_path) then - vim.fn.serverstart(godot_project_path .. '/server.pipe') - return true - end - - return false -end +vim.pack.add { 'https://github.com/stevearc/dressing.nvim' } -- Dependency for flutter tools +vim.pack.add { 'https://github.com/nvim-lua/plenary.nvim' } -- Dependency for flutter tools +vim.pack.add { 'https://github.com/nvim-flutter/flutter-tools.nvim' } +vim.pack.add { 'https://github.com/nvim-mini/mini.icons' } -- Dependency for mini.completion +vim.pack.add { 'https://github.com/nvim-mini/mini.snippets' } -- Dependency for mini.completion --- Main execution -start_godot_server_if_needed() +vim.pack.add { 'https://github.com/lewis6991/gitsigns.nvim' } +vim.pack.add { 'https://github.com/nvim-treesitter/nvim-treesitter' } +vim.pack.add { 'https://github.com/OXY2DEV/markview.nvim' } +vim.pack.add { 'https://github.com/nvim-mini/mini.completion' } +vim.pack.add { 'https://github.com/nvim-mini/mini.surround' } +vim.pack.add { 'https://github.com/nvim-mini/mini.ai' } +vim.pack.add { 'https://github.com/nvim-mini/mini.move' } +vim.pack.add { 'https://github.com/nvim-mini/mini.files' } +vim.pack.add { 'https://github.com/nvim-treesitter/nvim-treesitter-context' } +vim.pack.add { 'https://github.com/echasnovski/mini.pick' } +vim.pack.add { 'https://github.com/onsails/diaglist.nvim' } +vim.pack.add { 'https://github.com/HakonHarnes/img-clip.nvim' } +vim.pack.add { 'https://github.com/akinsho/toggleterm.nvim' } +vim.pack.add { 'https://github.com/mason-org/mason.nvim' } +vim.pack.add { 'https://github.com/jghauser/follow-md-links.nvim' } +vim.pack.add { 'https://github.com/rachartier/tiny-inline-diagnostic.nvim' } -require('mini.deps').setup({ path = { package = path_package } }) +vim.pack.add { "https://github.com/MunifTanjim/nui.nvim" } -- Dependency for laravel.nvim +vim.pack.add { "https://github.com/nvim-lua/plenary.nvim" } -- Dependency for laravel.nvim +vim.pack.add { 'https://github.com/adibhanna/laravel.nvim' } -local add = require('mini.deps').add -add({ - source = 'nvim-flutter/flutter-tools.nvim', - depends = { - 'stevearc/dressing.nvim', - 'nvim-lua/plenary.nvim' - } -}) -add({ source = 'lewis6991/gitsigns.nvim' }) -add({ source = 'tpope/vim-fugitive' }) -add({ source = 'folke/tokyonight.nvim' }) -add({ source = 'nvim-treesitter/nvim-treesitter' }) -add({ source = 'OXY2DEV/markview.nvim' }) -add({ - source = 'nvim-mini/mini.completion', - dependencies = { - 'nvim-mini/mini.icons', - 'nvim-mini/mini-snippets' - } -}) -add({ source = 'nvim-mini/mini.surround' }) -add({ source = 'nvim-mini/mini.ai' }) -add({ source = 'nvim-mini/mini.move' }) -add({ source = 'nvim-mini/mini.files' }) -add({ source = 'nvim-treesitter/nvim-treesitter-context' }) -add({ source = 'echasnovski/mini.pick' }) -add({ source = 'onsails/diaglist.nvim' }) -add({ source = 'mbbill/undotree' }) -add({ source = 'HakonHarnes/img-clip.nvim' }) -add({ source = 'akinsho/toggleterm.nvim' }) -add({ source = 'mason-org/mason.nvim' }) -add({ source = 'neovim/nvim-lspconfig' }) -add({ source = 'jghauser/follow-md-links.nvim' }) -add({ source = 'rachartier/tiny-inline-diagnostic.nvim' }) -add({ - source = 'adibhanna/laravel.nvim', - dependencies = { - "MunifTanjim/nui.nvim", - "nvim-lua/plenary.nvim" - } -}) +vim.pack.add { 'https://github.com/neovim/nvim-lspconfig' } -- Plugin Setup require('mason').setup() @@ -148,7 +85,7 @@ require('gitsigns').setup() require("laravel").setup() require 'treesitter-context'.setup { enable = true } -vim.cmd.colorscheme('tokyonight-night') +vim.cmd.colorscheme('catppuccin') vim.cmd.hi("StatusLine guibg=NONE") vim.api.nvim_create_autocmd("BufWritePre", { @@ -156,6 +93,8 @@ vim.api.nvim_create_autocmd("BufWritePre", { callback = function() vim.lsp.buf.format() end, }) +vim.lsp.enable("lua_ls") + -- Keymaps vim.keymap.set("i", "", "<C-S-H>", { desc = "Solution for xterm" }) vim.keymap.set({ "n", "v" }, "j", "gj", { desc = "Personal preference" }) @@ -163,7 +102,6 @@ vim.keymap.set({ "n", "v" }, "k", "gk", { desc = "Personal preference" }) vim.keymap.set("n", "<leader><space>e", "<cmd>lua MiniFiles.open()<CR>", { desc = 'Open Mini.Files' }) vim.keymap.set("n", "<leader>cw", require('diaglist').open_all_diagnostics, { desc = 'Open diagnostics' }) vim.keymap.set("n", "<leader>cl", "<cmd>cclose<cr>", { desc = 'Open diagnostics' }) -vim.keymap.set('n', '<leader><leader>u', vim.cmd.UndotreeToggle, { desc = 'Toggle undo tree' }) vim.keymap.set("n", "<leader>pv", "<cmd>Ex<CR>", { desc = "Open netrw" }) vim.keymap.set("n", "<leader>ff", "<cmd>Pick files<CR>", { desc = "Open file Picker" }) vim.keymap.set("n", "<leader>fg", "<cmd>Pick grep_live<CR>", { desc = "Open Live Grep" }) @@ -186,25 +124,4 @@ vim.keymap.set("n", "gx", function() vim.fn.jobstart({ "xdg-open", url }, { detach = true }) end, { desc = "Open URL with xdg-open" }) --- vim.keymap.set("i", "<C-e>", function() --- if vim.fn.pumvisible() == 1 then --- return "<C-y>" --- else --- return "<C-e>" --- end --- end, { expr = true, silent = true })a - -vim.api.nvim_create_autocmd('LspAttach', { - callback = function(ev) - local client = vim.lsp.get_client_by_id(ev.data.client_id) - if client ~= nil and client:supports_method('textDocument/completion') then - vim.opt.completeopt = { 'menu', 'menuone', 'noselect', 'fuzzy', 'popup' } - vim.lsp.completion.enable(true, client.id, ev.buf, { autotrigger = true }) - vim.keymap.set('i', '<C-Space>', function() - vim.lsp.completion.get() - end, { desc = 'Start Completion' }) - end - end, -}) - vim.diagnostic.config({ virtual_text = false }) |