From 9124335db4564dae9bbfd717c2d612a7e159fb2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD=20=D0=A1=D0=BE=D0=BB=D0=BD=D1=86?= =?UTF-8?q?=D0=B5=D0=B2?= Date: Mon, 30 Sep 2024 23:51:43 +0300 Subject: [PATCH] Update colorscheme - Include increment search while typing search string; - Append auto groups. --- colors/justmyscheme.vim | 93 +++++++++++++++++++++-------------------- vimrc | 40 ++++++++++++------ 2 files changed, 75 insertions(+), 58 deletions(-) diff --git a/colors/justmyscheme.vim b/colors/justmyscheme.vim index 4f527af..4676aba 100644 --- a/colors/justmyscheme.vim +++ b/colors/justmyscheme.vim @@ -8,80 +8,81 @@ set bg=dark let color_name="justmyscheme" "=== Пользовательские цвета === -hi justmyschemeMainColor cterm=none ctermfg=0 ctermbg=35 -hi justmyschemeSecondColor ctermfg=255 ctermbg=29 +hi justmyschemeMainColor cterm=none ctermfg=0 ctermbg=222 +hi justmyschemeSecondColor ctermfg=0 ctermbg=216 "=== Основного интерфейса интерфейса === -hi Normal ctermbg=none +hi Normal ctermbg=none "Цвета линейки строк (та, что слева номера строк показыват) -hi LineNr cterm=none ctermfg=245 ctermbg=234 -hi CursorLineNr cterm=bold ctermfg=250 ctermbg=237 -hi CursorLine cterm=none ctermbg=234 -hi Folded cterm=none ctermfg=93 ctermbg=none -hi ModeMsg cterm=none ctermfg=0 ctermbg=120 -hi NonText ctermfg=215 -hi Visual ctermbg=59 -hi ColorColumn ctermbg=235 -hi VertSplit cterm=none ctermfg=120 ctermbg=none +hi LineNr cterm=none ctermfg=245 ctermbg=234 +hi CursorLineNr cterm=none ctermfg=137 ctermbg=238 +hi CursorLine cterm=none ctermbg=234 +hi Folded cterm=none ctermfg=93 ctermbg=none +hi ModeMsg cterm=none ctermfg=0 ctermbg=222 +hi NonText ctermfg=215 +hi Visual ctermbg=59 +hi ColorColumn ctermbg=235 +hi VertSplit cterm=none ctermfg=120 ctermbg=none +hi Search ctermbg=222 "=== Строка вкладок === -hi TabLine cterm=none ctermfg=252 ctermbg=235 -hi TabLineSel cterm=none ctermfg=0 ctermbg=35 -hi TabLineFill cterm=none ctermfg=None ctermbg=235 +hi TabLine cterm=none ctermfg=252 ctermbg=234 +hi TabLineSel cterm=none ctermfg=0 ctermbg=222 +hi TabLineFill cterm=none ctermfg=None ctermbg=234 -hi WildMenu cterm=none ctermfg=0 ctermbg=246 +hi WildMenu cterm=none ctermfg=0 ctermbg=246 -hi Pmenu ctermfg=242 ctermbg=233 -hi PmenuSel ctermfg=7 ctermbg=235 +hi Pmenu ctermfg=242 ctermbg=233 +hi PmenuSel ctermfg=7 ctermbg=235 " Статусная строка -hi StatusLine cterm=none ctermfg=246 ctermbg=234 +hi StatusLine cterm=none ctermfg=246 ctermbg=234 hi link StatusLineEditorMode justmyschemeMainColor hi link StatusLineFileType justmyschemeSecondColor -hi StatusLineFileFormat ctermfg=247 ctermbg=235 -hi StatusLineEmpty ctermbg=235 -hi StatusLineReadOnlyFlag ctermfg=247 ctermbg=235 -hi StatusLineEncoding ctermfg=247 ctermbg=235 +hi StatusLineFileFormat ctermfg=247 ctermbg=235 +hi StatusLineEmpty ctermbg=235 +hi StatusLineReadOnlyFlag ctermfg=247 ctermbg=235 +hi StatusLineEncoding ctermfg=247 ctermbg=235 hi link StatusLineRuler justmyschemeSecondColor hi link StatusLineBranchName justmyschemeMainColor "=== Подсвтека синтаксиса === " Заголовки Markdown -hi Title cterm=bold ctermfg=189 +hi Title cterm=bold ctermfg=189 " Комментарии в языках программирования -hi Comment ctermfg=60 +hi Comment ctermfg=243 -hi Constant ctermfg=153 -hi String ctermfg=229 -hi Number ctermfg=50 -hi Boolean ctermfg=215 +hi Constant ctermfg=153 +hi String ctermfg=183 +hi Number ctermfg=107 +hi Boolean ctermfg=215 -hi Identifier cterm=none ctermfg=147 -hi Function ctermfg=153 +hi Identifier cterm=none ctermfg=147 +hi Function ctermfg=153 -hi Statement ctermfg=141 +hi Statement ctermfg=217 -hi PreProc ctermfg=162 -hi Include cterm=bold ctermfg=162 +hi PreProc ctermfg=174 +hi Include cterm=bold ctermfg=156 -hi Type ctermfg=212 +hi Type ctermfg=218 -hi Delimiter ctermfg=189 +hi Delimiter ctermfg=189 -hi Special ctermfg=219 +hi Special ctermfg=219 -hi Todo cterm=bold ctermfg=154 ctermbg=none -hi Error ctermbg=197 +hi Todo cterm=bold ctermfg=226 ctermbg=none +hi Error ctermbg=197 " === Встроенные плагины === " Netrw -hi netrwDir cterm=bold ctermfg=220 -hi netrwLink cterm=bold ctermfg=99 -hi netrwSymLink cterm=bold ctermfg=99 -hi netrwExe cterm=bold ctermfg=2 +hi netrwDir cterm=bold ctermfg=220 +hi netrwLink cterm=bold ctermfg=99 +hi netrwSymLink cterm=bold ctermfg=99 +hi netrwExe cterm=bold ctermfg=2 " Diff -hi diffRemoved ctermbg=1 -hi diffAdded ctermbg=2 -hi diffChanged ctermbg=3 +hi diffRemoved ctermbg=1 +hi diffAdded ctermbg=2 +hi diffChanged ctermbg=3 diff --git a/vimrc b/vimrc index b6d4bb7..3e58468 100644 --- a/vimrc +++ b/vimrc @@ -11,12 +11,18 @@ set tabline=%!justmyrc#TabLine() "Включает колонку нумерации строк set numberwidth=4 +"Показывает относительные значения (от текущей строки) set relativenumber +"Отображает номер у текущей строки в комбинации с относительной позицией +set number set cursorline "Подсветка найденных фраз set hlsearch +"Подсветка фраз при наборе текста для поиска +set incsearch + "Включение подсказок команд set wildmenu "Игнорировать расширения в подсказках @@ -66,7 +72,7 @@ set backspace=indent,eol,start imap jk "Сброс подсветки поиска в нормальном режиме -nmap :set nohlsearch +nmap :noh "Автонастройка для определенных типов файлов augroup GitBranch @@ -77,28 +83,38 @@ augroup END augroup Python autocmd BufEnter *.py compiler pycodestyle + "Кеймапы для запуска Python скриптов + autocmd BufEnter *.py nmap :!python3 % augroup END augroup Markdown autocmd BufEnter *.md set wrap autocmd BufEnter *.md set colorcolumn=80 autocmd BufLeave *.md set colorcolumn=0 + autocmd BufEnter *.md set textwidth=80 + autocmd BufLeave *.md set textwidth=0 augroup END -"Кеймапы для запуска Python скриптов -autocmd BufEnter *.py nmap :!python3 % +augroup Clang + "Кеймап для GCC + autocmd BufEnter *.c nmap :make +augroup END -"Автообнаружение файла nftables -autocmd BufRead,BufNewFile nftables.conf,*.nft,*/etc/nftables/* set filetype=nftables +augroup Nftables + "Автообнаружение файла nftables + autocmd BufRead,BufNewFile nftables.conf,*.nft,*/etc/nftables/* set filetype=nftables +augroup END -"Кеймап для GCC -autocmd BufEnter *.c nmap :make +augroup Bash + "Кеймапы запуска Bash скриптов + autocmd BufEnter *.sh nmap :!bash % +augroup END -"Кеймапы запуска Bash скриптов -autocmd BufEnter *.sh nmap :!bash % - -"Кеймапы обновления темы vim -autocmd BufEnter *.vim nnoremap :source % +augroup Vim + "Кеймапы обновления темы vim + autocmd BufEnter vimrc nnoremap :source % + autocmd BufEnter *.vim nnoremap :source % +augroup END "Установка своей цветовой схемы colorscheme justmyscheme