From a8d56b91efaebf9a8501f99bf45a3047c4dd72b7 Mon Sep 17 00:00:00 2001 From: omagdy7 Date: Mon, 14 Nov 2022 13:22:25 +0200 Subject: Changed colorscheme and added a few shortcuts in nvim --- nvim/.config/nvim/init.lua | 43 +++++++++------------------- nvim/.config/nvim/lua/user/colorscheme.lua | 2 +- nvim/.config/nvim/lua/user/keymaps.lua | 16 +++++++---- nvim/.config/nvim/lua/user/lualine.lua | 10 +++---- nvim/.config/nvim/lua/user/options.lua | 4 +-- nvim/.config/nvim/lua/user/plugins.lua | 1 + nvim/.config/nvim/plugin/packer_compiled.lua | 5 ++++ 7 files changed, 38 insertions(+), 43 deletions(-) (limited to 'nvim') diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua index cd7e329..3d15c1d 100644 --- a/nvim/.config/nvim/init.lua +++ b/nvim/.config/nvim/init.lua @@ -1,9 +1,9 @@ ---[[ vim.g.material_style = "palenight" ]] +--[[ vim.g.material_style = "deep ocean" ]] -require('onedark').setup { - style = 'deep', - transparent = true, -} +--[[ require('onedark').setup { ]] +--[[ style = 'deep', ]] +--[[ transparent = true, ]] +--[[ } ]] require('material').setup{ disable = { @@ -11,9 +11,13 @@ require('material').setup{ } } -require("nvim-treesitter.configs").setup { - yati = { enable = true }, -} +require('catppuccin').setup({ + transparent_background = true, +}) + +--[[ require("nvim-treesitter.configs").setup { ]] +--[[ yati = { enable = true }, ]] +--[[ } ]] require "user.options" @@ -23,7 +27,6 @@ require "user.colorscheme" require "user.cmp" require "user.lsp" require "user.snippets" ---[[ require "user.luasnip" ]] require "user.telescope" require "user.treesitter" require "user.autopairs" @@ -39,24 +42,4 @@ require "user.indentline" require "user.alpha" require "user.whichkey" require "user.autocommands" ---require "material" - - - - - - - - - - - - - - - - - - - - +require "material" diff --git a/nvim/.config/nvim/lua/user/colorscheme.lua b/nvim/.config/nvim/lua/user/colorscheme.lua index 37ab651..f8c4659 100644 --- a/nvim/.config/nvim/lua/user/colorscheme.lua +++ b/nvim/.config/nvim/lua/user/colorscheme.lua @@ -1,6 +1,6 @@ vim.cmd [[ try - colorscheme onedark + colorscheme catppuccin-mocha catch /^Vim\%((\a\+)\)\=:E185/ colorscheme default set background=background diff --git a/nvim/.config/nvim/lua/user/keymaps.lua b/nvim/.config/nvim/lua/user/keymaps.lua index 7e25c15..07e8a49 100644 --- a/nvim/.config/nvim/lua/user/keymaps.lua +++ b/nvim/.config/nvim/lua/user/keymaps.lua @@ -27,10 +27,10 @@ keymap("n", "", "k", opts) keymap("n", "", "l", opts) -- Resize with arrows -keymap("n", "", ":resize -2", opts) -keymap("n", "", ":resize +2", opts) -keymap("n", "", ":vertical resize +2", opts) -keymap("n", "", ":vertical resize -2", opts) +keymap("n", "", ":resize -5", opts) +keymap("n", "", ":resize +5", opts) +keymap("n", "", ":vertical resize +3", opts) +keymap("n", "", ":vertical resize -3", opts) -- Navigate buffers keymap("n", "", ":bnext", opts) @@ -66,9 +66,15 @@ keymap("x", "", ":move '<-2gv-gv", opts) -- Jumping quickly between two files keymap("n", "", ":bprevious", opts) +-- Centering after page moves or searching for something +keymap("n", "", "zz", opts) +keymap("n", "", "zz", opts) +keymap("n", "n", "nzz", opts) + --CompetiTest keymap("n", "", ":CompetiTestReceive", opts) -keymap("n", "", ":CompetiTestRun", opts) +keymap("n", "", ":CompetiTestAdd", opts) +keymap("n", "", ":CompetiTestRun", opts) --sourcing luasnips keymap("n", "s", " source ~/.config/nvim/lua/user/luasnip.lua", opts) diff --git a/nvim/.config/nvim/lua/user/lualine.lua b/nvim/.config/nvim/lua/user/lualine.lua index f02717e..65523af 100644 --- a/nvim/.config/nvim/lua/user/lualine.lua +++ b/nvim/.config/nvim/lua/user/lualine.lua @@ -101,15 +101,15 @@ local colors = { black = '#000000', white = '#ffffff', red = '#B22222', - violet = '#c95d05', - grey = '#101010', + violet = '#DA5A77', + grey = '#181818', } local bubbles_theme = { normal = { a = { fg = colors.black, bg = colors.violet }, b = { fg = colors.white, bg = colors.grey }, - c = { fg = colors.grey, bg = colors.grey }, + c = { fg = colors.white, bg = colors.grey }, }, insert = { a = { fg = colors.black, bg = colors.blue } }, @@ -131,7 +131,7 @@ require('lualine').setup { }, sections = { lualine_a = { - { 'mode', separator = { left = '' }, right_padding = 2 }, + { 'mode', separator = { left = '' }, right_padding = 4 }, }, lualine_b = { 'filename', 'branch' }, lualine_c = { 'fileformat' }, @@ -139,7 +139,7 @@ require('lualine').setup { lualine_x = {}, lualine_y = { 'filetype', 'progress' }, lualine_z = { - { 'location', separator = { right = '' }, left_padding = 2 }, + { 'location', separator = { right = '' }, left_padding = 4 }, }, }, inactive_sections = { diff --git a/nvim/.config/nvim/lua/user/options.lua b/nvim/.config/nvim/lua/user/options.lua index bf3af7b..cc4fa09 100644 --- a/nvim/.config/nvim/lua/user/options.lua +++ b/nvim/.config/nvim/lua/user/options.lua @@ -29,10 +29,10 @@ local options = { relativenumber = true, -- set relative numbered lines numberwidth = 4, -- set number column width to 2 {default 4} signcolumn = "yes", -- always show the sign column, otherwise it would shift the text each time - wrap = true, -- display lines as one long line + wrap = false, -- display lines as one long line scrolloff = 8, -- is one of my fav sidescrolloff = 8, - guifont = "JetBrainsMonoExtraBold Nerd Font:h10", -- the font used in graphical neovim applications + guifont = "comic mono:h15", -- the font used in graphical neovim applications } vim.opt.shortmess:append "c" diff --git a/nvim/.config/nvim/lua/user/plugins.lua b/nvim/.config/nvim/lua/user/plugins.lua index a147567..2924fe6 100644 --- a/nvim/.config/nvim/lua/user/plugins.lua +++ b/nvim/.config/nvim/lua/user/plugins.lua @@ -86,6 +86,7 @@ return packer.startup(function(use) use 'kyazdani42/nvim-palenight.lua' use 'navarasu/onedark.nvim' use 'ellisonleao/gruvbox.nvim' + use { "catppuccin/nvim", as = "catppuccin" } -- cmp plugins use "hrsh7th/nvim-cmp" -- The completion plugin diff --git a/nvim/.config/nvim/plugin/packer_compiled.lua b/nvim/.config/nvim/plugin/packer_compiled.lua index beda03e..5efe217 100644 --- a/nvim/.config/nvim/plugin/packer_compiled.lua +++ b/nvim/.config/nvim/plugin/packer_compiled.lua @@ -99,6 +99,11 @@ _G.packer_plugins = { path = "/home/pengu/.local/share/nvim/site/pack/packer/start/bufferline.nvim", url = "https://github.com/akinsho/bufferline.nvim" }, + catppuccin = { + loaded = true, + path = "/home/pengu/.local/share/nvim/site/pack/packer/start/catppuccin", + url = "https://github.com/catppuccin/nvim" + }, ["cmp-buffer"] = { loaded = true, path = "/home/pengu/.local/share/nvim/site/pack/packer/start/cmp-buffer", -- cgit v1.2.3