mirror of
https://github.com/LunarVim/LunarVim.git
synced 2025-08-03 01:25:03 +02:00
fix tab stuff
This commit is contained in:
Chris
parent
3155ea1a74
commit
f5184ed9d0
4 changed files with 68 additions and 95 deletions
|
|
@ -1,2 +1,3 @@
|
|||
setlocal commentstring={/*%s*/}
|
||||
|
||||
set ts=2
|
||||
set sw=2
|
||||
|
|
|
|||
|
|
@ -55,8 +55,8 @@ gls.left[1] = {
|
|||
highlight = {colors.red, colors.bg}
|
||||
}
|
||||
}
|
||||
print(vim.fn.getbufvar(0,'ts'))
|
||||
vim.fn.getbufvar(0,'ts')
|
||||
print(vim.fn.getbufvar(0, 'ts'))
|
||||
vim.fn.getbufvar(0, 'ts')
|
||||
|
||||
gls.left[2] = {
|
||||
GitIcon = {
|
||||
|
|
@ -106,35 +106,13 @@ gls.left[6] = {
|
|||
}
|
||||
|
||||
gls.right[1] = {
|
||||
DiagnosticError = {
|
||||
provider = 'DiagnosticError',
|
||||
icon = ' ',
|
||||
highlight = {colors.error_red, colors.bg}
|
||||
}
|
||||
}
|
||||
gls.right[2] = {
|
||||
DiagnosticWarn = {
|
||||
provider = 'DiagnosticWarn',
|
||||
icon = ' ',
|
||||
highlight = {colors.orange, colors.bg}
|
||||
}
|
||||
DiagnosticError = {provider = 'DiagnosticError', icon = ' ', highlight = {colors.error_red, colors.bg}}
|
||||
}
|
||||
gls.right[2] = {DiagnosticWarn = {provider = 'DiagnosticWarn', icon = ' ', highlight = {colors.orange, colors.bg}}}
|
||||
|
||||
gls.right[3] = {
|
||||
DiagnosticHint = {
|
||||
provider = 'DiagnosticHint',
|
||||
icon = ' ',
|
||||
highlight = {colors.blue, colors.bg}
|
||||
}
|
||||
}
|
||||
gls.right[3] = {DiagnosticHint = {provider = 'DiagnosticHint', icon = ' ', highlight = {colors.blue, colors.bg}}}
|
||||
|
||||
gls.right[4] = {
|
||||
DiagnosticInfo = {
|
||||
provider = 'DiagnosticInfo',
|
||||
icon = ' ',
|
||||
highlight = {colors.blue, colors.bg}
|
||||
}
|
||||
}
|
||||
gls.right[4] = {DiagnosticInfo = {provider = 'DiagnosticInfo', icon = ' ', highlight = {colors.blue, colors.bg}}}
|
||||
|
||||
gls.right[5] = {
|
||||
ShowLspClient = {
|
||||
|
|
@ -170,7 +148,7 @@ gls.right[7] = {
|
|||
gls.right[8] = {
|
||||
Tabstop = {
|
||||
provider = function()
|
||||
return "Spaces: " .. vim.api.nvim_buf_get_option(0, "tabstop") .. " "
|
||||
return "Spaces: " .. vim.api.nvim_buf_get_option(0, "shiftwidth") .. " "
|
||||
end,
|
||||
condition = condition.hide_in_width,
|
||||
separator = ' ',
|
||||
|
|
@ -194,7 +172,7 @@ gls.right[10] = {
|
|||
provider = 'FileEncode',
|
||||
condition = condition.hide_in_width,
|
||||
separator = ' ',
|
||||
separator_highlight = {'NONE',colors.bg},
|
||||
separator_highlight = {'NONE', colors.bg},
|
||||
highlight = {colors.grey, colors.bg}
|
||||
}
|
||||
}
|
||||
|
|
@ -210,7 +188,6 @@ gls.right[11] = {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
gls.short_line_left[1] = {
|
||||
BufferType = {
|
||||
provider = 'FileTypeName',
|
||||
|
|
@ -221,13 +198,7 @@ gls.short_line_left[1] = {
|
|||
}
|
||||
|
||||
gls.short_line_left[2] = {
|
||||
SFileName = {
|
||||
provider = 'SFileName',
|
||||
condition = condition.buffer_not_empty,
|
||||
highlight = {colors.grey, colors.bg}
|
||||
}
|
||||
SFileName = {provider = 'SFileName', condition = condition.buffer_not_empty, highlight = {colors.grey, colors.bg}}
|
||||
}
|
||||
|
||||
gls.short_line_right[1] = {
|
||||
BufferIcon = {provider = 'BufferIcon', highlight = {colors.grey, colors.bg}}
|
||||
}
|
||||
gls.short_line_right[1] = {BufferIcon = {provider = 'BufferIcon', highlight = {colors.grey, colors.bg}}}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
--vim.cmd [[packadd packer.nvim]]
|
||||
|
||||
-- vim.cmd [[packadd packer.nvim]]
|
||||
local execute = vim.api.nvim_command
|
||||
local fn = vim.fn
|
||||
|
||||
|
|
@ -75,6 +74,7 @@ return require('packer').startup(function(use)
|
|||
-- Color
|
||||
use 'christianchiarulli/nvcode-color-schemes.vim'
|
||||
use 'norcalli/nvim-colorizer.lua'
|
||||
use 'sheerun/vim-polyglot'
|
||||
|
||||
-- Git
|
||||
use 'TimUntersberger/neogit'
|
||||
|
|
@ -95,38 +95,37 @@ return require('packer').startup(function(use)
|
|||
-- Registers
|
||||
use 'gennaro-tedesco/nvim-peekup'
|
||||
|
||||
-- General Plugins
|
||||
use 'windwp/nvim-autopairs'
|
||||
use 'kevinhwang91/nvim-bqf'
|
||||
-- Navigation
|
||||
use 'unblevable/quick-scope'
|
||||
use 'airblade/vim-rooter'
|
||||
use 'phaazon/hop.nvim'
|
||||
use 'kevinhwang91/rnvimr'
|
||||
-- use 'mhinz/vim-startify'
|
||||
|
||||
-- General Plugins
|
||||
use 'liuchengxu/vim-which-key'
|
||||
use 'kevinhwang91/nvim-bqf'
|
||||
use 'airblade/vim-rooter'
|
||||
use 'glepnir/dashboard-nvim'
|
||||
use 'metakirby5/codi.vim'
|
||||
use 'psliwka/vim-smoothie'
|
||||
use 'moll/vim-bbye'
|
||||
use {'iamcco/markdown-preview.nvim', run = 'cd app && npm install'}
|
||||
use 'liuchengxu/vim-which-key'
|
||||
use 'voldikss/vim-floaterm'
|
||||
use 'liuchengxu/vista.vim'
|
||||
use 'terrortylor/nvim-comment'
|
||||
use 'bfredl/nvim-miniyank'
|
||||
use 'monaqa/dial.nvim'
|
||||
use 'junegunn/goyo.vim'
|
||||
use 'andymass/vim-matchup'
|
||||
use 'phaazon/hop.nvim'
|
||||
use 'tpope/vim-sleuth'
|
||||
use 'sheerun/vim-polyglot'
|
||||
use 'monaqa/dial.nvim'
|
||||
use 'windwp/nvim-autopairs'
|
||||
use 'blackcauldron7/surround.nvim'
|
||||
|
||||
-- TODO put this back when stable for indent lines
|
||||
-- use { 'lukas-reineke/indent-blankline.nvim', branch = 'lua'}
|
||||
-- vim.g.indent_blankline_space_char = ' '
|
||||
-- vim.g.indent_blankline_buftype_exclude = {'terminal'}
|
||||
-- vim.g.indent_blankline_filetype_exclude = {'help', 'startify'}
|
||||
-- vim.g.indent_blankline_char = '▏'
|
||||
-- vim.g.indent_blankline_use_treesitter=true
|
||||
-- use { 'lukas-reineke/indent-blankline.nvim', branch = 'lua'}
|
||||
-- vim.g.indent_blankline_space_char = ' '
|
||||
-- vim.g.indent_blankline_buftype_exclude = {'terminal'}
|
||||
-- vim.g.indent_blankline_filetype_exclude = {'help', 'startify'}
|
||||
-- vim.g.indent_blankline_char = '▏'
|
||||
-- vim.g.indent_blankline_use_treesitter=true
|
||||
-- use 'AndrewRadev/tagalong.vim'
|
||||
-- use 'alvan/vim-closetag'
|
||||
-- use 'RRethy/vim-illuminate'
|
||||
|
|
@ -137,4 +136,6 @@ return require('packer').startup(function(use)
|
|||
-- vim.fn['firenvim#install'](1)
|
||||
-- end
|
||||
-- }
|
||||
-- use 'tpope/vim-sleuth'
|
||||
-- use 'mhinz/vim-startify'
|
||||
end)
|
||||
|
|
|
|||
|
|
@ -1,29 +1,29 @@
|
|||
vim.cmd('set iskeyword+=-') --treat dash separated words as a word text object"
|
||||
vim.cmd('set shortmess+=c') --Don't pass messages to |ins-completion-menu|.
|
||||
vim.o.hidden=true --Required to keep multiple buffers open multiple buffers
|
||||
vim.wo.wrap=false --Display long lines as just one line
|
||||
vim.cmd('set iskeyword+=-') -- treat dash separated words as a word text object"
|
||||
vim.cmd('set shortmess+=c') -- Don't pass messages to |ins-completion-menu|.
|
||||
vim.o.hidden = true -- Required to keep multiple buffers open multiple buffers
|
||||
vim.wo.wrap = false -- Display long lines as just one line
|
||||
vim.cmd('set whichwrap+=<,>,[,],h,l')
|
||||
vim.o.pumheight=10 --Makes popup menu smaller
|
||||
vim.o.fileencoding="utf-8" --The encoding written to file
|
||||
vim.o.cmdheight=2 --More space for displaying messages
|
||||
vim.o.mouse="a" --Enable your mouse
|
||||
vim.o.splitbelow=true --Horizontal splits will automatically be below
|
||||
vim.o.termguicolors=true
|
||||
vim.o.splitright=true --Vertical splits will automatically be to the right
|
||||
vim.o.t_Co="256" --Support 256 colors
|
||||
vim.o.conceallevel=0 --So that I can see `` in markdown files
|
||||
vim.cmd('set ts=4') --Insert 2 spaces for a tab
|
||||
vim.cmd('set sw=4') --Change the number of space characters inserted for indentation
|
||||
vim.bo.expandtab=true --Converts tabs to spaces
|
||||
vim.bo.smartindent=true --Makes indenting smart
|
||||
vim.o.pumheight = 10 -- Makes popup menu smaller
|
||||
vim.o.fileencoding = "utf-8" -- The encoding written to file
|
||||
vim.o.cmdheight = 2 -- More space for displaying messages
|
||||
vim.o.mouse = "a" -- Enable your mouse
|
||||
vim.o.splitbelow = true -- Horizontal splits will automatically be below
|
||||
vim.o.termguicolors = true
|
||||
vim.o.splitright = true -- Vertical splits will automatically be to the right
|
||||
vim.o.t_Co = "256" -- Support 256 colors
|
||||
vim.o.conceallevel = 0 -- So that I can see `` in markdown files
|
||||
vim.cmd('set ts=4') -- Insert 2 spaces for a tab
|
||||
vim.cmd('set sw=4') -- Change the number of space characters inserted for indentation
|
||||
vim.bo.expandtab = true -- Converts tabs to spaces
|
||||
vim.bo.smartindent = true -- Makes indenting smart
|
||||
vim.wo.number = true
|
||||
vim.wo.cursorline=true --Enable highlighting of the current line
|
||||
vim.o.showtabline=2 --Always show tabs
|
||||
vim.o.showmode=false --We don't need to see things like -- INSERT -- anymore
|
||||
vim.o.backup=false --This is recommended by coc
|
||||
vim.o.writebackup=false --This is recommended by coc
|
||||
vim.wo.signcolumn="yes" --Always show the signcolumn, otherwise it would shift the text each time
|
||||
vim.o.updatetime=300 --Faster completion
|
||||
vim.o.timeoutlen=100 --By default timeoutlen is 1000 ms
|
||||
vim.o.clipboard="unnamedplus" --Copy paste between vim and everything else
|
||||
vim.o.guifont="JetBrainsMono\\ Nerd\\ Font\\ Mono:h18"
|
||||
vim.wo.cursorline = true -- Enable highlighting of the current line
|
||||
vim.o.showtabline = 2 -- Always show tabs
|
||||
vim.o.showmode = false -- We don't need to see things like -- INSERT -- anymore
|
||||
vim.o.backup = false -- This is recommended by coc
|
||||
vim.o.writebackup = false -- This is recommended by coc
|
||||
vim.wo.signcolumn = "yes" -- Always show the signcolumn, otherwise it would shift the text each time
|
||||
vim.o.updatetime = 300 -- Faster completion
|
||||
vim.o.timeoutlen = 100 -- By default timeoutlen is 1000 ms
|
||||
vim.o.clipboard = "unnamedplus" -- Copy paste between vim and everything else
|
||||
vim.o.guifont = "JetBrainsMono\\ Nerd\\ Font\\ Mono:h18"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue