diff --git a/nvim/init.vim b/nvim/init.vim
index 6991942..96f6cc3 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -49,6 +49,11 @@ Plug 'zchee/deoplete-jedi'
 " Autocomplete for Rust
 Plug 'sebastianmarkow/deoplete-rust'
 Plug 'rust-lang/rust.vim'
+" Miscellaneous
+Plug 'tpope/vim-surround'
+Plug 'editorconfig/editorconfig-vim'
+Plug 'tpope/vim-eunuch'
+Plug 'azadkuh/vim-cmus'
 
 " Initialize plugin system
 call plug#end()
@@ -134,12 +139,20 @@ nnoremap <Leader>b :CtrlPBuffer<CR>
 nnoremap <Leader>f :CtrlPMRUFiles<CR>
 " Open NerdTree
 nnoremap <Leader>n :NERDTree<CR>
+
 " Open fuzzy file search
 nnoremap <Leader>t :Files<CR>
+" Use ripgrep to search for content in files
+nnoremap <Leader>/ :Rg<CR>
 
 " For git messenger
 nnoremap <Leader>gm :GitMessenger<CR>
 
+" For CMus control
+nnoremap <Leader>x :CmusPlay<CR>
+nnoremap <Leader>c :CmusPause<CR>
+nnoremap <Leader>v :CmusStop<CR>
+
 " Manage splits
 set splitbelow
 set splitright
@@ -191,8 +204,8 @@ let g:cabal_indent_section = 2
 
 " Use deoplete
 let g:deoplete#enable_at_startup = 1
-let g:deoplete#sources#rust#racer_binary='/home/sanchayan/.cargo/bin/racer'
-let g:deoplete#sources#rust#rust_source_path='/home/sanchayan/GitSources/rust/src'
+let g:deoplete#sources#rust#racer_binary='$HOME/.cargo/bin/racer'
+let g:deoplete#sources#rust#rust_source_path='$HOME/GitSources/rust/src'
 
 let g:airline#extensions#tabline#enabled = 2
 let g:airline#extensions#tabline#fnamemod = ':t'