Merge branch 'feature/wip' of github.com:andrejusk/dotfiles into feature/wip

files/.config/fish/fish_plugins

@@ -1,5 +1,4 @@
 jethrokuan/z
-jorgebucaran/fisher
 jorgebucaran/hydro
 jorgebucaran/replay.fish
 joseluisq/gitnow

scripts/install.d/02-fish.sh

@@ -1,6 +1,12 @@
 #!/usr/bin/env bash
 fish --version
 
+current_shell=`readlink -f /proc/$$/exe`
+fish_shell=`which fish`
+if [[ "$current_shell" != "$fish_shell" ]]; then
+    chsh -s "$fish_shell"
+fi
+
 fisher_location="$XDG_CONFIG_HOME/fish/functions/fisher.fish"
 if ! [ -f $fisher_location ]; then
     fish -c "curl -sL https://git.io/fisher | source && fisher install jorgebucaran/fisher"

scripts/install.d/16-vim.sh

@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
 # Install neovim from unstable debian repo
+if ! bin_in_path "nvim"; then
     curl -fsSL "https://ftp-master.debian.org/keys/archive-key-10.asc" | sudo apt-key add -
     echo "deb http://deb.debian.org/debian unstable main" \
         | sudo tee /etc/apt/sources.list.d/unstable.list
@@ -10,6 +11,7 @@ Pin-Priority: 900" \
         | sudo tee /etc/apt/preferences.d/neovim
     update
     install neovim
+fi
 
 mkdir -p "$XDG_DATA_HOME/nvim/backup"
 plug_dir="$XDG_DATA_HOME/nvim/site/autoload"