summaryrefslogtreecommitdiff
path: root/.config/nvim/lua
diff options
context:
space:
mode:
Diffstat (limited to '.config/nvim/lua')
-rw-r--r--.config/nvim/lua/lib/utils.lua22
-rw-r--r--.config/nvim/lua/user/keymaps.lua33
-rw-r--r--.config/nvim/lua/user/misc.lua6
-rw-r--r--.config/nvim/lua/user/options.lua25
-rw-r--r--.config/nvim/lua/user/plugins.lua101
-rw-r--r--.config/nvim/lua/user/plugins/cmp.lua73
-rw-r--r--.config/nvim/lua/user/plugins/dracula.lua13
-rw-r--r--.config/nvim/lua/user/plugins/lspconfig.lua138
-rw-r--r--.config/nvim/lua/user/plugins/lualine.lua64
-rw-r--r--.config/nvim/lua/user/plugins/luasnip.lua9
-rw-r--r--.config/nvim/lua/user/plugins/nvim-tree.lua13
-rw-r--r--.config/nvim/lua/user/plugins/telescope.lua25
-rw-r--r--.config/nvim/lua/user/plugins/treesitter.lua31
13 files changed, 0 insertions, 553 deletions
diff --git a/.config/nvim/lua/lib/utils.lua b/.config/nvim/lua/lib/utils.lua
deleted file mode 100644
index 8abbabd..0000000
--- a/.config/nvim/lua/lib/utils.lua
+++ /dev/null
@@ -1,22 +0,0 @@
-local M = {}
-
-M.keymap = function(mode, lhs, rhs, opts)
- vim.api.nvim_set_keymap(
- mode,
- lhs,
- rhs,
- vim.tbl_extend('keep', opts or {}, { noremap = true, silent = true })
- )
-end
-
-M.buf_keymap = function(bufnr, mode, lhs, rhs, opts)
- vim.api.nvim_buf_set_keymap(
- bufnr,
- mode,
- lhs,
- rhs,
- vim.tbl_extend('keep', opts or {}, { noremap = true, silent = true })
- )
-end
-
-return M
diff --git a/.config/nvim/lua/user/keymaps.lua b/.config/nvim/lua/user/keymaps.lua
deleted file mode 100644
index 777d099..0000000
--- a/.config/nvim/lua/user/keymaps.lua
+++ /dev/null
@@ -1,33 +0,0 @@
-local keymap = require 'lib.utils'.keymap
-
-vim.g.mapleader = ' '
-vim.g.maplocalleader = ' '
-vim.g.tmux_navigator_no_mappings=1
-
-keymap('n', '<leader>Q', ':bufdo bdelete<CR>')
-
--- Allow gf to open non-existant files
-keymap('n', 'gf', ':edit <cfile><CR>')
-
--- Open the current file in the default program
-keymap('n', '<leader>x', ':!xdg-open %<CR><CR>')
-
--- Resize with arrows
-keymap('n', '<C-Up>', ':resize +2<CR>')
-keymap('n', '<C-Down>', ':resize -2<CR>')
-keymap('n', '<C-Left>', ':vertical resize -2<CR>')
-keymap('n', '<C-Right>', ':vertical resize +2<CR>')
-
--- Quickly escape to normal mode
-keymap('i', 'jj', '<Esc>')
-
-keymap('n', '<leader>cd', ':cd %:p:h<CR>:pwd<CR>')
-
-keymap('n', '<leader>E', ':EslintFixAll<CR>')
-
--- Change tmux-navigator keybinds
-keymap('n', '<C-h>', ':<C-U>TmuxNavigateLeft<cr>')
-keymap('n', '<C-j>', ':<C-U>TmuxNavigateDown<cr>')
-keymap('n', '<C-k>', ':<C-U>TmuxNavigateUp<cr>')
-keymap('n', '<C-l>', ':<C-U>TmuxNavigateRight<cr>')
-keymap('n', '<C-\\>', ':<C-U>TmuxNavigatePrevious<cr>')
diff --git a/.config/nvim/lua/user/misc.lua b/.config/nvim/lua/user/misc.lua
deleted file mode 100644
index 88d47cf..0000000
--- a/.config/nvim/lua/user/misc.lua
+++ /dev/null
@@ -1,6 +0,0 @@
-vim.cmd [[
- augroup Indentation
- autocmd!
- autocmd FileType html set inde=
- augroup END
-]]
diff --git a/.config/nvim/lua/user/options.lua b/.config/nvim/lua/user/options.lua
deleted file mode 100644
index 510485f..0000000
--- a/.config/nvim/lua/user/options.lua
+++ /dev/null
@@ -1,25 +0,0 @@
-vim.o.guicursor='a:block'
-vim.o.expandtab=true
-vim.o.shiftwidth=4
-vim.o.softtabstop=4
-vim.o.tabstop=4
-vim.o.signcolumn='yes:2'
-vim.o.relativenumber=true
-vim.o.number=true
-vim.o.termguicolors=true
-vim.o.ignorecase=true
-vim.o.smartcase=true
-vim.o.wildmode='longest:full,full'
-vim.o.wrap=false
-vim.o.scrolloff=8
-vim.o.sidescrolloff=8
-vim.o.cursorline=true
-vim.o.splitright=true
-vim.o.splitbelow=true
-vim.o.clipboard='unnamedplus'
-vim.o.updatetime=250
-vim.o.redrawtime=10000
-vim.o.foldmethod="expr"
-vim.o.foldlevelstart=10
-vim.o.foldexpr="nvim_treesitter#foldexpr()"
-vim.o.hlsearch=false
diff --git a/.config/nvim/lua/user/plugins.lua b/.config/nvim/lua/user/plugins.lua
deleted file mode 100644
index ae21e4f..0000000
--- a/.config/nvim/lua/user/plugins.lua
+++ /dev/null
@@ -1,101 +0,0 @@
-require('packer').startup(function()
- use { 'wbthomason/packer.nvim' } -- Let packer manage itself
- use { 'tpope/vim-commentary' }
- use { 'tpope/vim-surround' }
- use { 'tpope/vim-eunuch' }
- use { 'christoomey/vim-tmux-navigator' }
-
- use {
- 'dracula/vim',
- as = 'dracula',
- config = function()
- require('user.plugins.dracula')
- end
- }
- use {
- 'windwp/nvim-autopairs',
- config = function()
- require('nvim-autopairs').setup()
- end
- }
-
- use {
- 'windwp/nvim-ts-autotag',
- config = function()
- require('nvim-ts-autotag').setup()
- end
- }
-
- use {
- 'kyazdani42/nvim-tree.lua',
- requires = 'kyazdani42/nvim-web-devicons',
- config = function()
- require('user.plugins.nvim-tree')
- end
- }
- use {
- 'nvim-treesitter/nvim-treesitter',
- run = ':TSUpdate',
- requires = {
- 'nvim-treesitter/playground',
- 'nvim-treesitter/nvim-treesitter-textobjects',
- 'lewis6991/spellsitter.nvim',
- 'JoosepAlviste/nvim-ts-context-commentstring',
- },
- config = function()
- require('spellsitter').setup()
- require('user.plugins.treesitter')
- end
- }
-
- use {
- 'neovim/nvim-lspconfig',
- requires = {
- 'b0o/schemastore.nvim',
- 'folke/lsp-colors.nvim',
- 'weilbith/nvim-code-action-menu',
- },
- config = function()
- require('user.plugins.lspconfig')
- end
- }
- use {
- 'hrsh7th/nvim-cmp',
- requires = {
- 'hrsh7th/cmp-nvim-lsp',
- 'hrsh7th/cmp-buffer',
- 'jessarcher/cmp-path',
- 'hrsh7th/cmp-nvim-lua',
- 'L3MON4D3/LuaSnip',
- 'onsails/lspkind-nvim',
- 'hrsh7th/cmp-nvim-lsp-signature-help',
- },
- config = function()
- require('user.plugins.cmp')
- end
- }
- use {
- 'nvim-telescope/telescope.nvim',
- requires = {
- 'nvim-lua/popup.nvim',
- 'nvim-lua/plenary.nvim',
- 'kyazdani42/nvim/nvim-web-devicons',
- },
- config = function()
- require('user.plugins.telescope')
- end
- }
- use {
- 'nvim-lualine/lualine.nvim',
- requires = 'kyazdani42/nvim-web-devicons',
- config = function()
- require('user.plugins.lualine')
- end
- }
- use {
- 'L3MON4D3/LuaSnip',
- config = function()
- require('user.plugins.luasnip')
- end
- }
-end)
diff --git a/.config/nvim/lua/user/plugins/cmp.lua b/.config/nvim/lua/user/plugins/cmp.lua
deleted file mode 100644
index 81cd2ee..0000000
--- a/.config/nvim/lua/user/plugins/cmp.lua
+++ /dev/null
@@ -1,73 +0,0 @@
-local has_words_before = function()
- local line, col = unpack(vim.api.nvim_win_get_cursor(0))
- return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match '%s' == nil
-end
-
-local luasnip = require 'luasnip'
-local cmp = require 'cmp'
-local lspkind = require 'lspkind'
-
--- Set completeopt to have a better completion experience
-vim.o.completeopt = 'menuone,longest,preview'
-
-cmp.setup({
- experimental = {
- ghost_text = true,
- },
- formatting = {
- format = lspkind.cmp_format {
- mode = 'symbol',
- menu = {
- nvim_lsp = '[LSP]',
- nvim_lua = '[Lua]',
- buffer = '[BUF]',
- },
- },
- },
- snippet = {
- expand = function(args)
- require('luasnip').lsp_expand(args.body)
- end,
- },
- mapping = {
- ['<C-p>'] = cmp.mapping.select_prev_item(),
- ['<C-n>'] = cmp.mapping.select_next_item(),
- ['<C-d>'] = cmp.mapping.scroll_docs(-4),
- ['<C-r>'] = cmp.mapping.scroll_docs(4),
- ['<C-Space>'] = cmp.mapping.complete(),
- ['<C-e>'] = cmp.mapping.close(),
- ['<CR>'] = cmp.mapping.confirm {
- behavior = cmp.ConfirmBehavior.replace,
- select = false,
- },
- ['<Tab>'] = cmp.mapping(function(fallback)
- if luasnip.expand_or_jumpable() then
- luasnip.expand_or_jump()
- elseif cmp.visible() then
- cmp.select_next_item()
- elseif has_words_before() then
- cmp.complete()
- else
- fallback()
- end
- end, { 'i', 's' }),
- ['<S-Tab>'] = cmp.mapping(function(fallback)
- if luasnip.jumpable(-1) then
- luasnip.jump(-1)
- elseif cmp.visible() then
- cmp.select_prev_item()
- else
- fallback()
- end
-
- end, { 'i', 's' }),
- },
- sources = {
- { name = 'nvim_lsp' },
- { name = 'nvim_lsp_signature_help' },
- { name = 'nvim_lua' },
- { name = 'luasnip' },
- { name = 'path' },
- { name = 'buffer' },
- },
-})
diff --git a/.config/nvim/lua/user/plugins/dracula.lua b/.config/nvim/lua/user/plugins/dracula.lua
deleted file mode 100644
index 77926a0..0000000
--- a/.config/nvim/lua/user/plugins/dracula.lua
+++ /dev/null
@@ -1,13 +0,0 @@
-vim.cmd([[
- augroup DraculaOverrides
- autocmd!
- autocmd ColorScheme dracula highlight! link Pmenu DraculaBg
- autocmd ColorScheme dracula highlight link NormalFloat DraculaBgLight
- autocmd ColorScheme dracula highlight FloatBorder guifg=none guibg=none
- autocmd ColorScheme dracula highlight DraculaBoundary guibg=none
- autocmd ColorScheme dracula highlight DraculaDiffDelete ctermbg=none guibg=none
- autocmd ColorScheme dracula highlight DraculaComment cterm=italic gui=italic
- autocmd ColorScheme dracula highlight Normal guibg=none
- augroup end
- colorscheme dracula
-]])
diff --git a/.config/nvim/lua/user/plugins/lspconfig.lua b/.config/nvim/lua/user/plugins/lspconfig.lua
deleted file mode 100644
index 5685ce7..0000000
--- a/.config/nvim/lua/user/plugins/lspconfig.lua
+++ /dev/null
@@ -1,138 +0,0 @@
-local buf_option = vim.api.nvim_buf_set_option
-local buf_keymap = require 'lib.utils'.buf_keymap
-
-vim.diagnostic.config {
- virtual_text = false,
- severity_sort = true,
- float = {
- source = true,
- focus = false,
- format = function(diagnostic)
- if diagnostic.user_data ~= nil and diagnostic.user_data.lsp.code ~= nil then
- return string.format("%s: %s", diagnostic.user_data.lsp.code, diagnostic.message)
- end
- return diagnostic.message
- end,
- }
-}
-
-local on_attach = function(_, bufnr)
- buf_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
-
- buf_keymap(bufnr, 'n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<CR>')
- buf_keymap(bufnr, 'n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>')
- buf_keymap(bufnr, 'n', 'K', '<cmd>lua vim.lsp.buf.hover()<CR>')
- buf_keymap(bufnr, 'n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>')
- buf_keymap(bufnr, 'n', '<leader><C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>')
- buf_keymap(bufnr, 'n', '<leader>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>')
- buf_keymap(bufnr, 'n', '<leader>rn', '<cmd>lua vim.lsp.buf.rename()<CR>')
- buf_keymap(bufnr, 'n', 'gr', ':Telescope lsp_references<CR>')
-
- buf_keymap(bufnr, 'n', '<leader>ca', ':CodeActionMenu<CR>')
- buf_keymap(bufnr, 'v', '<leader>ca', ':CodeActionMenu<CR>')
-
- buf_keymap(bufnr, 'n', '<leader>d', '<cmd>lua vim.diagnostic.open_float()<CR>')
- buf_keymap(bufnr, 'n', '[d', '<cmd>lua vim.diagnostic.goto_prev()<CR>')
- buf_keymap(bufnr, 'n', ']d', '<cmd>lua vim.diagnostic.goto_next()<CR>')
- buf_keymap(bufnr, 'n', '<leader>F', '<cmd>lua vim.lsp.buf.format { async = true }<CR>')
-
- -- Autoformat on save doesn't work with server_capabilities, even
- -- though it's the replacement for the deprecated resolved_capabilities.
-
- -- if _.server_capabilities.document_formatting then
- -- vim.api.nvim_command [[augroup Format]]
- -- vim.api.nvim_command [[autocmd! * <buffer>]]
- -- vim.api.nvim_command [[autocmd BufWritePre <buffer> lua vim.lsp.buf.formatting_seq_sync()]]
- -- vim.api.nvim_command [[augroup END]]
- -- end
-end
-
--- provide additional completion capabilities
-local capabilities = require('cmp_nvim_lsp').default_capabilities(vim.lsp.protocol.make_client_capabilities())
-
-require 'lspconfig'.emmet_ls.setup {
- on_attach = on_attach,
- capabilities = capabilities,
- flags = {
- debounce_text_changes = 150,
- },
- filetypes = { 'html', 'javascript', 'typescript', 'javascriptreact', 'typescriptreact', 'eruby' }
-}
-
--- require'lspconfig'.lua_ls.setup {
--- on_init = function(client)
--- local path = client.workspace_folders[1].name
--- if not vim.loop.fs_stat(path..'/.luarc.json') and not vim.loop.fs_stat(path..'/.luarc.jsonc') then
--- client.config.settings = vim.tbl_deep_extend('force', client.config.settings.Lua, {
--- runtime = {
--- -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim)
--- version = 'LuaJIT'
--- },
--- -- Make the server aware of Neovim runtime files
--- workspace = {
--- library = { vim.env.VIMRUNTIME }
--- -- or pull in all of 'runtimepath'. NOTE: this is a lot slower
--- -- library = vim.api.nvim_get_runtime_file("", true)
--- },
--- cmd = { "~/.emacs.d/.cache/lsp/lua-language-server/bin/lua-language-server" },
--- })
-
--- client.notify("workspace/didChangeConfiguration", { settings = client.config.settings })
--- end
--- return true
--- end
--- }
-
-require'lspconfig'.lua_ls.setup {
- on_attach = on_attach,
- capabilities = capabilities,
- flags = {
- debounce_text_changes = 150,
- },
- cmd = { "lua-language-server" },
-}
-
-require 'lspconfig'.bashls.setup {
- on_attach = on_attach,
- capabilities = capabilities,
- flags = {
- debounce_text_changes = 150,
- },
-}
-
-require 'lspconfig'.pylsp.setup {
- on_attach = on_attach,
- capabilities = capabilities,
- flags = {
- debounce_text_changes = 150,
- },
-}
-
-require 'lspconfig'.clangd.setup {
- on_attach = on_attach,
- capabilities = capabilities,
- flags = {
- debounce_text_changes = 150,
- },
- cmd = { "clangd" };
-}
-
--- require 'lspconfig'.solargraph.setup {
--- on_attach = on_attach,
--- capabilities = capabilities,
--- flags = {
--- debounce_text_changes = 150,
--- }
--- }
-
--- suppress error messages from lang servers
-vim.notify = function(msg, log_level, _)
- if msg:match 'exit code' then
- return
- end
- if log_level == vim.log.levels.ERROR then
- vim.api.nvim_err_writeln(msg)
- else
- vim.api.nvim_echo({ { msg } }, true, {})
- end
-end
diff --git a/.config/nvim/lua/user/plugins/lualine.lua b/.config/nvim/lua/user/plugins/lualine.lua
deleted file mode 100644
index 6ac5cee..0000000
--- a/.config/nvim/lua/user/plugins/lualine.lua
+++ /dev/null
@@ -1,64 +0,0 @@
--- local tabLineHl = vim.api.nvim_get_hl_by_name('TabLine', true)
--- local bg = '#' .. bit.tohex(tabLineHl.background, 6)
--- local fg = '#' .. bit.tohex(tabLineHl.foreground, 6)
-local fg = '#F8F8F2' -- DraculaFg
-local bg = '#21222C' -- DraculaBgDark
-local separator = '#424450' -- DraculaSubtle
--- local fg = '#' .. bit.tohex(vim.api.nvim_get_hl_by_name('DraculaFg', true).foreground, 6)
--- local bg = '#' .. bit.tohex(vim.api.nvim_get_hl_by_name('DraculaBgDark', true).background, 6)
--- local separator = '#' .. bit.tohex(vim.api.nvim_get_hl_by_name('DraculaSubtle', true).foreground, 6)
-
-require('lualine').setup {
- options = {
- component_separators = '',
- section_separators = '▕',
- theme = {
- normal = {
- a = { fg = fg, bg = bg },
- b = { fg = fg, bg = bg },
- c = { fg = fg, bg = bg },
- x = { fg = fg, bg = bg },
- y = { fg = fg, bg = bg },
- z = { fg = fg, bg = bg },
- },
- inactive = { c = { fg = fg, bg = bg } },
- },
- },
- sections = {
- lualine_a = {
- 'mode',
- { '"▏"', color = { fg = separator } },
- },
- lualine_b = {
- 'branch',
- 'diff',
- { '"▕"', color = { fg = separator } },
- '"🖧  " .. tostring(#vim.tbl_keys(vim.lsp.buf_get_clients()))',
- { 'diagnostics', sources = { 'nvim_diagnostic' } },
- { '"▏"', color = { fg = separator } },
- },
- lualine_c = { 'filename' },
- lualine_x = {
- 'filetype',
- 'encoding',
- 'fileformat',
- },
- lualine_y = {
- { '"▕"', color = { fg = separator } },
- '(vim.bo.expandtab and "␠ " or "⇥ ") .. " " .. vim.bo.shiftwidth',
- { '"▏"', color = { fg = separator } },
- },
- lualine_z = {
- 'location',
- 'progress',
- },
- },
- -- tabline = {
- -- lualine_a = {
- -- {'buffers'}
- -- },
- -- lualine_z = {
- -- {'tabs'}
- -- }
- -- }
-}
diff --git a/.config/nvim/lua/user/plugins/luasnip.lua b/.config/nvim/lua/user/plugins/luasnip.lua
deleted file mode 100644
index 2e7462a..0000000
--- a/.config/nvim/lua/user/plugins/luasnip.lua
+++ /dev/null
@@ -1,9 +0,0 @@
-local ls = require "luasnip"
-require("luasnip.loaders.from_lua").load({ paths = "~/.config/nvim/snippets" })
-
-ls.config.set_config {
- history = true,
- updateevents = 'TextChanged,TextChangedI',
- enable_autosnippets = true,
-}
-
diff --git a/.config/nvim/lua/user/plugins/nvim-tree.lua b/.config/nvim/lua/user/plugins/nvim-tree.lua
deleted file mode 100644
index 3c425c5..0000000
--- a/.config/nvim/lua/user/plugins/nvim-tree.lua
+++ /dev/null
@@ -1,13 +0,0 @@
-require('nvim-tree').setup {
- renderer = {
- highlight_opened_files = "all",
- group_empty = true,
- },
- git = {
- ignore = false,
- },
-}
-
-vim.cmd [[highlight NvimTreeIndentMarker guifg=#30323E]]
-
-vim.api.nvim_set_keymap('n', '<leader>n', ':NvimTreeFindFileToggle<CR>', { silent = true, noremap = true })
diff --git a/.config/nvim/lua/user/plugins/telescope.lua b/.config/nvim/lua/user/plugins/telescope.lua
deleted file mode 100644
index 5f7023f..0000000
--- a/.config/nvim/lua/user/plugins/telescope.lua
+++ /dev/null
@@ -1,25 +0,0 @@
-local telescope = require 'telescope'
-local actions = require 'telescope.actions'
-local keymap = require 'lib.utils'.keymap
-
-keymap('n', ';f', [[<cmd>lua require('telescope.builtin').find_files()<CR>]])
-keymap('n', ';r', [[<cmd>lua require('telescope.builtin').live_grep()<CR>]])
-keymap('n', ';b', [[<cmd>lua require('telescope.builtin').buffers()<CR>]])
-
-require('telescope').setup {
- defaults = {
- sorting_strategy = 'ascending',
- mappings = {
- i = {
- ["<Esc>"] = actions.close,
- ['<C-Down>'] = actions.cycle_history_next,
- ['<C-Up>'] = actions.cycle_history_prev,
- },
- },
- file_ignore_patterns = {
- '.git/',
- 'node_modules/',
- 'android/',
- },
- }
-}
diff --git a/.config/nvim/lua/user/plugins/treesitter.lua b/.config/nvim/lua/user/plugins/treesitter.lua
deleted file mode 100644
index 32c74ee..0000000
--- a/.config/nvim/lua/user/plugins/treesitter.lua
+++ /dev/null
@@ -1,31 +0,0 @@
-require('nvim-treesitter.configs').setup {
- indent = {
- enable = true,
- disable = { 'html' },
- },
- highlight = {
- enable = true,
- disable = { 'NvimTree' },
- additional_vim_regex_highlighting = true,
- },
- textobjects = {
- select = {
- enable = true,
- lookahead = true,
- keymaps = {
- ['ia'] = '@parameter.inner',
- -- ['aa'] = {
- -- php = "" '@parameter.outer',
-
- -- python = "(function_definition) @function",
- -- cpp = "(function_definition) @function",
- -- c = "(function_definition) @function",
- -- java = "(method_declaration) @function",
- -- },
- },
- },
- },
- context_commentstring = {
- enable = true,
- },
-}
generated by cgit v1.2.3 (git 2.39.1) at 2025-11-08 15:57:30 +0000