ftpd/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Neovim - general cleaning.

Browse source
This commit is contained in:
Bartek Stalewski 2023-04-15 00:12:40 +02:00
parent 2034664d74
commit 698b10980c
1 changed files with 23 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

43
nvim/init.lua
View file

@ -13,7 +13,7 @@ end
vim.opt.rtp:prepend(lazypath) vim.opt.rtp:prepend(lazypath)
-- define plugins -- define plugins
require("lazy").setup { require("lazy").setup({
"bitc/vim-bad-whitespace", "bitc/vim-bad-whitespace",
"lewis6991/gitsigns.nvim", "lewis6991/gitsigns.nvim",
"numToStr/Comment.nvim", "numToStr/Comment.nvim",
@ -24,12 +24,12 @@ require("lazy").setup {
{ "nvim-telescope/telescope.nvim", { "nvim-telescope/telescope.nvim",
dependencies = { 'nvim-lua/plenary.nvim' } dependencies = { 'nvim-lua/plenary.nvim' }
} }
} })
require("monokai").setup{} -- start & setup plugins
require("Comment").setup{} -- colorscheme has to be first
require("colorizer").setup{} require("monokai").setup()
require("gitsigns").setup { require("gitsigns").setup({
signs = { signs = {
add = { text = "▎" }, add = { text = "▎" },
change = { text = "▎" }, change = { text = "▎" },
@ -38,8 +38,10 @@ require("gitsigns").setup {
changedelete = { text = "▎" }, changedelete = { text = "▎" },
untracked = { text = "▎" }, untracked = { text = "▎" },
}, },
} })
require("lualine").setup { require("Comment").setup()
require("colorizer").setup()
require("lualine").setup({
options = { options = {
component_separators = '', component_separators = '',
icons_enabled = false, icons_enabled = false,
@ -54,12 +56,12 @@ require("lualine").setup {
lualine_y = { "progress" }, lualine_y = { "progress" },
lualine_z = { "location" }, lualine_z = { "location" },
}, },
} })
require("nvim-treesitter.configs").setup { require("nvim-treesitter.configs").setup({
build = ":TSUpdate", build = ":TSUpdate",
ensure_installed = { "bash", "python", "terraform", "vim", "yaml" }, ensure_installed = { "bash", "python", "terraform", "vim", "yaml" },
highlight = { enable = true }, highlight = { enable = true },
} })
-- modify colorcheme -- modify colorcheme
vim.api.nvim_set_hl(0, "Normal", { bg = NONE }) vim.api.nvim_set_hl(0, "Normal", { bg = NONE })
@ -97,16 +99,17 @@ vim.opt.softtabstop = 2
-- configure mappings -- configure mappings
vim.g.mapleader = " " vim.g.mapleader = " "
vim.keymap.set('n', "<esc><cr>", "<esc>:wq!<cr>", { silent = true }) vim.keymap.set("i", "<C-a>", "<esc>I", { silent = true })
vim.keymap.set('n', "<leader>c", ":execute 'set colorcolumn=' . (&colorcolumn == '' ? '80,120' : '')<cr>", { silent = true }) vim.keymap.set("i", "<C-e>", "<esc>A", { silent = true })
vim.keymap.set('n', "<leader>n", ":set nonumber!<cr>:Gitsigns toggle_signs<cr>", { silent = true }) vim.keymap.set("n", "<esc><cr>", "<esc>:wq!<cr>", { silent = true })
vim.keymap.set('n', "<leader>s", ":set spell!<cr>", { silent = true }) vim.keymap.set("n", "<leader>c", ':execute "set colorcolumn=" . (&colorcolumn == "" ? "80,120" : "")<cr>', { silent = true })
vim.keymap.set('n', "<tab>", "<C-w>w", { silent = true }) vim.keymap.set("n", "<leader>ff", require("telescope.builtin").find_files, {})
vim.keymap.set('i', "<C-a>", "<esc>I", { silent = true }) vim.keymap.set("n", "<leader>fg", require("telescope.builtin").live_grep, {})
vim.keymap.set('i', "<C-e>", "<esc>A", { silent = true }) vim.keymap.set("n", "<leader>n", ":set nonumber!<cr>:Gitsigns toggle_signs<cr>", { silent = true })
vim.keymap.set('n', '<leader>ff', require("telescope.builtin").find_files, {}) vim.keymap.set("n", "<leader>s", ":set spell!<cr>", { silent = true })
vim.keymap.set('n', '<leader>fg', require("telescope.builtin").live_grep, {}) vim.keymap.set("n", "<tab>", "<C-w>w", { silent = true })
-- autocmd
vim.api.nvim_create_autocmd({"BufEnter", "BufWinEnter"}, { vim.api.nvim_create_autocmd({"BufEnter", "BufWinEnter"}, {
pattern = {"*.gotmpl"}, pattern = {"*.gotmpl"},
callback = function() vim.bo.filetype = "yaml" end, callback = function() vim.bo.filetype = "yaml" end,