Skip to content

Commit fc9f294

Browse files
committed
froked here!
1 parent 3338d39 commit fc9f294

File tree

4 files changed

+63
-21
lines changed

4 files changed

+63
-21
lines changed

init.lua

Lines changed: 32 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,12 @@ P.S. You can delete this when you're done too. It's your config now! :)
8787
-- Set <space> as the leader key
8888
-- See `:help mapleader`
8989
-- NOTE: Must happen before plugins are loaded (otherwise wrong leader will be used)
90+
-- I have modified this line to set local leader to ';'
9091
vim.g.mapleader = ' '
91-
vim.g.maplocalleader = ' '
92+
vim.g.maplocalleader = ';'
9293

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

9697
-- [[ Setting options ]]
9798
-- See `:help vim.o`
@@ -152,6 +153,9 @@ vim.o.splitbelow = true
152153
vim.o.list = true
153154
vim.opt.listchars = { tab = '» ', trail = '·', nbsp = '' }
154155

156+
-- NOTE: Im requiring termgui here for bufferline
157+
vim.opt.termguicolors = true
158+
155159
-- Preview substitutions live, as you type!
156160
vim.o.inccommand = 'split'
157161

@@ -247,8 +251,11 @@ rtp:prepend(lazypath)
247251
-- NOTE: Here is where you install your plugins.
248252
require('lazy').setup({
249253
-- NOTE: Plugins can be added with a link (or for a github repo: 'owner/repo' link).
250-
'NMAC427/guess-indent.nvim', -- Detect tabstop and shiftwidth automatically
251-
254+
{
255+
'NMAC427/guess-indent.nvim', -- Detect tabstop and shiftwidth automatically
256+
lazy = false,
257+
opts = {},
258+
},
252259
-- NOTE: Plugins can also be added by using a table,
253260
-- with the first argument being the link and the following
254261
-- keys can be used to configure plugin behavior/loading/etc.
@@ -673,8 +680,9 @@ require('lazy').setup({
673680
local servers = {
674681
-- clangd = {},
675682
-- gopls = {},
676-
-- pyright = {},
677-
-- rust_analyzer = {},
683+
pyright = {},
684+
rust_analyzer = {},
685+
hls = {},
678686
-- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs
679687
--
680688
-- Some languages (like typescript) have entire language plugins that can be useful:
@@ -770,7 +778,10 @@ require('lazy').setup({
770778
lua = { 'stylua' },
771779
-- Conform can also run multiple formatters sequentially
772780
-- python = { "isort", "black" },
773-
--
781+
go = { '$(go env GOPATH)/bin/goimports', 'gofmt' },
782+
783+
c = { 'astyle' },
784+
rust = { 'rustfmt' },
774785
-- You can use 'stop_after_first' to run the first available formatter from the list
775786
-- javascript = { "prettierd", "prettier", stop_after_first = true },
776787
},
@@ -844,13 +855,13 @@ require('lazy').setup({
844855
appearance = {
845856
-- 'mono' (default) for 'Nerd Font Mono' or 'normal' for 'Nerd Font'
846857
-- Adjusts spacing to ensure icons are aligned
847-
nerd_font_variant = 'mono',
858+
nerd_font_variant = 'normal',
848859
},
849860

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

856867
sources = {
@@ -869,7 +880,7 @@ require('lazy').setup({
869880
-- the rust implementation via `'prefer_rust_with_warning'`
870881
--
871882
-- See :h blink-cmp-config-fuzzy for more information
872-
fuzzy = { implementation = 'lua' },
883+
fuzzy = { implementation = 'prefer_rust_with_warning' },
873884

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

912+
-- NOTE: I turned signs on, and that conflicts with the edit ligns
913+
-- But these are always comments so I don't really care
914+
901915
-- Highlight todo, notes, etc in comments
902-
{ 'folke/todo-comments.nvim', event = 'VimEnter', dependencies = { 'nvim-lua/plenary.nvim' }, opts = { signs = false } },
916+
{ 'folke/todo-comments.nvim', event = 'VimEnter', dependencies = { 'nvim-lua/plenary.nvim' }, opts = { signs = true } },
903917

904918
{ -- Collection of various small independent plugins/modules
905919
'echasnovski/mini.nvim',
@@ -973,18 +987,18 @@ require('lazy').setup({
973987
-- Here are some example plugins that I've included in the Kickstart repository.
974988
-- Uncomment any of the lines below to enable them (you will need to restart nvim).
975989
--
976-
-- require 'kickstart.plugins.debug',
977-
-- require 'kickstart.plugins.indent_line',
978-
-- require 'kickstart.plugins.lint',
979-
-- require 'kickstart.plugins.autopairs',
980-
-- require 'kickstart.plugins.neo-tree',
981-
-- require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps
990+
require 'kickstart.plugins.debug',
991+
require 'kickstart.plugins.indent_line',
992+
require 'kickstart.plugins.lint',
993+
require 'kickstart.plugins.autopairs',
994+
require 'kickstart.plugins.neo-tree',
995+
require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps
982996

983997
-- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua`
984998
-- This is the easiest way to modularize your config.
985999
--
9861000
-- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going.
987-
-- { import = 'custom.plugins' },
1001+
{ import = 'custom.plugins' },
9881002
--
9891003
-- For additional information with loading, sourcing and examples see `:help lazy.nvim-🔌-plugin-spec`
9901004
-- Or use telescope!

lua/custom/plugins/lean.lua

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
return {
2+
'Julian/lean.nvim',
3+
event = { 'BufReadPre *.lean', 'BufNewFile *.lean' },
4+
5+
dependencies = {
6+
'nvim-lua/plenary.nvim',
7+
'Saghen/blink.cmp',
8+
'nvim-telescope/telescope.nvim',
9+
},
10+
11+
---@type Lean.Config
12+
opts = {
13+
mappings = true,
14+
},
15+
}

lua/kickstart/plugins/debug.lua

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,17 @@ return {
8888

8989
-- You can provide additional configuration to the handlers,
9090
-- see mason-nvim-dap README for more information
91-
handlers = {},
91+
handlers = {
92+
-- defaults
93+
function(config)
94+
require('mason-nvim-dap').default_setup(config)
95+
end,
96+
97+
-- cppdbg = function(config)
98+
99+
-- require('mason-nvim-dap').default_setup(config)
100+
-- end,
101+
},
92102

93103
-- You'll need to check that you have the required things installed
94104
-- online, please don't ask me how to install them :)

lua/kickstart/plugins/neo-tree.lua

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,18 @@ return {
1111
},
1212
lazy = false,
1313
keys = {
14-
{ '\\', ':Neotree reveal<CR>', desc = 'NeoTree reveal', silent = true },
14+
{ '\\\\', ':Neotree reveal<CR>', desc = 'NeoTree reveal', silent = true },
1515
},
1616
opts = {
1717
filesystem = {
1818
window = {
1919
mappings = {
20-
['\\'] = 'close_window',
20+
['\\\\'] = 'close_window',
2121
},
2222
},
2323
},
24+
source_selector = {
25+
winbar = true,
26+
},
2427
},
2528
}

0 commit comments

Comments
 (0)