Changed colorscheme and added a few shortcuts in nvim

12 files changed, 124 insertions, 112 deletions

diff --git a/kitty/.config/kitty/current-theme.conf b/kitty/.config/kitty/current-theme.conf
index 27e21a0..fd9aa9f 100644
--- a/kitty/.config/kitty/current-theme.conf
+++ b/kitty/.config/kitty/current-theme.conf
@@ -1,61 +1,80 @@
 # vim:ft=kitty
 
-## name: GitHub Dark
-## author: GitHub
-## license: MIT
-
-#: The basic colors
-
-foreground #c9d1d9
-background #0d1117
-selection_foreground #0d1117
-selection_background #58a6ff
-
-
-#: Cursor colors
-
-cursor #58a6ff
-
-
-#: Tab bar colors
-
-tab_bar_background #010409
-active_tab_foreground #c9d1d9
-active_tab_background #0d1117
-inactive_tab_foreground #8b949e
-inactive_tab_background #010409
-
-
-#: The basic 16 colors
-
-#: black
-color0 #484f58
-color8 #6e7681
-
-#: red
-color1 #ff7b72
-color9 #ffa198
-
-#: green
-color2 #3fb950
-color10 #56d364
-
-#: yellow
-color3 #d29922
-color11 #e3b341
-
-#: blue
-color4 #58a6ff
-color12 #79c0ff
-
-#: magenta
-color5 #bc8cff
-color13 #d2a8ff
-
-#: cyan
-color6 #39c5cf
-color14 #56d4dd
-
-#: white
-color7 #b1bac4
-color15 #ffffff
+## name:     Catppuccin-Mocha
+## author:   Pocco81 (https://github.com/Pocco81)
+## license:  MIT
+## upstream: https://github.com/catppuccin/kitty/blob/main/mocha.conf
+## blurb:    Soothing pastel theme for the high-spirited!
+
+
+
+# The basic colors
+foreground              #CDD6F4
+background              #000000
+selection_foreground    #1E1E2E
+selection_background    #F5E0DC
+
+# Cursor colors
+cursor                  #F5E0DC
+cursor_text_color       #1E1E2E
+
+# URL underline color when hovering with mouse
+url_color               #F5E0DC
+
+# Kitty window border colors
+active_border_color     #B4BEFE
+inactive_border_color   #6C7086
+bell_border_color       #F9E2AF
+
+# OS Window titlebar colors
+wayland_titlebar_color system
+macos_titlebar_color system
+
+# Tab bar colors
+active_tab_foreground   #11111B
+active_tab_background   #CBA6F7
+inactive_tab_foreground #CDD6F4
+inactive_tab_background #181825
+tab_bar_background      #11111B
+
+# Colors for marks (marked text in the terminal)
+mark1_foreground #1E1E2E
+mark1_background #B4BEFE
+mark2_foreground #1E1E2E
+mark2_background #CBA6F7
+mark3_foreground #1E1E2E
+mark3_background #74C7EC
+
+# The 16 terminal colors
+
+# black
+color0 #000000
+color8 #1C1C1C
+
+# red
+color1 #F38BA8
+color9 #F38BA8
+
+# green
+color2  #A6E3A1
+color10 #A6E3A1
+
+# yellow
+color3  #F9E2AF
+color11 #F9E2AF
+
+# blue
+color4  #89B4FA
+color12 #89B4FA
+
+# magenta
+color5  #F5C2E7
+color13 #F5C2E7
+
+# cyan
+color6  #94E2D5
+color14 #94E2D5
+
+# white
+color7  #BAC2DE
+color15 #A6ADC8
diff --git a/kitty/.config/kitty/kitty.conf b/kitty/.config/kitty/kitty.conf
index d2b3513..9816ac5 100644
--- a/kitty/.config/kitty/kitty.conf
+++ b/kitty/.config/kitty/kitty.conf
@@ -8,8 +8,9 @@
 
 # font_family   	 Ubuntu Mono
   # font_family   	 JetBrains Mono Nerd Font
-  font_family   	 JetBrains Mono Extra Bold Nerd Font
+  # font_family   	 JetBrains Mono Extra Bold Nerd Font
 # font_family   	 DejaVu Mono
+ font_family   	 comic mono bold
 # font_family   	 source code pro
 # font_family   	 Iosevka Term
 # font_family   	 Fira Sans Bold
@@ -2040,6 +2041,6 @@ map opt+cmd+,    debug_config
 
 
 # BEGIN_KITTY_THEME
-# GitHub Dark
+# Catppuccin-Mocha
 include current-theme.conf
 # END_KITTY_THEME
