update to lua config

2025-02-14 01:48:45 -08:00
parent 0f860cf709
commit a95aab0e51
65 changed files with 254 additions and 930 deletions
--- a/lua/core/autocmds.lua
+++ b/lua/core/autocmds.lua
@@ -0,0 +1,51 @@
+local augroup = vim.api.nvim_create_augroup
+local autocmd = vim.api.nvim_create_autocmd
+
+-- Restore cursor position
+local restore_cursor = augroup('RestoreCursor', { clear = true })
+autocmd('BufReadPost', {
+    group = restore_cursor,
+    callback = function()
+        local mark = vim.api.nvim_buf_get_mark(0, '"')
+        local lcount = vim.api.nvim_buf_line_count(0)
+        if mark[1] > 0 and mark[1] <= lcount then
+            pcall(vim.api.nvim_win_set_cursor, 0, mark)
+        end
+    end,
+})
+
+-- Help and man pages in vertical split
+local help_config = augroup('HelpConfig', { clear = true })
+autocmd('FileType', {
+    group = help_config,
+    pattern = { 'help', 'man' },
+    command = 'wincmd L'
+})
+
+-- Terminal settings
+local term_config = augroup('TermConfig', { clear = true })
+autocmd('TermOpen', {
+    group = term_config,
+    pattern = '*',
+    command = 'setlocal nonumber norelativenumber'
+})
+
+local highlight_yank = augroup('HighlightYank', { clear = true })
+autocmd('TextYankPost', {
+    group = highlight_yank,
+    pattern = '*',
+    callback = function()
+        vim.highlight.on_yank({ higroup = "IncSearch", timeout = 1000 })
+    end,
+})
+
+-- Code actions on cursor hold
+-- local code_action = augroup('CodeAction', { clear = true })
+-- autocmd({ 'CursorHold', 'CursorHoldI' }, {
+--     group = code_action,
+--     callback = function()
+--         if vim.tbl_isempty(vim.lsp.buf_get_clients()) then
+--             require('code_action_utils').code_action_listener()
+--         end
+--     end
+-- }) 
--- a/lua/core/keymaps.lua
+++ b/lua/core/keymaps.lua
@@ -0,0 +1,158 @@
+local map = vim.keymap.set
+local opts = { silent = true, noremap = true }
+
+-- Leader key
+vim.g.mapleader = " "
+vim.g.maplocalleader = ","
+
+-- Custom commands
+vim.api.nvim_create_user_command('PS', ':PackerSync', {})
+vim.api.nvim_create_user_command('Reload', 'source ~/.config/nvim/init.lua', {})
+vim.api.nvim_create_user_command('Config', 'edit ~/.config/nvim/init.lua', {})
+vim.api.nvim_create_user_command('Plugins', 'edit ~/.config/nvim/lua/core/plugins.lua', {})
+vim.api.nvim_create_user_command('Keymaps', 'edit ~/.config/nvim/lua/core/keymaps.lua', {})
+
+-- Basic mappings
+map('n', '<C-u>', '<C-u>zz', opts)
+map('n', 'n', 'nzzzv', opts)
+map('n', 'N', 'Nzzzv', opts)
+map('x', '<leader>p', '"_dP', opts)     -- paste without yanking
+map('v', '<', '<gv', opts)              -- reselect after indent
+map('v', '>', '>gv', opts)
+map('v', 'J', ":m '>+1<CR>gv=gv", opts) -- move lines
+map('v', 'K', ":m '<-2<CR>gv=gv", opts)
+
+-- Buffer navigation
+map('n', '<C-J>', ':bnext<CR>', opts)
+map('n', '<C-K>', ':bprev<CR>', opts)
+map('n', '<leader>bb', ':Telescope buffers<CR>', opts)
+map('n', '<leader>bk', ':bdelete<CR>', opts)
+map('n', '<leader>bn', ':bnext<CR>', opts)
+map('n', '<leader>bp', ':bprev<CR>', opts)
+
+-- Terminal mappings
+map('n', '<C-T>', ':wa<CR>:FloatermToggle floatterm<CR>', opts)
+map('t', '<C-T>', '<C-\\><C-n>:FloatermToggle floatterm<CR>', opts)
+map('t', '<Esc>', '<C-\\><C-n>', opts)
+map('n', '<leader>tt', ':FloatermToggle split-term<CR>', opts)
+map('t', '<leader>tt', '<C-\\><C-N>:FloatermToggle split-term<CR>', opts)
+map('t', '<leader>tf', '<C-\\><C-N>:FloatermToggle floatterm<CR>', opts)
+map('t', '<leader>tp', '<C-\\><C-N>:FloatermToggle ipython<CR>', opts)
+map('t', '<leader>tP', '<C-\\><C-N>:FloatermToggle ipython-full<CR>', opts)
+map('t', '<space>', '<space>', opts) -- fix space in terminal
+
+-- LSP mappings
+map('n', 'gA', vim.lsp.buf.code_action, opts)
+map('n', 'gd', ':Telescope lsp_definitions<CR>', opts)
+map('n', 'gDc', ':Telescope lsp_implementations<CR>', opts)
+map('n', 'gDf', ':Telescope lsp_definitions<CR>', opts)
+map('n', 'gF', ':edit <cfile><CR>', opts)
+map('n', 'gT', ':Telescope lsp_type_definitions<CR>', opts)
+map('n', 'gb', ':Gitsigns blame_line<CR>', opts)
+map('n', 'gi', ':Telescope lsp_implementations<CR>', opts)
+map('n', 'gj', ':Telescope jumplist<CR>', opts)
+map('n', 'gl', vim.lsp.codelens.run, opts)
+map('n', 'gr', ':Telescope lsp_references<CR>', opts)
+map('n', 'gs', vim.lsp.buf.signature_help, opts)
+map('n', 'K', vim.lsp.buf.hover, opts)
+
+-- Code Companion and Copilot
+map('n', '<leader>cc', ':CodeCompanionChat<CR>', opts)
+map('n', '<leader>ci', ':CodeCompanion ', opts)
+map('n', '<leader>cp', ':vert Copilot panel<CR>', opts)
+map('n', '<leader>Ca', ':CodeCompanionActions<CR>', opts)
+map('v', '<leader>Cc', ':CodeCompanionChat Add<CR>', opts)
+map('v', '<leader>Ce', ':CodeCompanion /explain<CR>', opts)
+map('v', '<leader>Cf', ':CodeCompanion /fix<CR>', opts)
+map('v', '<leader>Cl', ':CodeCompanion /lsp<CR>', opts)
+map('v', '<leader>CT', ':CodeCompanion /tests<CR>', opts)
+
+-- Telescope mappings
+map('n', '//', ':Telescope current_buffer_fuzzy_find<CR>', opts)
+map('n', '??', ':Telescope lsp_document_symbols<CR>', opts)
+map('n', '<leader>fc',
+    ':Telescope color_names theme=dropdown layout_config={width=0.45,height=25,prompt_position="bottom"} layout_strategy=vertical<CR>',
+    opts)
+map('n', '<leader>ff', ':Telescope find_files<CR>', opts)
+map('n', '<leader>sf', ':Telescope find_files<CR>', opts)
+map('n', '<leader>fg', ':Telescope live_grep<CR>', opts)
+map('n', '<leader>fG',
+    ':Telescope glyph theme=dropdown layout_config={width=0.45,height=35,prompt_position="bottom"} layout_strategy=vertical<CR>',
+    opts)
+map('n', '<leader>fb', ':Telescope file_browser<CR>', opts)
+map('n', '<leader>fr', ':Telescope oldfiles<CR>', opts)
+
+-- File explorer and tools
+map('n', '<leader>n', ':NvimTreeToggle<CR>', opts)
+map('n', '<leader>D', ':Dotenv .env<CR>', opts)
+
+-- Git mappings
+map('n', '<leader>gg', ':FloatermNew --title=lazygit --width=1.0 --height=1.0 --opener=vsplit lazygit<CR>', opts)
+map('n', '<leader>gc', ':Telescope git_commits<CR>', opts)
+map('n', '<leader>gf', ':Telescope git_files<CR>', opts)
+
+-- Misc utilities
+map('n', '<leader>x', '<cmd>!chmod +x %<CR>', opts)
+map('n', '<leader>y', '"+', opts)
+map('v', '<leader>y', '"+', opts)
+
+-- Terminal applications
+map('n', '<leader>oB', ':FloatermNew --title=btop --opener=vsplit btop<CR>', opts)
+map('n', '<leader>od', ':FloatermNew --title=lazydocker --opener=vsplit --width=0.75 --height=0.75 lazydocker<CR>', opts)
+map('n', '<leader>on', ':FloatermNew --title=ncmpcpp --opener=vsplit ncmpcpp --width=1 --height=1<CR>', opts)
+map('n', '<leader>or', ':FloatermNew --title=ranger --opener=vsplit --width=1.0 --height=1.0 ranger --cmd="cd $PWD"<CR>',
+    opts)
+
+map('n', "gpc", ':lua require("goto-preview").close_all_win()<CR>')
+map('n', "gpd", ':lua require("goto-preview").goto_preview_definition()<CR>')
+map('n', "gpi", ':lua require("goto-preview").goto_preview_implementation()<CR>')
+
+-- Workspace management
+map('n', '<leader>wa', vim.lsp.buf.add_workspace_folder, opts)
+map('n', '<leader>wr', vim.lsp.buf.remove_workspace_folder, opts)
+map('n', '<leader>wl', function()
+    print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
+end, opts)
+
+-- Helper
+map('n', '<leader>hc', ':Telescope commands<CR>')
+map('n', '<leader>hv', ':Telescope vim_options<CR>')
+map('n', '<leader>hk', ':Telescope keymaps<CR>')
+map('n', '<leader>hs', ':Telescope spell_suggest<CR>')
+map('n', '<leader>hm', ':Telescope man_pages<CR>')
+
+-- LSP
+map('n', '<leader>ld', ':Telescope lsp_definitions<CR>')
+map('n', '<leader>lD', ':Telescope diagnostic<CR>')
+map('n', '<leader>la', ':lua vim.lsp.buf.code_action()<CR>')
+map('n', '<leader>lci', ':Telescope lsp_incoming_calls<CR>')
+map('n', '<leader>lco', ':Telescope lsp_outgoing_calls<CR>')
+map('n', '<leader>lh', ':lua vim.lsp.buf.signature_help()<CR>')
+map('n', '<leader>li', ':Telescope lsp_implementations<CR>')
+map('n', '<leader>lr', ':Telescope lsp_references<CR>')
+map('n', '<leader>lR', ':lua vim.lsp.buf.rename()<CR>')
+map('n', '<leader>ls', ':Telescope lsp_document_symbols<CR>')
+map('n', '<leader>lt', ':Telescope lsp_type_definitions<CR>')
+map('n', '<leader>lw', ':Telescope lsp_dynamic_workspace_symbols<CR>')
+
+
+map('n', '<leader>ob', ':Telescope file_browser<CR>')
+map('n', '<leader>ot',
+    ':FloatermNew --title=floaterm --name=split-term --opener=edit --wintype=vsplit --position=botright --width=0.5<CR>')
+map('n', '<leader>oh',
+    ':FloatermNew --title=floaterm --name=split-term --opener=edit --wintype=split --position=botright --height=0.45<CR>')
+map('n', '<leader>op',
+    ':FloatermNew --title=ipython --name=ipython --opener=split --wintype=vsplit --position=botright --width=0.5 ipython<CR>')
+map('n', '<leader>oP',
+    ':FloatermNew --title=ipython-full --name=ipython-full --opener=edit --width=1.0 --height=1.0 ipython<CR>')
+
+map('n', '<leader>oc', ':CodeCompanionChat<CR>')
+map('n', '<leader>of', ':FloatermToggle floatterm<CR>')
+
+map('n', '<leader>sc', ':nohls<CR>')
+map('n', '<leader>sf', ':Telescope find_files<CR>')
+map('n', '<leader>sg', ':Telescope live_grep<CR>')
+map('n', '<leader>sh', ':Telescope command_history<CR>')
+map('n', '<leader>sm', ':Telescope man_pages<CR>')
+map('n', '<leader>s/', ':Telescope search_history<CR>')
+map('n', '<leader>sc', ':nohls<CR>')
--- a/lua/core/options.lua
+++ b/lua/core/options.lua
@@ -0,0 +1,63 @@
+local g = vim.g
+local o = vim.o
+local A = vim.api
+local l = vim.lsp
+
+g.mapleader = " "
+g.maplocalleader = ','
+g.fzf_command =
+'fzf --height 90% --width=85% --layout=reverse --preview "bat --color=always {}"'
+o.completeopt = "menu,menuone,noselect"
+o.showmode = false
+o.termguicolors = true
+o.background = 'dark'
+o.mouse = 'a'
+o.syntax = 'on'
+o.laststatus = 3
+o.number = true
+o.relativenumber = true
+o.colorcolumn = '80'
+o.textwidth = 80
+o.shiftwidth = 4
+o.expandtab = true
+o.tabstop = 4
+o.autoindent = true
+o.ignorecase = true
+o.smartcase = true
+o.incsearch = true
+o.hlsearch = true
+o.title = true
+o.splitright = true
+o.cursorline = true
+o.scrolloff = 8
+o.sidescrolloff = 8
+o.wildmenu = true
+o.wildignore =
+'.git,.hg,.svn,CVS,.DS_Store,.idea,.vscode,.vscode-test,node_modules'
+o.showmatch = true
+o.list = true
+o.listchars = 'tab:»·,trail:·,nbsp:·,extends:>,precedes:<'
+o.encoding = 'utf-8'
+o.guifont = 'JetBrainsMono Nerd Font 14'
+o.expandtab = true
+o.hidden = true
+o.cmdheight = 1
+o.updatetime = 300
+o.timeoutlen = 500
+o.pumwidth = 35
+o.foldmethod = 'marker'
+-- g.colorscheme = 'catppuccin-macchiato'
+g.db_ui_use_nerd_fonts = 1
+
+vim.cmd("colorscheme catppuccin-macchiato")
+
+local border = {
+    { "╭", "FloatBorder" }, { "─", "FloatBorder" }, { "╮", "FloatBorder" },
+    { "│", "FloatBorder" }, { "╯", "FloatBorder" }, { "─", "FloatBorder" },
+    { "╰", "FloatBorder" }, { "│", "FloatBorder" }
+}
+
+l.handlers["textDocument/signatureHelp"] =
+    vim.lsp.with(vim.lsp.handlers.signature_help, { border = border })
+l.handlers["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover,
+    { border = border })
--- a/lua/core/plugins.lua
+++ b/lua/core/plugins.lua
@@ -0,0 +1,219 @@
+local lsp_dev = {}
+
+vim.cmd [[packadd packer.nvim]]
+require('packer').startup(function(use)
+    use 'wbthomason/packer.nvim'
+    use 'nvim-lua/plenary.nvim'
+    use {
+        'nvim-treesitter/nvim-treesitter',
+        run = function()
+            require('nvim-treesitter.install').update({ with_sync = true })
+        end
+    }
+    use { 'nvim-treesitter/nvim-treesitter-context' }
+
+    -- TELESCOPE {{{
+
+    use { 'nvim-telescope/telescope.nvim' }
+    use { 'nvim-telescope/telescope-file-browser.nvim' }
+    use 'nvim-telescope/telescope-dap.nvim'
+    use { 'ghassan0/telescope-glyph.nvim' }
+    use { 'nat-418/telescope-color-names.nvim' }
+    use {
+        'nvim-telescope/telescope-fzf-native.nvim',
+        run = 'cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release && cmake --install build --prefix build'
+    }
+
+    -- }}}
+
+    -- LSP/DEV {{{
+    use { "zbirenbaum/copilot-cmp" }
+
+    use({
+        "olimorris/codecompanion.nvim",
+        requires = {
+            "nvim-lua/plenary.nvim",
+            "nvim-treesitter/nvim-treesitter",
+            "j-hui/fidget.nvim"
+        },
+        init = function()
+            require("plugins.codecompanion.fidget-spinner"):init()
+        end,
+    })
+
+    use({
+        "iamcco/markdown-preview.nvim",
+        run = function() vim.fn["mkdp#util#install"]() end
+    })
+    use {
+        "L3MON4D3/LuaSnip",
+        -- tag = "v2.*",
+        run = "make install_jsregexp",
+        dependencies = { "rafamadriz/friendly-snippets" }
+    }
+    use { 'folke/neodev.nvim' }
+    use { 'saadparwaiz1/cmp_luasnip' }
+    use { 'hrsh7th/cmp-buffer' }
+    use { 'hrsh7th/cmp-cmdline' }
+    use { 'hrsh7th/cmp-nvim-lsp' }
+    use { 'hrsh7th/cmp-nvim-lsp-document-symbol' }
+    use { 'hrsh7th/cmp-nvim-lsp-signature-help' }
+    use { 'hrsh7th/cmp-nvim-lua' }
+    use { 'hrsh7th/cmp-path' }
+    use { 'hrsh7th/nvim-cmp' }
+    use { 'https://git.sr.ht/~whynothugo/lsp_lines.nvim' }
+    -- use { 'jose-elias-alvarez/null-ls.nvim' }
+    use { 'nvimtools/none-ls.nvim' }
+    use { 'neovim/nvim-lspconfig' }
+    use { 'onsails/lspkind-nvim' }
+    use { 'lukas-reineke/lsp-format.nvim' }
+    use 'mfussenegger/nvim-lint'
+
+    use 'nvim-neotest/nvim-nio'
+    -- use 'mfussenegger/nvim-dap'
+    -- use { "rcarriga/nvim-dap-ui", requires = { "mfussenegger/nvim-dap" } }
+    -- use { 'mfussenegger/nvim-dap-python' }
+    -- use { 'theHamsta/nvim-dap-virtual-text' }
+
+    -- DADBOD {{{
+
+    -- use { 'tpope/vim-dadbod' }
+    -- use { 'kristijanhusak/vim-dadbod-ui' }
+    -- use { 'kristijanhusak/vim-dadbod-completion' }
+
+    -- }}}
+
+    -- }}}
+
+    -- UI {{{
+    use {
+        "lukas-reineke/indent-blankline.nvim",
+        config = function()
+            opts = {}
+            -- Other blankline configuration here
+            require("ibl").setup(require("indent-rainbowline").make_opts(opts))
+        end,
+        requires = { "TheGLander/indent-rainbowline.nvim" }
+    }
+
+    use {
+        'glepnir/dashboard-nvim',
+        -- event = 'VimEnter',
+        requires = { 'nvim-tree/nvim-web-devicons' }
+    }
+    use {
+        'j-hui/fidget.nvim',
+        tag = 'legacy',
+        config = function()
+            require("fidget").setup {
+                -- options
+            }
+        end
+    }
+    use {
+        'nvim-lualine/lualine.nvim',
+        requires = { 'kyazdani42/nvim-web-devicons', opt = true }
+    }
+    use { 'AndreM222/copilot-lualine' }
+    use { 'kyazdani42/nvim-web-devicons' }
+    use { 'norcalli/nvim-colorizer.lua' }
+    use { 'akinsho/nvim-bufferline.lua' }
+    use { 'andweeb/presence.nvim' }
+    use { 'folke/which-key.nvim' }
+    use { 'kyazdani42/nvim-tree.lua' }
+    use { 'lewis6991/gitsigns.nvim' }
+    use { 'rcarriga/nvim-notify' }
+    use { 'stevearc/dressing.nvim' }
+    use { 'HiPhish/rainbow-delimiters.nvim' }
+    use { 'echasnovski/mini.nvim' }
+
+    -- }}}
+
+    -- EXTRAS {{{
+
+    use {
+        "nvim-neorg/neorg",
+        -- tag = "*",
+        ft = "norg",
+        after = "nvim-treesitter", -- You may want to specify Telescope here as well
+        config = function()
+            require('neorg').setup {
+                load = {
+                    ["core.defaults"] = {},                                     -- Loads default behaviour
+                    ["core.concealer"] = {},                                    -- Adds pretty icons to your documents
+                    ["core.completion"] = { config = { engine = "nvim-cmp" } }, -- Adds completion
+                    ["core.dirman"] = {                                         -- Manages Neorg workspaces
+                        config = { workspaces = { notes = "~/notes" } }
+                    }
+                }
+            }
+        end
+    }
+    use 'jiangmiao/auto-pairs'
+    use 'pechorin/any-jump.vim'
+    use 'tpope/vim-commentary'
+    use 'tpope/vim-dotenv'
+    use 'tpope/vim-surround'
+    use 'voldikss/vim-floaterm'
+    use 'wakatime/vim-wakatime'
+    use 'rmagatti/goto-preview'
+
+    -- }}}
+
+    -- COLORSCHEMES {{{
+
+    use { 'Mofiqul/dracula.nvim' }
+    -- use({
+    --     'NTBBloodbath/doom-one.nvim',
+    --     setup = function()
+    --         -- Add color to cursor
+    --         vim.g.doom_one_cursor_coloring = false
+    --         -- Set :terminal colors
+    --         vim.g.doom_one_terminal_colors = true
+    --         -- Enable italic comments
+    --         vim.g.doom_one_italic_comments = false
+    --         -- Enable TS support
+    --         vim.g.doom_one_enable_treesitter = true
+    --         -- Color whole diagnostic text or only underline
+    --         vim.g.doom_one_diagnostics_text_color = false
+    --         -- Enable transparent background
+    --         vim.g.doom_one_transparent_background = false
+
+    --         -- Pumblend transparency
+    --         vim.g.doom_one_pumblend_enable = false
+    --         vim.g.doom_one_pumblend_transparency = 20
+
+    --         -- Plugins integration
+    --         vim.g.doom_one_plugin_neorg = true
+    --         vim.g.doom_one_plugin_barbar = false
+    --         vim.g.doom_one_plugin_telescope = true
+    --         vim.g.doom_one_plugin_neogit = true
+    --         vim.g.doom_one_plugin_nvim_tree = true
+    --         vim.g.doom_one_plugin_dashboard = true
+    --         vim.g.doom_one_plugin_startify = true
+    --         vim.g.doom_one_plugin_whichkey = true
+    --         vim.g.doom_one_plugin_indent_blankline = true
+    --         vim.g.doom_one_plugin_vim_illuminate = false
+    --         vim.g.doom_one_plugin_lspsaga = false
+    --     end
+    -- config = function()
+    --     vim.cmd("colorscheme doom-one")
+    --     vim.cmd(
+    --         "highlight Pmenu ctermfg=white ctermbg=black gui=NONE guifg=white guibg=#282C34")
+    --     vim.cmd("highlight PmenuSel guifg=purple guibg=red")
+    -- end
+    -- })
+    use { 'olimorris/onedarkpro.nvim' }
+    use { 'projekt0n/github-nvim-theme' }
+
+    use {
+        "catppuccin/nvim",
+        as = "catppuccin",
+        config = function()
+            vim.cmd("colorscheme catppuccin-macchiato")
+        end
+
+    }
+
+    -- }}}
+end)