Skip to content

Commit 2c58690

Browse files
committed
feat(opt): option for indentation; use native formater from lua_ls
1 parent c287025 commit 2c58690

File tree

3 files changed

+33
-16
lines changed

3 files changed

+33
-16
lines changed

lua/opts.lua

+16-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ opts.initial = function()
1616
opt.relativenumber = true
1717
opt.breakindent = true
1818
opt.linebreak = true
19-
opt.expandtab = true
2019
opt.swapfile = false
2120
opt.undofile = true
2221
opt.cmdheight = 0
@@ -35,12 +34,27 @@ opts.final = function()
3534
opt.splitbelow = true
3635
opt.splitright = true
3736
opt.scrolloff = 2
37+
38+
-- Indenting
39+
opt.shiftwidth = 2
40+
opt.smartindent = true
41+
opt.tabstop = 2
42+
opt.expandtab = true
43+
opt.softtabstop = 2
3844
opt.sidescrolloff = 2
45+
46+
-- Statusline
3947
local statusline_ascii = ""
4048
opt.statusline = "%#Normal#" .. statusline_ascii .. "%="
49+
50+
-- Disable providers
51+
g.loaded_node_provider = 0
52+
g.loaded_python3_provider = 0
53+
g.loaded_perl_provider = 0
54+
g.loaded_ruby_provider = 0
4155
end
4256

43-
--- load shada after ui-enter
57+
--- Load shada after ui-enter
4458
local shada = vim.o.shada
4559
vim.o.shada = ""
4660
vim.api.nvim_create_autocmd("User", {

lua/plugins/init.lua

+13-13
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,22 @@ local plugins = {
2222
name = "mini",
2323
version = false,
2424
keys = {
25-
{ "<leader>e", mode = "n" },
25+
{ "<leader>e", mode = "n" },
2626
{ "<leader>ff", mode = "n" },
27-
{ "<leader>b", mode = "n" },
27+
{ "<leader>b", mode = "n" },
2828
{ "<leader>fr", mode = "n" },
2929
{ "<leader>fw", mode = "n" },
30-
{ "<leader>q", mode = "n" },
30+
{ "<leader>q", mode = "n" },
3131
{ "<leader>ti", mode = "n" },
32-
{ "<C-q>", mode = "n" },
33-
{ "gcc", mode = "n" },
34-
{ "<leader>", mode = "n" },
35-
{ "gc", mode = "n" },
36-
{ "gc", mode = "x" },
37-
{ "H", mode = "x" },
38-
{ "J", mode = "x" },
39-
{ "K", mode = "x" },
40-
{ "L", mode = "x" },
32+
{ "<C-q>", mode = "n" },
33+
{ "gcc", mode = "n" },
34+
{ "<leader>", mode = "n" },
35+
{ "gc", mode = "n" },
36+
{ "gc", mode = "x" },
37+
{ "H", mode = "x" },
38+
{ "J", mode = "x" },
39+
{ "K", mode = "x" },
40+
{ "L", mode = "x" },
4141
},
4242
init = function()
4343
package.preload["nvim-web-devicons"] = function()
@@ -114,7 +114,7 @@ local plugins = {
114114
highlight = {
115115
use_nvim_cmp_as_default = true,
116116
},
117-
nerd_font_variant = "normal",
117+
nerd_font_variant = "mono",
118118
accept = { auto_brackets = { enabled = true } },
119119

120120
-- trigger = { signature_help = { enabled = true } },

lua/plugins/lsp.lua

+4-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,10 @@ lspconfig.lua_ls.setup {
3535
diagnostics = {
3636
globals = { "vim" },
3737
},
38-
-- format = { enable = false },
38+
format = {
39+
defaultConfig = {
40+
},
41+
},
3942
hint = {
4043
enable = true,
4144
},

0 commit comments

Comments
 (0)