diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index d96902f..c77063d 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -6,6 +6,8 @@ vim.g.loaded_netrwPlugin = 1 ---------------------- local set = vim.opt +set.foldmethod = 'marker' + set.wrap = true set.linebreak = true set.breakindent = true @@ -30,15 +32,25 @@ set.tabstop = 4 set.shiftwidth = 4 set.softtabstop = 0 -local group = vim.api.nvim_create_augroup("WrapMarkdown", { clear = true }) +local mdgroup = vim.api.nvim_create_augroup("WrapMarkdown", { clear = true }) vim.api.nvim_create_autocmd("FileType", { pattern = "markdown,txt", callback = function() - vim.opt_local.colorcolumn = "100" - vim.opt_local.textwidth = 100 + vim.opt_local.colorcolumn = "85" + vim.opt_local.textwidth = 85 end, group = WrapMarkdown, }) +vim.api.nvim_create_autocmd("FileType", { + pattern = "latex,tex", + callback = function() + vim.opt_local.shiftwidth = 2 + vim.opt_local.tabstop = 2 + end, +}) +vim.api.nvim_create_autocmd("TextYankPost", { + command = "silent! lua vim.highlight.on_yank()", +}) vim.cmd [[ let g:vim_markdown_folding_disabled=1 diff --git a/.config/nvim/lua/core/mappings.lua b/.config/nvim/lua/core/mappings.lua index bd3b46a..7af80e8 100644 --- a/.config/nvim/lua/core/mappings.lua +++ b/.config/nvim/lua/core/mappings.lua @@ -5,9 +5,10 @@ local map = vim.api.nvim_set_keymap vim.g.mapleader = ' ' map('n', '', '', {}) -map('n', 'n', ':bNext', {}) +map('n', 'n', ':bnext', {}) map('n', 'p', ':bprevious', {}) map('n', 'h', ':nohlsearch', {}) -- nvim-tree mappings map('n', 't', ':NvimTreeToggle', {}) +map('n', 'z', ':ZenMode', {}) diff --git a/.config/nvim/lua/plugins/init.lua b/.config/nvim/lua/plugins/init.lua index dfb8248..b326656 100644 --- a/.config/nvim/lua/plugins/init.lua +++ b/.config/nvim/lua/plugins/init.lua @@ -2,12 +2,15 @@ -- plugins -- ------------- require "paq" { - "savq/paq-nvim"; -- Let Paq manage itself + "savq/paq-nvim"; -- Let Paq manage itself -- general plugins "nvim-lualine/lualine.nvim"; - { 'kyazdani42/nvim-web-devicons', opt=true }; + --{ 'nvim-tree/nvim-web-devicons', opt=true }; + 'nvim-tree/nvim-web-devicons'; 'romgrk/barbar.nvim'; 'ggandor/lightspeed.nvim'; + 'L3MON4D3/LuaSnip'; -- Snippets plugin + 'saadparwaiz1/cmp_luasnip'; -- Snippets source for nvim-cmp -- colorschemes -- 'rebelot/kanagawa.nvim'; @@ -29,10 +32,10 @@ require "paq" { 'lukas-reineke/indent-blankline.nvim'; 'ap/vim-css-color'; - 'L3MON4D3/LuaSnip'; -- Snippets plugin - 'saadparwaiz1/cmp_luasnip'; -- Snippets source for nvim-cmp - + -- writing 'dhruvasagar/vim-table-mode'; + 'folke/zen-mode.nvim'; + 'folke/twilight.nvim'; } -- looks like tablemode for vim-table-mode in markdown @@ -62,7 +65,31 @@ require'nvim-tree'.setup() require'indent_blankline'.setup{ show_current_context = true, } +require'nvim-web-devicons'.setup{ + color_icons = true; + default = true; +} -- setup barbar require'bufferline'.setup{ - icons = false, + icons = true, +} + +require'zen-mode'.setup{ + window = { + width = 85, + }, + plugins = { + options = { + enabled = true, + }, + kitty = { + enabled = true, + font = "+4", + }, + }, +} +require'twilight'.setup{ + dimming = { + alpha = 0.80, + }, } diff --git a/.config/nvim/lua/plugins/nvim-cmp.lua b/.config/nvim/lua/plugins/nvim-cmp.lua index 12eb888..e904b09 100644 --- a/.config/nvim/lua/plugins/nvim-cmp.lua +++ b/.config/nvim/lua/plugins/nvim-cmp.lua @@ -59,7 +59,7 @@ cmp.event:on( -- Add additional capabilities supported by nvim-cmp local capabilities = vim.lsp.protocol.make_client_capabilities() -capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities) +capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities) local lspconfig = require('lspconfig')