|
|
|
@ -39,8 +39,8 @@ P.S. You can delete this when you're done too. It's your config now :)
|
|
|
|
|
-- Set <space> as the leader key
|
|
|
|
|
-- See `:help mapleader`
|
|
|
|
|
-- NOTE: Must happen before plugins are required (otherwise wrong leader will be used)
|
|
|
|
|
vim.g.mapleader = ' '
|
|
|
|
|
vim.g.maplocalleader = ' '
|
|
|
|
|
require('remap')
|
|
|
|
|
require('set')
|
|
|
|
|
|
|
|
|
|
-- Install package manager
|
|
|
|
|
-- https://github.com/folke/lazy.nvim
|
|
|
|
@ -57,7 +57,6 @@ if not vim.loop.fs_stat(lazypath) then
|
|
|
|
|
}
|
|
|
|
|
end
|
|
|
|
|
vim.opt.rtp:prepend(lazypath)
|
|
|
|
|
|
|
|
|
|
-- NOTE: Here is where you install your plugins.
|
|
|
|
|
-- You can configure plugins using the `config` key.
|
|
|
|
|
--
|
|
|
|
@ -112,14 +111,6 @@ require('lazy').setup({
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
{ -- Theme inspired by Atom
|
|
|
|
|
'navarasu/onedark.nvim',
|
|
|
|
|
priority = 1000,
|
|
|
|
|
config = function()
|
|
|
|
|
vim.cmd.colorscheme 'onedark'
|
|
|
|
|
end,
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
{ -- Set lualine as statusline
|
|
|
|
|
'nvim-lualine/lualine.nvim',
|
|
|
|
|
-- See `:help lualine.txt`
|
|
|
|
@ -133,14 +124,19 @@ require('lazy').setup({
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
{ -- Add indentation guides even on blank lines
|
|
|
|
|
'lukas-reineke/indent-blankline.nvim',
|
|
|
|
|
-- Enable `lukas-reineke/indent-blankline.nvim`
|
|
|
|
|
-- See `:help indent_blankline.txt`
|
|
|
|
|
opts = {
|
|
|
|
|
char = '┊',
|
|
|
|
|
show_trailing_blankline_indent = false,
|
|
|
|
|
},
|
|
|
|
|
-- { "catppuccin/nvim", name = "catppuccin" },
|
|
|
|
|
|
|
|
|
|
-- { -- Theme inspired by Atom
|
|
|
|
|
-- 'navarasu/onedark.nvim',
|
|
|
|
|
-- priority = 1000,
|
|
|
|
|
-- config = function()
|
|
|
|
|
-- vim.cmd.colorscheme 'onedark'
|
|
|
|
|
-- end,
|
|
|
|
|
-- },
|
|
|
|
|
{
|
|
|
|
|
"folke/tokyonight.nvim",
|
|
|
|
|
lazy = true,
|
|
|
|
|
-- opts = { style = "moon" },
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
-- "gc" to comment visual regions/lines
|
|
|
|
@ -191,6 +187,19 @@ require('lazy').setup({
|
|
|
|
|
|
|
|
|
|
-- [[ Setting options ]]
|
|
|
|
|
-- See `:help vim.o`
|
|
|
|
|
-- My custom remaps
|
|
|
|
|
require('remap')
|
|
|
|
|
|
|
|
|
|
vim.o.guicursor = ""
|
|
|
|
|
|
|
|
|
|
vim.o.nu = true
|
|
|
|
|
|
|
|
|
|
vim.o.relativenumber = true
|
|
|
|
|
|
|
|
|
|
vim.o.mouse = ""
|
|
|
|
|
|
|
|
|
|
-- Set colorscheme after loading it
|
|
|
|
|
vim.cmd.colorscheme "tokyonight-moon"
|
|
|
|
|
|
|
|
|
|
-- Set highlight on search
|
|
|
|
|
vim.o.hlsearch = false
|
|
|
|
@ -198,14 +207,6 @@ vim.o.hlsearch = false
|
|
|
|
|
-- Make line numbers default
|
|
|
|
|
vim.wo.number = true
|
|
|
|
|
|
|
|
|
|
-- Enable mouse mode
|
|
|
|
|
vim.o.mouse = 'a'
|
|
|
|
|
|
|
|
|
|
-- Sync clipboard between OS and Neovim.
|
|
|
|
|
-- Remove this option if you want your OS clipboard to remain independent.
|
|
|
|
|
-- See `:help 'clipboard'`
|
|
|
|
|
vim.o.clipboard = 'unnamedplus'
|
|
|
|
|
|
|
|
|
|
-- Enable break indent
|
|
|
|
|
vim.o.breakindent = true
|
|
|
|
|
|
|
|
|
@ -279,16 +280,16 @@ vim.keymap.set('n', '<leader>/', function()
|
|
|
|
|
end, { desc = '[/] Fuzzily search in current buffer' })
|
|
|
|
|
|
|
|
|
|
vim.keymap.set('n', '<leader>sf', require('telescope.builtin').find_files, { desc = '[S]earch [F]iles' })
|
|
|
|
|
vim.keymap.set('n', '<C-p>', require('telescope.builtin').git_files, { desc = 'Search git project repo'})
|
|
|
|
|
vim.keymap.set('n', '<leader>sh', require('telescope.builtin').help_tags, { desc = '[S]earch [H]elp' })
|
|
|
|
|
vim.keymap.set('n', '<leader>sw', require('telescope.builtin').grep_string, { desc = '[S]earch current [W]ord' })
|
|
|
|
|
vim.keymap.set('n', '<leader>sg', require('telescope.builtin').live_grep, { desc = '[S]earch by [G]rep' })
|
|
|
|
|
vim.keymap.set('n', '<leader>sd', require('telescope.builtin').diagnostics, { desc = '[S]earch [D]iagnostics' })
|
|
|
|
|
|
|
|
|
|
-- [[ Configure Treesitter ]]
|
|
|
|
|
-- See `:help nvim-treesitter`
|
|
|
|
|
-- [[ Configure Treesitter ]] See `:help nvim-treesitter`
|
|
|
|
|
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', 'typescript', 'help', 'vim' },
|
|
|
|
|
ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'javascript', 'typescript', 'help', 'vim' },
|
|
|
|
|
|
|
|
|
|
-- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!)
|
|
|
|
|
auto_install = false,
|
|
|
|
@ -351,10 +352,10 @@ require('nvim-treesitter.configs').setup {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
-- Diagnostic keymaps
|
|
|
|
|
vim.keymap.set('n', '[d', vim.diagnostic.goto_prev)
|
|
|
|
|
vim.keymap.set('n', ']d', vim.diagnostic.goto_next)
|
|
|
|
|
vim.keymap.set('n', '<leader>e', vim.diagnostic.open_float)
|
|
|
|
|
vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist)
|
|
|
|
|
-- vim.keymap.set('n', '[d', vim.diagnostic.goto_prev)
|
|
|
|
|
-- vim.keymap.set('n', ']d', vim.diagnostic.goto_next)
|
|
|
|
|
-- vim.keymap.set('n', '<leader>e', vim.diagnostic.open_float)
|
|
|
|
|
-- vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist)
|
|
|
|
|
|
|
|
|
|
-- LSP settings.
|
|
|
|
|
-- This function gets run when an LSP connects to a particular buffer.
|
|
|
|
|