diff --git a/kitty/.config/kitty/kitty.conf.bak b/kitty/.config/kitty/kitty.conf.bak
index 8f2db85..728d13c 100644
--- a/kitty/.config/kitty/kitty.conf.bak
+++ b/kitty/.config/kitty/kitty.conf.bak
@@ -8,8 +8,9 @@
 
 # font_family   	 Ubuntu Mono
   # font_family   	 JetBrains Mono Nerd Font
-  font_family   	 JetBrains Mono Extra Bold Nerd Font
+  # font_family   	 JetBrains Mono Extra Bold Nerd Font
 # font_family   	 DejaVu Mono
+ font_family   	 comic mono bold
 # font_family   	 source code pro
 # font_family   	 Iosevka Term
 # font_family   	 Fira Sans Bold
@@ -2040,6 +2041,6 @@ map opt+cmd+,    debug_config
 
 
 # BEGIN_KITTY_THEME
-# 3024 Night
+# GitHub Dark
 include current-theme.conf
 # END_KITTY_THEME
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", "<C-k>", "<C-w>k", opts)
 keymap("n", "<C-l>", "<C-w>l", opts)
 
 -- Resize with arrows
-keymap("n", "<C-Up>", ":resize -2<CR>", opts)
-keymap("n", "<C-Down>", ":resize +2<CR>", opts)
-keymap("n", "<C-Left>", ":vertical resize +2<CR>", opts)
-keymap("n", "<C-Right>", ":vertical resize -2<CR>", opts)
+keymap("n", "<C-Up>", ":resize -5<CR>", opts)
+keymap("n", "<C-Down>", ":resize +5<CR>", opts)
+keymap("n", "<C-Left>", ":vertical resize +3<CR>", opts)
+keymap("n", "<C-Right>", ":vertical resize -3<CR>", opts)
 
 -- Navigate buffers
 keymap("n", "<S-l>", ":bnext<CR>", opts)
@@ -66,9 +66,15 @@ keymap("x", "<A-k>", ":move '<-2<CR>gv-gv", opts)
 -- Jumping quickly between two files
 keymap("n", "<leader><leader>", ":bprevious<CR>", opts)
 
+-- Centering after page moves or searching for something
+keymap("n", "<C-d>", "<C-d>zz", opts)
+keymap("n", "<C-u>", "<C-u>zz", opts)
+keymap("n", "n", "nzz", opts)
+
 --CompetiTest
 keymap("n", "<F2>", ":CompetiTestReceive<CR>", opts)
-keymap("n", "<F3>", ":CompetiTestRun<CR>", opts)
+keymap("n", "<F5>", ":CompetiTestAdd<CR>", opts)
+keymap("n", "<F4>", ":CompetiTestRun<CR>", opts)
 
 --sourcing luasnips
 keymap("n", "<leader><leader>s", "<cmd> source ~/.config/nvim/lua/user/luasnip.lua<CR>", 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",
diff --git a/scripts/.scripts/cpp_ps.sh b/scripts/.scripts/cpp_ps.sh
index 1b09fe5..b2c2600 100755
--- a/scripts/.scripts/cpp_ps.sh
+++ b/scripts/.scripts/cpp_ps.sh
@@ -4,8 +4,7 @@ read input
 if [ "$input" = "y" ]; then
   mkdir $1
   cd $1
-  touch main.cpp
-  echo -e "#include<bits/stdc++.h>\n\nusing namespace std;\n\nint main () {\n\tios_base::sync_with_stdio(false);\n\tcin.tie(NULL);\n\tint tt;\n\tcin >> tt;\n\twhile(tt--){\n\n\t}\n}" > main.cpp
+  cp ~/test/cptemplate/main.cpp .
   nvim main.cpp
 fi
 
diff --git a/scripts/.scripts/pscontests.sh b/scripts/.scripts/pscontests.sh
index e65a597..ff4f1e3 100755
--- a/scripts/.scripts/pscontests.sh
+++ b/scripts/.scripts/pscontests.sh
@@ -7,8 +7,5 @@ mkdir ${REPLY}
 cd ${REPLY}
 for p in $PROBLEMS
 do
-  mkdir $p
-  cd $p
-  touch main.cpp
-  echo -e "#include<bits/stdc++.h>\n\nusing namespace std;\n\nint main () {\n\tios_base::sync_with_stdio(false);\n\tcin.tie(NULL);\n\tint tt;\n\tcin >> tt;\n\twhile(tt--){\n\n\t}\n}" > main.cpp
+  echo "y" | ~/.scripts/cpp_ps.sh $p 
 done