Merge branch 'master' of git.yorune.pl:y0rune/myhome
Signed-off-by: Marcin Woźniak <marcin.wozniak@wundermanthompson.com>
This commit is contained in:
		@@ -49,6 +49,7 @@
 | 
			
		||||
        ".git/",
 | 
			
		||||
        ".hg/"
 | 
			
		||||
      ],
 | 
			
		||||
      "trace.server": "verbose",
 | 
			
		||||
      "initializationOptions": {
 | 
			
		||||
        "cache": {
 | 
			
		||||
          "directory": "/tmp/ccls"
 | 
			
		||||
 
 | 
			
		||||
@@ -92,6 +92,7 @@ call plug#begin('~/.config/nvim/plugged')
 | 
			
		||||
 | 
			
		||||
    " Themes
 | 
			
		||||
    Plug 'gruvbox-community/gruvbox', { 'as': 'gruvbox'}
 | 
			
		||||
    Plug 'Mofiqul/dracula.nvim'
 | 
			
		||||
 | 
			
		||||
    " Fzf plugin
 | 
			
		||||
    Plug 'junegunn/fzf.vim'
 | 
			
		||||
@@ -140,7 +141,8 @@ let g:tex_flavor = "latex"
 | 
			
		||||
" Theme
 | 
			
		||||
""""""""""""""""""""""""""""""""
 | 
			
		||||
"colorscheme gruvbox
 | 
			
		||||
colorscheme default
 | 
			
		||||
" colorscheme default
 | 
			
		||||
 colorscheme dracula
 | 
			
		||||
let g:gruvbox_invert_selection='0'
 | 
			
		||||
let g:gruvbox_contrast_dark = 'hard'
 | 
			
		||||
set background=dark
 | 
			
		||||
@@ -266,8 +268,9 @@ vnoremap <A-j> :m '>+1<CR>gv=gv
 | 
			
		||||
vnoremap <A-k> :m '<-2<CR>gv=gv
 | 
			
		||||
 | 
			
		||||
" Better replace
 | 
			
		||||
nnoremap <leader>s :%s//g<Left><Left>
 | 
			
		||||
vnoremap <leader>s :s//g<Left><Left>
 | 
			
		||||
nnoremap <Leader>s :%s//g<Left><Left>
 | 
			
		||||
vnoremap <Leader>s :s//g<Left><Left>
 | 
			
		||||
>>>>>>> 15f37be93fd5e33bc2274210627d19822ef6ea38
 | 
			
		||||
 | 
			
		||||
" Better adding into begging and ending line
 | 
			
		||||
vnoremap F <C-v>$A
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										1
									
								
								.zshrc
									
									
									
									
									
								
							
							
						
						
									
										1
									
								
								.zshrc
									
									
									
									
									
								
							@@ -107,6 +107,7 @@ alias aria2c="aria2c --seed-time=0 --disable-ipv6 --max-upload-limit=1k"
 | 
			
		||||
alias lg="lazygit"
 | 
			
		||||
alias update-brew="brew upgrade --cask"
 | 
			
		||||
alias cl="cd $HOME/Documents/Collage/Semestr2"
 | 
			
		||||
alias irc="ssh mikrus -t 'screen -r'"
 | 
			
		||||
 | 
			
		||||
# Cleaning-up
 | 
			
		||||
export PATH=$HOME/.local/bin:$PATH
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user