Merge branch 'master' of git.yorune.pl:y0rune/myhome

Signed-off-by: Marcin Woźniak <marcin.wozniak@wundermanthompson.com>
This commit is contained in:
Marcin Woźniak 2021-12-12 22:04:39 +01:00 committed by Marcin Woźniak
commit 34cedc26e2
3 changed files with 8 additions and 3 deletions

View File

@ -49,6 +49,7 @@
".git/", ".git/",
".hg/" ".hg/"
], ],
"trace.server": "verbose",
"initializationOptions": { "initializationOptions": {
"cache": { "cache": {
"directory": "/tmp/ccls" "directory": "/tmp/ccls"

View File

@ -92,6 +92,7 @@ call plug#begin('~/.config/nvim/plugged')
" Themes " Themes
Plug 'gruvbox-community/gruvbox', { 'as': 'gruvbox'} Plug 'gruvbox-community/gruvbox', { 'as': 'gruvbox'}
Plug 'Mofiqul/dracula.nvim'
" Fzf plugin " Fzf plugin
Plug 'junegunn/fzf.vim' Plug 'junegunn/fzf.vim'
@ -140,7 +141,8 @@ let g:tex_flavor = "latex"
" Theme " Theme
"""""""""""""""""""""""""""""""" """"""""""""""""""""""""""""""""
"colorscheme gruvbox "colorscheme gruvbox
colorscheme default " colorscheme default
colorscheme dracula
let g:gruvbox_invert_selection='0' let g:gruvbox_invert_selection='0'
let g:gruvbox_contrast_dark = 'hard' let g:gruvbox_contrast_dark = 'hard'
set background=dark set background=dark
@ -266,8 +268,9 @@ vnoremap <A-j> :m '>+1<CR>gv=gv
vnoremap <A-k> :m '<-2<CR>gv=gv vnoremap <A-k> :m '<-2<CR>gv=gv
" Better replace " Better replace
nnoremap <leader>s :%s//g<Left><Left> nnoremap <Leader>s :%s//g<Left><Left>
vnoremap <leader>s :s//g<Left><Left> vnoremap <Leader>s :s//g<Left><Left>
>>>>>>> 15f37be93fd5e33bc2274210627d19822ef6ea38
" Better adding into begging and ending line " Better adding into begging and ending line
vnoremap F <C-v>$A vnoremap F <C-v>$A

1
.zshrc
View File

@ -107,6 +107,7 @@ alias aria2c="aria2c --seed-time=0 --disable-ipv6 --max-upload-limit=1k"
alias lg="lazygit" alias lg="lazygit"
alias update-brew="brew upgrade --cask" alias update-brew="brew upgrade --cask"
alias cl="cd $HOME/Documents/Collage/Semestr2" alias cl="cd $HOME/Documents/Collage/Semestr2"
alias irc="ssh mikrus -t 'screen -r'"
# Cleaning-up # Cleaning-up
export PATH=$HOME/.local/bin:$PATH export PATH=$HOME/.local/bin:$PATH