diff --git a/neovim/kickstart/init.lua b/neovim/kickstart/init.lua index aba2f71..2a96986 100644 --- a/neovim/kickstart/init.lua +++ b/neovim/kickstart/init.lua @@ -168,9 +168,6 @@ require('lazy').setup({ 'catppuccin/nvim', name = 'catppuccin', priority = 1000, - config = function() - vim.cmd.colorscheme 'catppuccin-macchiato' - end, }, { @@ -241,7 +238,7 @@ require('lazy').setup({ -- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going. -- -- For additional information see: https://github.com/folke/lazy.nvim#-structuring-your-plugins - -- { import = 'custom.plugins' }, + { import = 'custom.plugins' }, }, {}) -- [[ Setting options ]] @@ -250,6 +247,10 @@ require('lazy').setup({ -- Set highlight on search vim.o.hlsearch = true +vim.keymap.set("n", "", "nohlsearch") + +-- Set colorcolumn +vim.opt.colorcolumn = "120" -- Make line numbers default vim.wo.number = true @@ -260,7 +261,10 @@ vim.o.mouse = 'a' -- Sync clipboard between OS and Neovim. -- Remove this option if you want your OS clipboard to remain independent. -- See `:help 'clipboard'` -vim.o.clipboard = 'unnamedplus' +-- vim.o.clipboard = 'unnamedplus' +-- +-- leader y and p yanks and pastes from the system clipboards +vim.keymap.set('n', "y", "+y") -- Enable break indent vim.o.breakindent = true @@ -293,9 +297,12 @@ vim.o.tabstop = 4 vim.o.guicursor = "a:block" -- Set transparent background -vim.cmd [[ +--[[ vim.cmd [[ hi Normal guibg=None -]] + hi NvimTreeNormal guibg=None + hi NvimTreeNormalFloat guibg=None + hi NvimTreeNormalNC guibg=None +]]--]] -- [[ Basic Keymaps ]] @@ -623,5 +630,16 @@ cmp.setup { }, } +-- set up catppuccin +require('catppuccin').setup({ + transparent_background = true, + integrations = { + nvimtree = true, + mason = true, + treesitter = true, + }, +}) + +vim.cmd.colorscheme 'catppuccin-macchiato' -- The line beneath this is called `modeline`. See `:help modeline` -- vim: ts=2 sts=2 sw=2 et