diff --git a/init.lua b/init.lua index 7be3c504..f3175f97 100644 --- a/init.lua +++ b/init.lua @@ -768,7 +768,7 @@ require('lazy').setup({ lua = { 'stylua' }, -- Conform can also run multiple formatters sequentially -- python = { 'isort', 'black' }, - -- + json = {}, -- You can use 'stop_after_first' to run the first available formatter from the list javascript = { 'prettierd', 'prettier', stop_after_first = true }, }, @@ -1001,7 +1001,7 @@ require('lazy').setup({ -- This is the easiest way to modularize your config. -- -- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going. - -- { import = 'custom.plugins' }, + { import = 'custom.plugins' }, -- -- For additional information with loading, sourcing and examples see `:help lazy.nvim-🔌-plugin-spec` -- Or use telescope! @@ -1061,5 +1061,7 @@ require('lspconfig').pylsp.setup { }, } +vim.keymap.set('t', '', '', {}) +vim.keymap.set('n', 'xt', ':Telescope colorscheme', {}) -- The line beneath this is called `modeline`. See `:help modeline` -- vim: ts=2 sts=2 sw=2 et diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua index be0eb9d8..cd6ef09a 100644 --- a/lua/custom/plugins/init.lua +++ b/lua/custom/plugins/init.lua @@ -2,4 +2,71 @@ -- I promise not to create any merge conflicts in this directory :) -- -- See the kickstart.nvim README for more information -return {} +return { + { + 'levouh/tint.nvim', + config = function() + -- Override some defaults + require('tint').setup { + tint = -45, -- Darken colors, use a positive value to brighten + saturation = 0.6, -- Saturation to preserve + transforms = require('tint').transforms.SATURATE_TINT, -- Showing default behavior, but value here can be predefined set of transforms + tint_background_colors = true, -- Tint background portions of highlight groups + highlight_ignore_patterns = { 'WinSeparator', 'Status.*' }, -- Highlight group patterns to ignore, see `string.find` + window_ignore_function = function(winid) + local bufid = vim.api.nvim_win_get_buf(winid) + local buftype = vim.api.nvim_buf_get_option(bufid, 'buftype') + local floating = vim.api.nvim_win_get_config(winid).relative ~= '' + + -- Do not tint `terminal` or floating windows, tint everything else + return buftype == floating --"terminal" or + end, + } + end, + }, + { + 'mvllow/modes.nvim', + config = function() + require('modes').setup { + colors = { + copy = '#f5c359', + delete = '#c75c6a', + insert = '#78ccc5', + visual = '#9745be', + default = '#FFFFFF', + normal = 'white', + }, + + -- Set opacity for cursorline and number background + line_opacity = 0.5, + + -- Enable cursor highlights + set_cursor = true, + + -- Enable cursorline initially, and disable cursorline for inactive windows + -- or ignored filetypes + set_cursorline = true, + + -- Enable line number highlights to match cursorline + set_number = true, + + -- Disable modes highlights in specified filetypes + -- Please PR commonly ignored filetypes + ignore_filetypes = { 'NvimTree', 'TelescopePrompt' }, + } + end, + vim.opt.guicursor:append 'n-c:block-Cursor', + }, + { + 'github/copilot.vim', + }, + { + 'akinsho/bufferline.nvim', + version = '*', + dependencies = 'nvim-tree/nvim-web-devicons', + config = function() + vim.opt.termguicolors = true + require('bufferline').setup {} + end, + }, +} -- end of return