Neovim: indent and colors tweaking.

This commit is contained in:
Bartek Stalewski 2023-04-15 12:01:10 +02:00
parent 548ab61ee1
commit 0933c708c2

View File

@ -20,12 +20,12 @@ vim.opt.rtp:prepend(lazypath)
require("lazy").setup({
"bitc/vim-bad-whitespace",
"lewis6991/gitsigns.nvim",
"lukas-reineke/indent-blankline.nvim",
"numToStr/Comment.nvim",
"NvChad/nvim-colorizer.lua",
"nvim-lualine/lualine.nvim",
"nvim-treesitter/nvim-treesitter",
"tanvirtin/monokai.nvim",
"lukas-reineke/indent-blankline.nvim",
{ "nvim-telescope/telescope.nvim",
dependencies = { 'nvim-lua/plenary.nvim' }
},
@ -56,6 +56,7 @@ require("gitsigns").setup({
untracked = { text = "" },
},
})
require("indent_blankline").setup()
require("Comment").setup()
require("colorizer").setup()
require("lualine").setup({
@ -84,7 +85,6 @@ require("nvim-treesitter.configs").setup({
enable = true,
use_languagetree = true,
},
indent = { enable = true },
})
require("nvim-tree").setup({
sort_by = "case_sensitive",
@ -95,23 +95,21 @@ require("nvim-tree").setup({
adaptive_size = true,
},
})
require("indent_blankline").setup({
show_current_context = true,
show_current_context_start = true,
})
-- modify colorcheme
vim.api.nvim_set_hl(0, "Normal", { bg = NONE })
vim.api.nvim_set_hl(0, "NonText", { bg = NONE })
vim.api.nvim_set_hl(0, "BadWhitespace", { bg = "#770000" })
vim.api.nvim_set_hl(0, "ColorColumn", { bg = "#770000" })
vim.api.nvim_set_hl(0, "DiffChange", { bg = NONE, fg = "#e7c547" })
vim.api.nvim_set_hl(0, "DiffText", { bg = NONE, fg = "#ff8700" })
vim.api.nvim_set_hl(0, "LineNr", { bg = NONE, fg = "#465457" })
vim.api.nvim_set_hl(0, "Visual", { bg = "#005577", fg = "#ffffff" })
vim.api.nvim_set_hl(0, "NonText", { bg = NONE })
vim.api.nvim_set_hl(0, "Normal", { bg = NONE })
vim.api.nvim_set_hl(0, "SignColumn", { bg = NONE })
vim.api.nvim_set_hl(0, "SpellBad", { bg = "#770000", fg = "#ffffff" })
vim.api.nvim_set_hl(0, "Visual", { bg = "#005577", fg = "#ffffff" })
-- global options
vim.opt.list = true
vim.opt.cursorline = true
vim.opt.expandtab = true
vim.opt.gdefault = true
@ -138,17 +136,18 @@ vim.opt.softtabstop = 2
vim.g.mapleader = " "
vim.keymap.set("i", "<C-a>", "<esc>I", { silent = true })
vim.keymap.set("i", "<C-e>", "<esc>A", { silent = true })
vim.keymap.set("n", "<esc><cr>", "<esc>:wq!<cr>", { silent = true })
vim.keymap.set("n", "<leader>c", ':execute "set colorcolumn=" . (&colorcolumn == "" ? "80,120" : "")<cr>', { silent = true, desc = "toggle column" })
vim.keymap.set("n", "<leader>ff", require("telescope.builtin").find_files, {})
vim.keymap.set("n", "<leader>fg", require("telescope.builtin").live_grep, {})
vim.keymap.set("n", "<leader>h", ":set hlsearch!<cr>", { silent = true, desc = "toggle hlsearch" })
vim.keymap.set("n", "<leader>j", ":bprevious<cr>", { silent = true, desc = "previous buffer" })
vim.keymap.set("n", "<leader>k", ":bnext<cr>", { silent = true, desc = "next buffer" })
vim.keymap.set("n", "<leader>n", ":set nonumber!<cr>:Gitsigns toggle_signs<cr>", { silent = true, desc = "toggle decorations" })
vim.keymap.set("n", "<leader>s", ":set spell!<cr>", { silent = true, desc = "toggle spell" })
vim.keymap.set("n", "<leader>t", ":NvimTreeToggle<cr>", { silent = true, desc = "toggle tree" })
vim.keymap.set("n", "<leader>x", ":bd<cr>", { silent = true, desc = "close buffer" })
vim.keymap.set("n", "<esc><cr>", "<esc><cmd>wq!<cr>", { silent = true })
vim.keymap.set("n", "<leader>c", '<cmd>execute "set colorcolumn=" . (&colorcolumn == "" ? "80,120" : "")<cr>', { silent = true, desc = "toggle column" })
vim.keymap.set("n", "<leader>ff", require("telescope.builtin").find_files, { desc = "find file" })
vim.keymap.set("n", "<leader>fg", require("telescope.builtin").live_grep, { desc = "find text" })
vim.keymap.set("n", "<leader>fb", require("telescope.builtin").buffers, { desc = "find buffer" })
vim.keymap.set("n", "<leader>h", "<cmd>set hlsearch!<cr>", { silent = true, desc = "toggle hlsearch" })
vim.keymap.set("n", "<leader>j", "<cmd>bprevious<cr>", { silent = true, desc = "previous buffer" })
vim.keymap.set("n", "<leader>k", "<cmd>bnext<cr>", { silent = true, desc = "next buffer" })
vim.keymap.set("n", "<leader>n", "<cmd>set nonumber!<cr><cmd>Gitsigns toggle_signs<cr><cmd>IndentBlanklineToggle<cr>", { silent = true, desc = "toggle decorations" })
vim.keymap.set("n", "<leader>s", "<cmd>set spell!<cr>", { silent = true, desc = "toggle spell" })
vim.keymap.set("n", "<leader>t", "<cmd>NvimTreeToggle<cr>", { silent = true, desc = "toggle tree" })
vim.keymap.set("n", "<leader>x", "<cmd>bd<cr>", { silent = true, desc = "close buffer" })
vim.keymap.set("n", "<tab>", "<C-w>w", { silent = true })
-- autocmd