pegasust
/
dotfiles
1
0
Fork 0
Code Issues 6 Pull Requests Projects Releases Wiki Activity

fix: nvim fix :DoubleSpaces

nix-components
pegasust 2022-11-19 15:24:41 +00:00
parent e5379edd80
commit d392b8dbe1
1 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
neovim/init.lua
View File

@ -7,7 +7,7 @@
-- - Harpoon marks: Navigate through main files within each project -- - Harpoon marks: Navigate through main files within each project
-- --
-- REQUIREMENTS: -- REQUIREMENTS:
-- - zk @ https://github.com/mickael-menu/zk -- - zk @ https://github.com/mickael-menu/zk
-- - prettierd @ npm install -g @fsouza/prettierd -- - prettierd @ npm install -g @fsouza/prettierd
-- Basic settings of vim -- Basic settings of vim
@ -174,9 +174,11 @@ vim.api.nvim_create_user_command(
vim.api.nvim_create_user_command( vim.api.nvim_create_user_command(
'DoubleSpaces', 'DoubleSpaces',
function(opts) function(opts)
vim.api.nvim_command("set ts=1 sts=1 noet") -- cannot really do 1-space tab. The minimum is 2-space to begin
-- doubling
vim.api.nvim_command("set ts=2 sts=2 noet")
vim.api.nvim_command("retab!") vim.api.nvim_command("retab!")
vim.api.nvim_command("set ts=2 sts=2 et") vim.api.nvim_command("set ts=4 sts=4 et")
vim.api.nvim_command("retab") vim.api.nvim_command("retab")
vim.api.nvim_command("GuessIndent") vim.api.nvim_command("GuessIndent")
end, end,
@ -290,11 +292,11 @@ require('nvim-treesitter.configs').setup {
incremental_selection = { incremental_selection = {
enable = true, enable = true,
keymaps = { keymaps = {
init_selection = '<c-space>', init_selection = '<C-space>',
node_incremental = '<c-space>', node_incremental = '<C-space>',
node_decremental = '<c-backspace>', node_decremental = '<C-backspace>',
scope_incremental = '<c-S>' pscope_incremental = '<C-S>'
} },
}, },
textobjects = { textobjects = {
select = { select = {
@ -330,6 +332,7 @@ require('guess-indent').setup {
"netrw", "netrw",
"tutor", "tutor",
}, },
buftype_exclude = { -- A list of buffer types for which the auto command gets disabled buftype_exclude = { -- A list of buffer types for which the auto command gets disabled
"help", "help",
"nofile", "nofile",
@ -480,27 +483,27 @@ require('mason-lspconfig').setup_handlers({
} }
end, end,
-- ["rust_analyzer"] = function() -- ["rust_analyzer"] = function()
-- require('lspconfig').rust_analyzer.setup { -- require('lspconfig').rust_analyzer.setup {
-- on_attach = on_attach, -- on_attach = on_attach,
-- capabilities = capabilities, -- capabilities = capabilities,
-- settings = { -- settings = {
-- checkOnSave = { -- checkOnSave = {
-- command = "clippy", -- command = "clippy",
-- } -- }
-- } -- }
-- } -- }
-- end, -- end,
-- ["astro"] = function() -- ["astro"] = function()
-- print('configuring astro') -- print('configuring astro')
-- require('lspconfig').astro.setup { -- require('lspconfig').astro.setup {
-- on_attach = on_attach, -- on_attach = on_attach,
-- capabilities = capabilities, -- capabilities = capabilities,
-- init_options = { -- init_options = {
-- configuration = {}, -- configuration = {},
-- typescript = { -- typescript = {
-- serverPath = data_dir -- serverPath = data_dir
-- } -- }
-- } -- }
-- } -- }
-- end -- end
}) })
@ -787,11 +790,11 @@ cmp.setup {
-- local detail = (entry.completion_item.data or {}).detail -- local detail = (entry.completion_item.data or {}).detail
-- vim_item.kind = "" -- vim_item.kind = ""
-- if detail and detail:find('.*%%.*') then -- if detail and detail:find('.*%%.*') then
-- vim_item.kind = vim_item.kind .. ' ' .. detail -- vim_item.kind = vim_item.kind .. ' ' .. detail
-- end -- end
-- --
-- if (entry.completion_item.data or {}).multiline then -- if (entry.completion_item.data or {}).multiline then
-- vim_item.kind = vim_item.kind .. ' ' .. '[ML]' -- vim_item.kind = vim_item.kind .. ' ' .. '[ML]'
-- end -- end
-- end -- end
local maxwidth = 80 local maxwidth = 80