Update .vimrc and .zshrc

2 files changed, 30 insertions, 36 deletions

diff --git a/.vimrc b/.vimrc
index 08c71b1..16b9df9 100644
--- a/.vimrc
+++ b/.vimrc
@@ -11,18 +11,20 @@ call vundle#begin()
 Plugin 'VundleVim/Vundle.vim'
 
 " Keep Plugin commands between vundle#begin/end.
-" Actual code
+" Coding
 Plugin 'dense-analysis/ale'
 Plugin 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
+Plugin 'nvim-lua/plenary.nvim'
+Plugin 'nvim-telescope/telescope.nvim'
+Plugin 'Shougo/deoplete.nvim'
+" File types
 Plugin 'peterhoeg/vim-qml'
+Plugin 'lervag/vimtex'
 " Utilities
 Plugin 'kyazdani42/nvim-web-devicons'
 Plugin 'kyazdani42/nvim-tree.lua'
-" Plugin 'preservim/nerdtree'
 Plugin 'reedes/vim-pencil'
 Plugin 'thaerkh/vim-workspace'
-Plugin 'nvim-lua/plenary.nvim'
-Plugin 'nvim-telescope/telescope.nvim'
 " Appearance
 Plugin 'vim-airline/vim-airline'
 Plugin 'vim-airline/vim-airline-themes'
@@ -47,6 +49,9 @@ set encoding=utf-8
 set fileformat=unix
 set number
 
+set splitright
+set splitbelow
+
 set foldmethod=indent
 set foldlevel=99
 
@@ -59,6 +64,9 @@ set autoindent
 set background=dark
 let g:airline_theme='onedark'
 
+highlight Pmenu     guibg=#282C34
+highlight PmenuSel  guibg=#61AFEF
+
 inoremap <C-s> <esc>:w<CR>i<right>
 
 nnoremap <leader>n :noh<CR>
@@ -96,3 +104,12 @@ set termguicolors " this variable must be enabled for colors to be applied prope
 
 " a list of groups can be found at `:help nvim_tree_highlight`
 highlight NvimTreeFolderIcon guibg=blue
+
+autocmd BufRead,BufNewFile *.qml setfiletype qml
+
+let g:vimtex_view_general_viewer = 'okular'
+let g:vimtex_view_general_options = '--unique file:@pdf\#src:@line@tex'
+let g:vimtex_compiler_method = 'latexmk'
+
+let g:deoplete#enable_at_startup = 1
+nnoremap <leader>d :call deoplete#toggle()<CR>
diff --git a/.zshrc b/.zshrc
index 28416d3..20565f5 100644
--- a/.zshrc
+++ b/.zshrc
@@ -19,6 +19,10 @@ export GOPROXY=https://proxy.golang.com.cn,direct
 export PATH="$HOME/.local/bin:$PATH"
 
 # utilities
+mc () {
+    mkdir $1 && cd $1
+}
+
 share () {
     src=$1
     if [[ $2 == '' ]]; then
@@ -46,11 +50,11 @@ umnt-cryfs () {
     cryfs-unmount "$HOME/Vaults/$1"
 }
 
-# ibus
-alias ib="ibus-daemon -d"
-export GTK_IM_MODULE=ibus
-export XMODIFIERS=@im=ibus
-export QT_IM_MODULE=ibus
+# make aliases accessible in sudo
+alias sudo="sudo "
+
+alias incognito="unset HISTFILE"
+alias proxy="export SOCKS5_PROXY=localhost:1080; export HTTP_PROXY=localhost:1081; export HTTPS_PROXY=localhost:1081"
 
 # SSH
 alias mrf="mosh root@fkfd.me"
@@ -91,33 +95,6 @@ alias je="journalctl -e"
 alias what-the-fuck-just-happened="journalctl -e -b -1"
 alias accel="killall kglobalaccel5 && kglobalaccel5&"
 
-# VG151
-alias gccf="gcc -O2 -Werror -Wpedantic -Wall -Wextra -Wconversion -Wvla -std=c11"
-gccc () {
-    if [[ $1 == '-j' ]]; then
-        gccf -o $2.out $2.c -D JOJ
-    elif [[ $1 == '-d' ]]; then
-        gccf -o $2.out $2.c -D DEBUG
-    else
-        gccf -o $1.out $1.c
-    fi
-}
-
-alias g++f="g++ -Wall -Wextra -pedantic -Wvla -Werror -Wsign-conversion -std=c++17"
-g+++ () {
-    if [[ $1 == '-j' ]]; then
-        g++f -o ex$2.out ex$2.cpp -D JOJ
-    elif [[ $1 == '-d' ]]; then
-        g++f -o ex$2.out ex$2.cpp -D DEBUG
-    else
-        g++f -o ex$1.out ex$1.cpp
-    fi
-}
-
-extar () {
-    tar cf ex$1.tar ex$1.cpp homework.h
-}
-
 # auto-generated by kdesrc-build initial setup: do not remove!
 # Add the kdesrc-build directory to the path
 # export PATH="$HOME/kde/src/kdesrc-build:$PATH"