summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ftplugin/javascriptreact.vim3
-rw-r--r--lua/nv-galaxyline/init.lua67
-rw-r--r--lua/plugins.lua37
-rw-r--r--lua/settings.lua54
4 files changed, 67 insertions, 94 deletions
diff --git a/ftplugin/javascriptreact.vim b/ftplugin/javascriptreact.vim
index 2171568a..e23b6fb7 100644
--- a/ftplugin/javascriptreact.vim
+++ b/ftplugin/javascriptreact.vim
@@ -1,2 +1,3 @@
setlocal commentstring={/*%s*/}
-
+set ts=2
+set sw=2
diff --git a/lua/nv-galaxyline/init.lua b/lua/nv-galaxyline/init.lua
index fd6ca8c8..b11cb7f4 100644
--- a/lua/nv-galaxyline/init.lua
+++ b/lua/nv-galaxyline/init.lua
@@ -4,7 +4,7 @@ local gl = require('galaxyline')
local colors = {
bg = '#2E2E2E',
yellow = '#DCDCAA',
- dark_yellow = '#D7BA7D',
+ dark_yellow = '#D7BA7D',
cyan = '#4EC9B0',
green = '#608B4E',
light_green = '#B5CEA8',
@@ -15,9 +15,9 @@ local colors = {
grey = '#858585',
blue = '#569CD6',
vivid_blue = '#4FC1FF',
- light_blue = '#9CDCFE',
+ light_blue = '#9CDCFE',
red = '#D16969',
- error_red = '#F44747'
+ error_red = '#F44747'
}
local condition = require('galaxyline.condition')
local gls = gl.section
@@ -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 = ' ',
@@ -190,13 +168,13 @@ gls.right[9] = {
}
gls.right[10] = {
- FileEncode = {
- provider = 'FileEncode',
- condition = condition.hide_in_width,
- separator = ' ',
- separator_highlight = {'NONE',colors.bg},
- highlight = {colors.grey, colors.bg}
- }
+ FileEncode = {
+ provider = 'FileEncode',
+ condition = condition.hide_in_width,
+ separator = ' ',
+ separator_highlight = {'NONE', colors.bg},
+ highlight = {colors.grey, colors.bg}
+ }
}
gls.right[11] = {
@@ -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}}}
diff --git a/lua/plugins.lua b/lua/plugins.lua
index a8c2ea80..1046d0f2 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -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'
+ -- Navigation
+ use 'unblevable/quick-scope'
+ use 'phaazon/hop.nvim'
+ use 'kevinhwang91/rnvimr'
+
-- General Plugins
- use 'windwp/nvim-autopairs'
+ use 'liuchengxu/vim-which-key'
use 'kevinhwang91/nvim-bqf'
- use 'unblevable/quick-scope'
use 'airblade/vim-rooter'
- use 'kevinhwang91/rnvimr'
- -- use 'mhinz/vim-startify'
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
+ -- 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 '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)
diff --git a/lua/settings.lua b/lua/settings.lua
index 5c5945cf..6f696b2f 100644
--- a/lua/settings.lua
+++ b/lua/settings.lua
@@ -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"
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-14 04:48:15 +0000