Skip to content

Commit ed56412

Browse files
MountainBeanMountainBean
committed
some config changes
1 parent bd4c717 commit ed56412

File tree

4 files changed

+90
-17
lines changed

4 files changed

+90
-17
lines changed

‎init.lua‎

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,8 @@ end)
120120

121121
-- Enable break indent
122122
vim.opt.breakindent = true
123-
123+
vim.opt.wrap = false
124+
vim.opt.sidescroll = 1
124125
-- Save undo history
125126
vim.opt.undofile = true
126127

@@ -156,6 +157,14 @@ vim.opt.cursorline = true
156157

157158
-- Minimal number of screen lines to keep above and below the cursor.
158159
vim.opt.scrolloff = 10
160+
vim.opt.sidescrolloff = 16
161+
162+
-- personalise default tab width
163+
vim.opt.softtabstop = 4
164+
vim.opt.shiftwidth = 4
165+
166+
-- set column guide
167+
vim.opt.colorcolumn = '80'
159168

160169
-- [[ Basic Keymaps ]]
161170
-- See `:help vim.keymap.set()`
@@ -165,7 +174,8 @@ vim.opt.scrolloff = 10
165174
vim.keymap.set('n', '<Esc>', '<cmd>nohlsearch<CR>')
166175

167176
-- Diagnostic keymaps
168-
vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' })
177+
vim.keymap.set('n', '<leader>eq', vim.diagnostic.setloclist, { desc = 'Expand diagnostic [Q]uickfix list' })
178+
vim.keymap.set('n', '<leader>ef', vim.diagnostic.open_float, { desc = 'Expand diagnostic [F]loat' })
169179

170180
-- Exit terminal mode in the builtin terminal with a shortcut that is a bit easier
171181
-- for people to discover. Otherwise, you normally need to press <C-\><C-n>, which
@@ -325,6 +335,7 @@ require('lazy').setup({
325335
spec = {
326336
{ '<leader>c', group = '[C]ode', mode = { 'n', 'x' } },
327337
{ '<leader>d', group = '[D]ocument' },
338+
{ '<leader>e', group = '[E]xpand diagnostic' },
328339
{ '<leader>r', group = '[R]ename' },
329340
{ '<leader>s', group = '[S]earch' },
330341
{ '<leader>w', group = '[W]orkspace' },
@@ -656,6 +667,9 @@ require('lazy').setup({
656667
local ensure_installed = vim.tbl_keys(servers or {})
657668
vim.list_extend(ensure_installed, {
658669
'stylua', -- Used to format Lua code
670+
'clangd',
671+
'gopls',
672+
'pyright',
659673
})
660674
require('mason-tool-installer').setup { ensure_installed = ensure_installed }
661675

@@ -927,19 +941,19 @@ require('lazy').setup({
927941
-- Here are some example plugins that I've included in the Kickstart repository.
928942
-- Uncomment any of the lines below to enable them (you will need to restart nvim).
929943
--
930-
-- require 'kickstart.plugins.debug',
931-
-- require 'kickstart.plugins.indent_line',
944+
require 'kickstart.plugins.debug',
945+
require 'kickstart.plugins.indent_line',
932946
-- require 'kickstart.plugins.lint',
933947
-- require 'kickstart.plugins.autopairs',
934-
-- require 'kickstart.plugins.neo-tree',
948+
require 'kickstart.plugins.neo-tree',
935949
-- require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps
936950

937951
-- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua`
938952
-- This is the easiest way to modularize your config.
939953
--
940954
-- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going.
941955
-- For additional information, see `:help lazy.nvim-lazy.nvim-structuring-your-plugins`
942-
-- { import = 'custom.plugins' },
956+
{ import = 'custom.plugins' },
943957
}, {
944958
ui = {
945959
-- If you are using a Nerd Font: set icons to an empty table which will use the

‎lazy-lock.json‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
{
2+
"LuaSnip": { "branch": "master", "commit": "e808bee352d1a6fcf902ca1a71cee76e60e24071" },
3+
"catppuccin": { "branch": "main", "commit": "7be452ee067978cdc8b2c5f3411f0c71ffa612b9" },
4+
"cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
5+
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
6+
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
7+
"conform.nvim": { "branch": "master", "commit": "f5bd8419f8a29451e20bdb1061a54fe13d5c8de3" },
8+
"fidget.nvim": { "branch": "main", "commit": "d855eed8a06531a7e8fd0684889b2943f373c469" },
9+
"gitsigns.nvim": { "branch": "main", "commit": "863903631e676b33e8be2acb17512fdc1b80b4fb" },
10+
"indent-blankline.nvim": { "branch": "master", "commit": "e7a4442e055ec953311e77791546238d1eaae507" },
11+
"lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" },
12+
"lazydev.nvim": { "branch": "main", "commit": "491452cf1ca6f029e90ad0d0368848fac717c6d2" },
13+
"luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" },
14+
"mason-lspconfig.nvim": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" },
15+
"mason-nvim-dap.nvim": { "branch": "main", "commit": "8b9363d83b5d779813cdd2819b8308651cec2a09" },
16+
"mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" },
17+
"mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
18+
"mini.nvim": { "branch": "main", "commit": "9618cf56e76cc0caab54ad60116a8d72f99d7b3b" },
19+
"neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" },
20+
"neovim-codicons": { "branch": "main", "commit": "bd52f75ebde79b5dcb62e5f682543b58364997a7" },
21+
"nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" },
22+
"nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" },
23+
"nvim-dap": { "branch": "master", "commit": "7ff6936010b7222fea2caea0f67ed77f1b7c60dd" },
24+
"nvim-dap-go": { "branch": "main", "commit": "6aa88167ea1224bcef578e8c7160fe8afbb44848" },
25+
"nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" },
26+
"nvim-lspconfig": { "branch": "master", "commit": "b55b9659de9ac17e05df4787bb023e4c7ef45329" },
27+
"nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
28+
"nvim-treesitter": { "branch": "master", "commit": "68b2bdd99d889e9705f7e90ae64d990f3ff03cf3" },
29+
"nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" },
30+
"plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
31+
"smear-cursor.nvim": { "branch": "main", "commit": "a5b840881fc132a88facbfbdee0b1b34df61eaed" },
32+
"telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
33+
"telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
34+
"telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
35+
"todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
36+
"vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" },
37+
"which-key.nvim": { "branch": "main", "commit": "8badb359f7ab8711e2575ef75dfe6fbbd87e4821" }
38+
}

‎lua/custom/plugins/init.lua‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,16 @@
22
-- I promise not to create any merge conflicts in this directory :)
33
--
44
-- See the kickstart.nvim README for more information
5-
return {}
5+
return {
6+
-- should show a neat cursor trail when the cursor is moved quickly.
7+
'sphamba/smear-cursor.nvim',
8+
opts = {
9+
-- FIRE MODE --
10+
-- cursor_color = '#ff8800',
11+
-- stiffness = 0.3,
12+
-- trailing_stiffness = 0.1,
13+
-- trailing_exponent = 3,
14+
-- gamma = 1,
15+
-- volume_reduction_exponent = -0.1,
16+
},
17+
}

‎lua/kickstart/plugins/debug.lua‎

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ return {
1313
dependencies = {
1414
-- Creates a beautiful debugger UI
1515
'rcarriga/nvim-dap-ui',
16+
'ChristianChiarulli/neovim-codicons',
1617

1718
-- Required dependency for nvim-dap-ui
1819
'nvim-neotest/nvim-nio',
@@ -64,6 +65,8 @@ return {
6465
ensure_installed = {
6566
-- Update this to ensure that you have the debuggers for the langs you want
6667
'delve',
68+
'codelldb',
69+
'bash-debug-adaptor',
6770
},
6871
}
6972

@@ -73,18 +76,24 @@ return {
7376
-- Set icons to characters that are more likely to work in every terminal.
7477
-- Feel free to remove or use ones that you like more! :)
7578
-- Don't feel like these are good choices.
76-
icons = { expanded = '▾', collapsed = '▸', current_frame = '*' },
79+
icons = {
80+
collapsed = '',
81+
current_frame = '',
82+
expanded = '',
83+
},
7784
controls = {
85+
element = 'repl',
86+
enabled = true,
7887
icons = {
79-
pause = '⏸',
80-
play = '▶',
81-
step_into = '⏎',
82-
step_over = '⏭',
83-
step_out = '⏮',
84-
step_back = 'b',
85-
run_last = '▶▶',
86-
terminate = '⏹',
87-
disconnect = '⏏',
88+
disconnect = '',
89+
pause = '',
90+
play = '',
91+
run_last = '',
92+
step_back = '',
93+
step_into = '',
94+
step_out = '',
95+
step_over = '',
96+
terminate = '',
8897
},
8998
},
9099
}

0 commit comments

Comments
 (0)