Merge branch 'master' of github.com:lytedev/dotfiles

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-u> :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

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"

env/wm/sxhkdrc

@@ -153,8 +153,8 @@ super + shift + t
 	compton-trans -c -o 100
 
 # swap sxhkx config with an alternate file and reload the new one
-super + shift + alt + ctrl + r
-	if [ -e ~/.config/sxhkd/altsxhkdrc ]; then mv ~/.config/sxhkd/sxhkdrc ~/.config/sxhkd/origsxhkdrc && mv ~/.config/sxhkd/altsxhkdrc ~/.config/sxhkd/sxhkdrc && pkill -USR1 -x sxhkd; fi
+# super + shift + alt + ctrl + r
+# if [ -e ~/.config/sxhkd/altsxhkdrc ]; then mv ~/.config/sxhkd/sxhkdrc ~/.config/sxhkd/origsxhkdrc && mv ~/.config/sxhkd/altsxhkdrc ~/.config/sxhkd/sxhkdrc && pkill -USR1 -x sxhkd; fi
 
 # spawn a terminal
 super + Return
@@ -170,7 +170,7 @@ super + space
 
 # lock the desktop
 super + ctrl + shift + l
-	slock
+	$SHELL -c '$DOTFILES_PATH/env/x/screensaver/lock.sh'
 
 # spawn gui file explorer
 super + e

env/x/screensaver/lock.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env sh
+
+source "$DOTFILES_PATH/variables.bash"
+
+scrot "$IMG_PATH/.lock/.lock-bg-img.png"
+convert "$IMG_PATH/.lock/.lock-bg-img.png" -blur 0x12 "$IMG_PATH/.lock/.lock-bg-img_blurred.png"
+rm "$IMG_PATH/.lock/.lock-bg-img.png"
+# xscreensaver-command --lock
+i3lock -i "$IMG_PATH/.lock/.lock-bg-img_blurred.png"

env/x/screensaver/setup.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env sh
+
+source "$DOTFILES_PATH/variables.bash"
+
+mkdir -p "$IMG_PATH/.lock"

os/arch_linux/3-utils.bash

@@ -51,6 +51,7 @@ pacaur -S \
 	qt5-webengine \
 	ruby \
 	xorg-xbacklight \
+  i3lock-blur \
 	--noconfirm --noedit
 
 # sudo ln -s /usr/bin/google-chrome-unstable /usr/bin/chrome

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

variables.bash

@@ -22,6 +22,7 @@ export BLACKLISTED_BAR_MODULES=""
 # than a little bit ashamed
 # TODO: use /tmp ?
 export REPOSITORY_PATH="$NICE_HOME/code/open-source"
+export IMG_PATH="$NICE_HOME/img"
 
 # the width of the border around the bspwm windows
 export BORDER_WIDTH=0