From ec814f60c55a8d9d4695bdde1240289b2743f01a Mon Sep 17 00:00:00 2001 From: christianchiarulli Date: Sun, 4 Jul 2021 12:43:54 -0400 Subject: move colorscheme setting to settings --- lua/settings.lua | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'lua/settings.lua') diff --git a/lua/settings.lua b/lua/settings.lua index 6c7f7ddf..20708d83 100644 --- a/lua/settings.lua +++ b/lua/settings.lua @@ -1,13 +1,11 @@ --- HELPERS --- - local cmd = vim.cmd local opt = vim.opt --- VIM ONLY COMMANDS --- - cmd('filetype plugin on') -- filetype detection cmd('let &titleold="'..TERMINAL..'"') cmd('set inccommand=split') -- show what you are substituting in real time @@ -17,8 +15,11 @@ if O.transparent_window then cmd('au ColorScheme * hi Normal ctermbg=none guibg=none') end ---- SETTINGS --- +--- COLORSCHEME --- +vim.g.colors_name = O.colorscheme + +--- SETTINGS --- opt.backup = false -- creates a backup file opt.clipboard = "unnamedplus" -- allows neovim to access the system clipboard -- cgit v1.2.3 From 927d5b165e668eb806fe0fa3150c09fc57427120 Mon Sep 17 00:00:00 2001 From: christianchiarulli Date: Sun, 4 Jul 2021 12:44:38 -0400 Subject: remove whitespace --- lua/settings.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lua/settings.lua') diff --git a/lua/settings.lua b/lua/settings.lua index 20708d83..7930f9cd 100644 --- a/lua/settings.lua +++ b/lua/settings.lua @@ -7,7 +7,7 @@ local opt = vim.opt --- VIM ONLY COMMANDS --- cmd('filetype plugin on') -- filetype detection -cmd('let &titleold="'..TERMINAL..'"') +cmd('let &titleold="'..TERMINAL..'"') cmd('set inccommand=split') -- show what you are substituting in real time cmd('set iskeyword+=-') -- treat dash as a separate word cmd('set whichwrap+=<,>,[,],h,l') -- move to next line with theses keys -- cgit v1.2.3 From 9f511bcb594b7e2461c97cb8182603928c773c2f Mon Sep 17 00:00:00 2001 From: Rafael Date: Sun, 4 Jul 2021 22:14:01 -0300 Subject: start formatting rules --- lua/settings.lua | 90 +++++++++++++++++++++++++++----------------------------- 1 file changed, 44 insertions(+), 46 deletions(-) (limited to 'lua/settings.lua') diff --git a/lua/settings.lua b/lua/settings.lua index 7930f9cd..43c1bf77 100644 --- a/lua/settings.lua +++ b/lua/settings.lua @@ -3,17 +3,16 @@ local cmd = vim.cmd local opt = vim.opt - --- VIM ONLY COMMANDS --- -cmd('filetype plugin on') -- filetype detection -cmd('let &titleold="'..TERMINAL..'"') -cmd('set inccommand=split') -- show what you are substituting in real time -cmd('set iskeyword+=-') -- treat dash as a separate word -cmd('set whichwrap+=<,>,[,],h,l') -- move to next line with theses keys +cmd "filetype plugin on" +cmd('let &titleold="' .. TERMINAL .. '"') +cmd "set inccommand=split" +cmd "set iskeyword+=-" +cmd "set whichwrap+=<,>,[,],h,l" if O.transparent_window then - cmd('au ColorScheme * hi Normal ctermbg=none guibg=none') - end + cmd "au ColorScheme * hi Normal ctermbg=none guibg=none" +end --- COLORSCHEME --- @@ -21,41 +20,40 @@ vim.g.colors_name = O.colorscheme --- SETTINGS --- -opt.backup = false -- creates a backup file -opt.clipboard = "unnamedplus" -- allows neovim to access the system clipboard -opt.cmdheight = 2 -- more space in the neovim command line for displaying messages -opt.colorcolumn = "99999" -- fix indentline for now -opt.completeopt = {'menuone', 'noselect'} -opt.conceallevel = 0 -- so that `` is visible in markdown files -opt.fileencoding = "utf-8" -- the encoding written to a file -opt.guifont = "monospace:h17" -- the font used in graphical neovim applications -opt.hidden = O.hidden_files -- required to keep multiple buffers and open multiple buffers -opt.hlsearch = O.hl_search -- highlight all matches on previous search pattern -opt.ignorecase = O.ignore_case -- ignore case in search patterns -opt.mouse = "a" -- allow the mouse to be used in neovim -opt.pumheight = 10 -- pop up menu height -opt.showmode = false -- we don't need to see things like -- INSERT -- anymore -opt.showtabline = 2 -- always show tabs -opt.smartcase = O.smart_case -- smart case -opt.smartindent = true -- make indenting smarter again -opt.splitbelow = true -- force all horizontal splits to go below current window -opt.splitright = true -- force all vertical splits to go to the right of current window -opt.swapfile = false -- creates a swapfile -opt.termguicolors = true -- set term gui colors (most terminals support this) -opt.timeoutlen = O.timeoutlen -- time to wait for a mapped sequence to complete (in milliseconds) -opt.title = true -- set the title of window to the value of the titlestring -opt.titlestring = "%<%F%=%l/%L - nvim" -- what the title of the window will be set to -opt.undodir = CACHE_PATH .. '/undo' -- set an undo directory -opt.undofile = true -- enable persisten undo -opt.updatetime = 300 -- faster completion -opt.writebackup = false -- if a file is being edited by another program (or was written to file while editing with another program), it is not allowed to be edited -opt.expandtab = true -- convert tabs to spaces -opt.shiftwidth = 4 -- the number of spaces inserted for each indentation -opt.shortmess:append("c") -- don't pass messages to |ins-completion-menu| -opt.tabstop = 4 -- insert 4 spaces for a tab -opt.cursorline = O.cursorline -- highlight the current line -opt.number = O.number -- set numbered lines -opt.relativenumber = O.relative_number -- set relative numbered lines -opt.signcolumn = "yes" -- always show the sign column, otherwise it would shift the text each time -opt.wrap = O.wrap_lines -- display lines as one long line - +opt.backup = false -- creates a backup file +opt.clipboard = "unnamedplus" -- allows neovim to access the system clipboard +opt.cmdheight = 2 -- more space in the neovim command line for displaying messages +opt.colorcolumn = "99999" -- fix indentline for now +opt.completeopt = { "menuone", "noselect" } +opt.conceallevel = 0 -- so that `` is visible in markdown files +opt.fileencoding = "utf-8" -- the encoding written to a file +opt.guifont = "monospace:h17" -- the font used in graphical neovim applications +opt.hidden = O.hidden_files -- required to keep multiple buffers and open multiple buffers +opt.hlsearch = O.hl_search -- highlight all matches on previous search pattern +opt.ignorecase = O.ignore_case -- ignore case in search patterns +opt.mouse = "a" -- allow the mouse to be used in neovim +opt.pumheight = 10 -- pop up menu height +opt.showmode = false -- we don't need to see things like -- INSERT -- anymore +opt.showtabline = 2 -- always show tabs +opt.smartcase = O.smart_case -- smart case +opt.smartindent = true -- make indenting smarter again +opt.splitbelow = true -- force all horizontal splits to go below current window +opt.splitright = true -- force all vertical splits to go to the right of current window +opt.swapfile = false -- creates a swapfile +opt.termguicolors = true -- set term gui colors (most terminals support this) +opt.timeoutlen = O.timeoutlen -- time to wait for a mapped sequence to complete (in milliseconds) +opt.title = true -- set the title of window to the value of the titlestring +opt.titlestring = "%<%F%=%l/%L - nvim" -- what the title of the window will be set to +opt.undodir = CACHE_PATH .. "/undo" -- set an undo directory +opt.undofile = true -- enable persisten undo +opt.updatetime = 300 -- faster completion +opt.writebackup = false -- if a file is being edited by another program (or was written to file while editing with another program), it is not allowed to be edited +opt.expandtab = true -- convert tabs to spaces +opt.shiftwidth = 4 -- the number of spaces inserted for each indentation +opt.shortmess:append "c" +opt.tabstop = 4 -- insert 4 spaces for a tab +opt.cursorline = O.cursorline -- highlight the current line +opt.number = O.number -- set numbered lines +opt.relativenumber = O.relative_number -- set relative numbered lines +opt.signcolumn = "yes" -- always show the sign column, otherwise it would shift the text each time +opt.wrap = O.wrap_lines -- display lines as one long line -- cgit v1.2.3 From 246afe05d06fa3d61f46aa40139195c95e7c3da7 Mon Sep 17 00:00:00 2001 From: Pasquale <48988058+Pasqat@users.noreply.github.com> Date: Mon, 5 Jul 2021 18:01:38 +0200 Subject: add SignColumn to transparent window option (#701) --- lua/settings.lua | 1 + 1 file changed, 1 insertion(+) (limited to 'lua/settings.lua') diff --git a/lua/settings.lua b/lua/settings.lua index 43c1bf77..371cdb08 100644 --- a/lua/settings.lua +++ b/lua/settings.lua @@ -12,6 +12,7 @@ cmd "set iskeyword+=-" cmd "set whichwrap+=<,>,[,],h,l" if O.transparent_window then cmd "au ColorScheme * hi Normal ctermbg=none guibg=none" + cmd "au ColorScheme * hi SignColumn ctermbg=none guibg=none" end --- COLORSCHEME --- -- cgit v1.2.3