Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 32 additions & 18 deletions init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,12 @@ 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 loaded (otherwise wrong leader will be used)
-- I have modified this line to set local leader to ';'
vim.g.mapleader = ' '
vim.g.maplocalleader = ' '
vim.g.maplocalleader = ';'

-- Set to true if you have a Nerd Font installed and selected in the terminal
vim.g.have_nerd_font = false
vim.g.have_nerd_font = true

-- [[ Setting options ]]
-- See `:help vim.o`
Expand Down Expand Up @@ -152,6 +153,9 @@ vim.o.splitbelow = true
vim.o.list = true
vim.opt.listchars = { tab = '» ', trail = '·', nbsp = '␣' }

-- NOTE: Im requiring termgui here for bufferline
vim.opt.termguicolors = true

-- Preview substitutions live, as you type!
vim.o.inccommand = 'split'

Expand Down Expand Up @@ -247,8 +251,11 @@ rtp:prepend(lazypath)
-- NOTE: Here is where you install your plugins.
require('lazy').setup({
-- NOTE: Plugins can be added with a link (or for a github repo: 'owner/repo' link).
'NMAC427/guess-indent.nvim', -- Detect tabstop and shiftwidth automatically

{
'NMAC427/guess-indent.nvim', -- Detect tabstop and shiftwidth automatically
lazy = false,
opts = {},
},
-- NOTE: Plugins can also be added by using a table,
-- with the first argument being the link and the following
-- keys can be used to configure plugin behavior/loading/etc.
Expand Down Expand Up @@ -673,8 +680,9 @@ require('lazy').setup({
local servers = {
-- clangd = {},
-- gopls = {},
-- pyright = {},
-- rust_analyzer = {},
pyright = {},
rust_analyzer = {},
hls = {},
-- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs
--
-- Some languages (like typescript) have entire language plugins that can be useful:
Expand Down Expand Up @@ -770,7 +778,10 @@ require('lazy').setup({
lua = { 'stylua' },
-- Conform can also run multiple formatters sequentially
-- python = { "isort", "black" },
--
go = { '$(go env GOPATH)/bin/goimports', 'gofmt' },

c = { 'astyle' },
rust = { 'rustfmt' },
-- You can use 'stop_after_first' to run the first available formatter from the list
-- javascript = { "prettierd", "prettier", stop_after_first = true },
},
Expand Down Expand Up @@ -844,13 +855,13 @@ require('lazy').setup({
appearance = {
-- 'mono' (default) for 'Nerd Font Mono' or 'normal' for 'Nerd Font'
-- Adjusts spacing to ensure icons are aligned
nerd_font_variant = 'mono',
nerd_font_variant = 'normal',
},

completion = {
-- By default, you may press `<c-space>` to show the documentation.
-- Optionally, set `auto_show = true` to show the documentation after a delay.
documentation = { auto_show = false, auto_show_delay_ms = 500 },
documentation = { auto_show = true, auto_show_delay_ms = 750 },
},

sources = {
Expand All @@ -869,7 +880,7 @@ require('lazy').setup({
-- the rust implementation via `'prefer_rust_with_warning'`
--
-- See :h blink-cmp-config-fuzzy for more information
fuzzy = { implementation = 'lua' },
fuzzy = { implementation = 'prefer_rust_with_warning' },

-- Shows a signature help window while you type arguments for a function
signature = { enabled = true },
Expand Down Expand Up @@ -898,8 +909,11 @@ require('lazy').setup({
end,
},

-- NOTE: I turned signs on, and that conflicts with the edit ligns
-- But these are always comments so I don't really care

-- Highlight todo, notes, etc in comments
{ 'folke/todo-comments.nvim', event = 'VimEnter', dependencies = { 'nvim-lua/plenary.nvim' }, opts = { signs = false } },
{ 'folke/todo-comments.nvim', event = 'VimEnter', dependencies = { 'nvim-lua/plenary.nvim' }, opts = { signs = true } },

{ -- Collection of various small independent plugins/modules
'echasnovski/mini.nvim',
Expand Down Expand Up @@ -973,18 +987,18 @@ require('lazy').setup({
-- Here are some example plugins that I've included in the Kickstart repository.
-- Uncomment any of the lines below to enable them (you will need to restart nvim).
--
-- require 'kickstart.plugins.debug',
-- require 'kickstart.plugins.indent_line',
-- require 'kickstart.plugins.lint',
-- require 'kickstart.plugins.autopairs',
-- require 'kickstart.plugins.neo-tree',
-- require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps
require 'kickstart.plugins.debug',
require 'kickstart.plugins.indent_line',
require 'kickstart.plugins.lint',
require 'kickstart.plugins.autopairs',
require 'kickstart.plugins.neo-tree',
require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps

-- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua`
-- This is the easiest way to modularize your config.
--
-- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going.
-- { import = 'custom.plugins' },
{ import = 'custom.plugins' },
--
-- For additional information with loading, sourcing and examples see `:help lazy.nvim-🔌-plugin-spec`
-- Or use telescope!
Expand Down
15 changes: 15 additions & 0 deletions lua/custom/plugins/lean.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
return {
'Julian/lean.nvim',
event = { 'BufReadPre *.lean', 'BufNewFile *.lean' },

dependencies = {
'nvim-lua/plenary.nvim',
'Saghen/blink.cmp',
'nvim-telescope/telescope.nvim',
},

---@type Lean.Config
opts = {
mappings = true,
},
}
12 changes: 11 additions & 1 deletion lua/kickstart/plugins/debug.lua
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,17 @@ return {

-- You can provide additional configuration to the handlers,
-- see mason-nvim-dap README for more information
handlers = {},
handlers = {
-- defaults
function(config)
require('mason-nvim-dap').default_setup(config)
end,

-- cppdbg = function(config)

-- require('mason-nvim-dap').default_setup(config)
-- end,
},

-- You'll need to check that you have the required things installed
-- online, please don't ask me how to install them :)
Expand Down
7 changes: 5 additions & 2 deletions lua/kickstart/plugins/neo-tree.lua
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,18 @@ return {
},
lazy = false,
keys = {
{ '\\', ':Neotree reveal<CR>', desc = 'NeoTree reveal', silent = true },
{ '\\\\', ':Neotree reveal<CR>', desc = 'NeoTree reveal', silent = true },
},
opts = {
filesystem = {
window = {
mappings = {
['\\'] = 'close_window',
['\\\\'] = 'close_window',
},
},
},
source_selector = {
winbar = true,
},
},
}