diff --git a/nvim/lua/color/night.lua b/nvim/lua/color/night.lua index 696d0cb..fe553da 100644 --- a/nvim/lua/color/night.lua +++ b/nvim/lua/color/night.lua @@ -6,19 +6,20 @@ local c = require("color.cons").colors package.hls = { Normal = {fg = "white", bg = "black"}, - TabLine = {fg = "black", bg = "lightgray"}, - TabLineSel = {fg = "white", bg="green", ctermbg = "darkgreen"}, - TabLineFill = {bg = "darkgray"}, + TabLine = {bold = false, fg = "black", bg = "darkgray" }, + TabLineSel = {bold = true, fg = "black", bg="white"}, - LineNr = {fg = "black", bg="lightgray"}, - CursorLineNr = {fg = "white", bg="green", ctermbg="darkgreen"}, + TabLineFill = {bold = false, bg = "gray"}, + + LineNr = {bold = false, fg = "gray"}, + CursorLineNr = {bold = true, fg="white"}, Cursor = {reverse=true}, lCursor = {reverse=true}, CursorLine = {bold = true}, - StatusLine = {fg = "white", bg="green", ctermbg = "darkgreen"}, - StatusLineNC = {fg = "black", bg = "lightgray"}, + StatusLine = {bold = true, fg="black", bg="white"}, + StatusLineNC = {bold= false, fg = "black", bg = "darkgray"}, IncSearch = {fg="black", bg="magenta"}, Search = {fg="black", bg="magenta"}, @@ -36,13 +37,18 @@ package.hls = { Type = {bold = true, fg = "lightgreen"}, Structure = {bold = true, fg = "lightgreen"}, Operator = {bold = true, fg = "lightgreen"}, + Identifier = {bold = true, fg = "yellow"}, - Folded = {fg="black", bg="lightgray"}, - FoldColumn = {fg="black", bg="lightgray"}, + Folded = {fg="gray", bg="none"}, + FoldColumn = {fg="black", bg="gray"}, Ignore = {fg="lightgreen"}, Error = {fg="white", bg="red"}, Underlined = {underline = true}, + + VertSplit = {bold=true, fg="gray"}, + + Visual = {reverse=true}, } return package diff --git a/nvim/lua/indent.lua b/nvim/lua/indent.lua index 21b9998..7583fff 100644 --- a/nvim/lua/indent.lua +++ b/nvim/lua/indent.lua @@ -1,17 +1,29 @@ -- Golang, C based configuration vim.o.autoindent = true -vim.o.expandtab = false -vim.o.tabstop = 4 -vim.o.shiftwidth = 4 +vim.o.foldmethod = 'indent' createAutoCmd = vim.api.nvim_create_autocmd +-- Basic thing for compiling languages. +createAutoCmd({ + "BufNewFile", + "BufRead", +},{ + pattern = "*.go,*.c,*.cc,*.C,*.cpp,*.rs", + callback = function() + local buf = vim.bo[vim.api.nvim_get_current_buf()] + vim.o.expandtab = false + vim.o.tabstop = 4 + vim.o.shiftwidth = 4 + end, +}) + createAutoCmd({ "BufNewFile", "BufRead", },{ - pattern = "*.lua,*.js,*.jsx,*.scss,*.css,*.html,*.tmpl,*.tpl,*.yml,*.yaml,*.toml,*.tml", + pattern = "*.lua,*.js,*.jsx,*.scss,*.css,*.sass,*.html,*.htmlx,*.tmpl,*.tpl,*.yml,*.yaml,*.toml,*.tml", callback = function() local buf = vim.bo[vim.api.nvim_get_current_buf()] buf.expandtab = true @@ -36,3 +48,4 @@ createAutoCmd({ }) + diff --git a/nvim/lua/maps.lua b/nvim/lua/maps.lua index 8a9962a..0f57e44 100644 --- a/nvim/lua/maps.lua +++ b/nvim/lua/maps.lua @@ -32,6 +32,10 @@ local opts = {silent = true} -- Tabs. map('n', '\\tn', ':tabnew\n', opts) +-- Fold + + map('n', 'zO', "zR", opts) + -- Insert -- Literal tabs with Shift-Tab map('i', '', '\t', opts)