|
|
|
|
@ -110,7 +110,7 @@ require('lazy').setup({
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
-- Useful plugin to show you pending keybinds.
|
|
|
|
|
{ 'folke/which-key.nvim', opts = {} },
|
|
|
|
|
{ 'folke/which-key.nvim', opts = {} },
|
|
|
|
|
{
|
|
|
|
|
-- Adds git related signs to the gutter, as well as utilities for managing changes
|
|
|
|
|
'lewis6991/gitsigns.nvim',
|
|
|
|
|
@ -152,10 +152,11 @@ require('lazy').setup({
|
|
|
|
|
|
|
|
|
|
{
|
|
|
|
|
-- Theme inspired by Atom
|
|
|
|
|
'navarasu/onedark.nvim',
|
|
|
|
|
-- 'navarasu/onedark.nvim',
|
|
|
|
|
'rmehri01/onenord.nvim',
|
|
|
|
|
priority = 1000,
|
|
|
|
|
config = function()
|
|
|
|
|
vim.cmd.colorscheme 'onedark'
|
|
|
|
|
vim.cmd.colorscheme 'onenord'
|
|
|
|
|
end,
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
@ -166,10 +167,17 @@ require('lazy').setup({
|
|
|
|
|
opts = {
|
|
|
|
|
options = {
|
|
|
|
|
icons_enabled = false,
|
|
|
|
|
theme = 'onedark',
|
|
|
|
|
theme = 'onenord',
|
|
|
|
|
component_separators = '|',
|
|
|
|
|
section_separators = '',
|
|
|
|
|
},
|
|
|
|
|
sections = {
|
|
|
|
|
lualine_c = {
|
|
|
|
|
{
|
|
|
|
|
'filename', path = 4
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
@ -218,8 +226,8 @@ require('lazy').setup({
|
|
|
|
|
-- NOTE: Next Step on Your Neovim Journey: Add/Configure additional "plugins" for kickstart
|
|
|
|
|
-- These are some example plugins that I've included in the kickstart repository.
|
|
|
|
|
-- Uncomment any of the lines below to enable them.
|
|
|
|
|
-- require 'kickstart.plugins.autoformat',
|
|
|
|
|
-- require 'kickstart.plugins.debug',
|
|
|
|
|
require 'kickstart.plugins.autoformat',
|
|
|
|
|
require 'kickstart.plugins.debug',
|
|
|
|
|
|
|
|
|
|
-- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua`
|
|
|
|
|
-- You can use this folder to prevent any conflicts with this init.lua if you're interested in keeping
|
|
|
|
|
@ -227,15 +235,27 @@ require('lazy').setup({
|
|
|
|
|
-- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going.
|
|
|
|
|
--
|
|
|
|
|
-- For additional information see: https://github.com/folke/lazy.nvim#-structuring-your-plugins
|
|
|
|
|
-- { import = 'custom.plugins' },
|
|
|
|
|
{ import = 'custom.plugins' },
|
|
|
|
|
}, {})
|
|
|
|
|
|
|
|
|
|
-- [[ Setting options ]]
|
|
|
|
|
-- See `:help vim.o`
|
|
|
|
|
-- NOTE: You can change these options as you wish!
|
|
|
|
|
|
|
|
|
|
-- Line & relative line numbers
|
|
|
|
|
vim.opt.number = true
|
|
|
|
|
vim.opt.relativenumber = true
|
|
|
|
|
|
|
|
|
|
-- Indents
|
|
|
|
|
vim.opt.tabstop = 2
|
|
|
|
|
vim.opt.softtabstop = 2
|
|
|
|
|
vim.opt.shiftwidth = 2
|
|
|
|
|
vim.opt.expandtab = true
|
|
|
|
|
vim.opt.smartindent = true
|
|
|
|
|
|
|
|
|
|
-- Set highlight on search
|
|
|
|
|
vim.o.hlsearch = false
|
|
|
|
|
vim.opt.incsearch = true
|
|
|
|
|
|
|
|
|
|
-- Make line numbers default
|
|
|
|
|
vim.wo.number = true
|
|
|
|
|
@ -271,12 +291,29 @@ vim.o.completeopt = 'menuone,noselect'
|
|
|
|
|
-- NOTE: You should make sure your terminal supports this
|
|
|
|
|
vim.o.termguicolors = true
|
|
|
|
|
|
|
|
|
|
-- Filetype overrides
|
|
|
|
|
vim.filetype.add({
|
|
|
|
|
extension = {
|
|
|
|
|
postcss = 'css',
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
-- [[ Basic Keymaps ]]
|
|
|
|
|
|
|
|
|
|
-- Keymaps for better default experience
|
|
|
|
|
-- See `:help vim.keymap.set()`
|
|
|
|
|
vim.keymap.set({ 'n', 'v' }, '<Space>', '<Nop>', { silent = true })
|
|
|
|
|
|
|
|
|
|
-- Easy save with CTRL + s
|
|
|
|
|
vim.keymap.set('n', '<C-s>', ':update<cr>', { noremap = true })
|
|
|
|
|
vim.keymap.set({ 'i', 'v' }, '<C-s>', '<Esc>:update<cr>', { noremap = true })
|
|
|
|
|
|
|
|
|
|
-- Split Movement
|
|
|
|
|
vim.keymap.set('n', '<C-h>', '<C-w>h', { noremap = true, silent = true })
|
|
|
|
|
vim.keymap.set('n', '<C-j>', '<C-w>j', { noremap = true, silent = true })
|
|
|
|
|
vim.keymap.set('n', '<C-k>', '<C-w>k', { noremap = true, silent = true })
|
|
|
|
|
vim.keymap.set('n', '<C-l>', '<C-w>l', { noremap = true, silent = true })
|
|
|
|
|
|
|
|
|
|
-- Remap for dealing with word wrap
|
|
|
|
|
vim.keymap.set('n', 'k', "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
|
|
|
|
|
vim.keymap.set('n', 'j', "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
|
|
|
|
|
@ -297,9 +334,19 @@ vim.api.nvim_create_autocmd('TextYankPost', {
|
|
|
|
|
require('telescope').setup {
|
|
|
|
|
defaults = {
|
|
|
|
|
mappings = {
|
|
|
|
|
-- for input mode
|
|
|
|
|
i = {
|
|
|
|
|
['<C-u>'] = false,
|
|
|
|
|
['<C-d>'] = false,
|
|
|
|
|
["<C-j>"] = require('telescope.actions').move_selection_next,
|
|
|
|
|
["<C-k>"] = require('telescope.actions').move_selection_previous,
|
|
|
|
|
["<C-n>"] = require('telescope.actions').cycle_history_next,
|
|
|
|
|
["<C-p>"] = require('telescope.actions').cycle_history_prev,
|
|
|
|
|
},
|
|
|
|
|
-- for normal mode
|
|
|
|
|
n = {
|
|
|
|
|
["<C-j>"] = require('telescope.actions').move_selection_next,
|
|
|
|
|
["<C-k>"] = require('telescope.actions').move_selection_previous,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
@ -333,7 +380,18 @@ vim.keymap.set('n', '<leader>sr', require('telescope.builtin').resume, { desc =
|
|
|
|
|
vim.defer_fn(function()
|
|
|
|
|
require('nvim-treesitter.configs').setup {
|
|
|
|
|
-- Add languages to be installed here that you want installed for treesitter
|
|
|
|
|
ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'javascript', 'typescript', 'vimdoc', 'vim', 'bash' },
|
|
|
|
|
ensure_installed = {
|
|
|
|
|
"bash",
|
|
|
|
|
"javascript",
|
|
|
|
|
"json",
|
|
|
|
|
"lua",
|
|
|
|
|
"typescript",
|
|
|
|
|
"tsx",
|
|
|
|
|
"css",
|
|
|
|
|
"rust",
|
|
|
|
|
"yaml",
|
|
|
|
|
"svelte",
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
-- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!)
|
|
|
|
|
auto_install = false,
|
|
|
|
|
@ -399,8 +457,8 @@ end, 0)
|
|
|
|
|
-- Diagnostic keymaps
|
|
|
|
|
vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, { desc = 'Go to previous diagnostic message' })
|
|
|
|
|
vim.keymap.set('n', ']d', vim.diagnostic.goto_next, { desc = 'Go to next diagnostic message' })
|
|
|
|
|
vim.keymap.set('n', '<leader>e', vim.diagnostic.open_float, { desc = 'Open floating diagnostic message' })
|
|
|
|
|
vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostics list' })
|
|
|
|
|
vim.keymap.set('n', '<leader>do', vim.diagnostic.open_float, { desc = 'Open floating diagnostic message' })
|
|
|
|
|
vim.keymap.set('n', '<leader>dd', vim.diagnostic.setloclist, { desc = 'Open diagnostics list' })
|
|
|
|
|
|
|
|
|
|
-- [[ Configure LSP ]]
|
|
|
|
|
-- This function gets run when an LSP connects to a particular buffer.
|
|
|
|
|
@ -478,7 +536,9 @@ local servers = {
|
|
|
|
|
-- rust_analyzer = {},
|
|
|
|
|
-- tsserver = {},
|
|
|
|
|
-- html = { filetypes = { 'html', 'twig', 'hbs'} },
|
|
|
|
|
|
|
|
|
|
-- prettierd = {
|
|
|
|
|
-- },
|
|
|
|
|
--
|
|
|
|
|
lua_ls = {
|
|
|
|
|
Lua = {
|
|
|
|
|
workspace = { checkThirdParty = false },
|
|
|
|
|
@ -562,3 +622,6 @@ cmp.setup {
|
|
|
|
|
|
|
|
|
|
-- The line beneath this is called `modeline`. See `:help modeline`
|
|
|
|
|
-- vim: ts=2 sts=2 sw=2 et
|
|
|
|
|
|
|
|
|
|
-- Autocommand create folder(s) for new file
|
|
|
|
|
vim.cmd 'source ~/.config/nvim/auto-mkdir.vim'
|
|
|
|
|
|
zwergius
2 years ago