diff --git a/editor/nvim/config/init.vim b/editor/nvim/config/init.vim
index b0bb1c5..7811482 100644
--- a/editor/nvim/config/init.vim
+++ b/editor/nvim/config/init.vim
@@ -78,6 +78,7 @@ Plug 'michaeljsmith/vim-indent-object' " adds an indentation level text object
 Plug 'wellle/targets.vim' " adds some more handy text objects
 Plug 'ternjs/tern_for_vim', { 'do': 'npm install' }
 Plug 'mikewest/vimroom'
+Plug 'editorconfig/editorconfig-vim' " loads project-specific editor settings
 let g:vimroom_sidebar_height = 0
 
 Plug 'junegunn/fzf', {'dir': '~/.fzf', 'do': './install --all'} " fuzzy file finding
@@ -130,7 +131,7 @@ autocmd BufNewFile,BufReadPost *.txt setl spell textwidth=0 wrapmargin=0
 set tabstop=2
 set shiftwidth=2
 set softtabstop=2
-set noexpandtab
+set expandtab
 set autoindent smartindent
 set list
 set nostartofline
@@ -342,10 +343,18 @@ vmap Q gq
 nmap Q gqap
 
 " launch fzf for the current git repo
-nnoremap <C-P> :GitFiles<CR>
+nnoremap <C-p> :GitFiles<CR>
 
-" super fancy buffer switching
-nnoremap <leader>l :ls<CR>:b<space>
+" launch fzf for files in the current directory
+nnoremap <C-o> :Files<CR>
+
+" launch fzf for files modified or not in git
+nnoremap <C-o> :GFiles?<CR>
+
+" launch fzf for open buffers (files)
+nnoremap <leader>l :Buffers<CR>
+
+" switch to previous buffer
 nnoremap <leader>h :b#<CR>
 
 " use leader j and k to switch buffers as well
diff --git a/env/sh/aliases b/env/sh/aliases
index 36d85dd..25256e0 100644
--- a/env/sh/aliases
+++ b/env/sh/aliases
@@ -40,7 +40,7 @@ alias tmnew="tmux new -s"
 alias tmls="tmux list-sessions"
 alias tmatt="tmux attach -t"
 alias tu="tmux attach -t utils || tmux new -s utils"
-alias tdf="tmux attach -t df || tmux new -s utils -c \"$DOTFILES_PATH\""
+alias tdf="tmux attach -t df || tmux new -s df -c \"$DOTFILES_PATH\""
 
 # git aliases
 alias gs="git status"
diff --git a/os/arch_linux/music.bash b/os/arch_linux/music.bash
index 6b7c8ce..41278bd 100755
--- a/os/arch_linux/music.bash
+++ b/os/arch_linux/music.bash
@@ -5,5 +5,5 @@ source $DIR/variables.bash
 
 pacaur -S \
 	mopidy mopidy-spotify mopidy-gmusic \
-	ncmpcpp mpd \
+	ncmpcpp mpd mpc \
 	--noconfirm --noedit