diff --git a/nix/home-manager/programs/neovim.nix b/nix/home-manager/programs/neovim.nix
index b298be4..1c250ae 100644
--- a/nix/home-manager/programs/neovim.nix
+++ b/nix/home-manager/programs/neovim.nix
@@ -54,6 +54,17 @@ in {
             buildInputs = [ zip vim ];
           };
 
+          vim-yaml = vimUtils.buildVimPlugin {
+            name = "vim-yaml";
+            src = fetchFromGitHub {
+              owner = "stephpy";
+              repo = "vim-yaml";
+              rev = "e97e063b16eba4e593d620676a0a15fa98613979";
+              sha256 = "0vqahbrnr43lxanpziyrmzaqqb3cmyny8ry1xvmy2xyd1larzfrk";
+            };
+          };
+
+
           vim-markdown-toc = vimUtils.buildVimPlugin {
             name = "vim-markdown-toc";
             src = fetchFromGitHub {
@@ -88,6 +99,7 @@ in {
           default = [
             "delimitMate"
             "vim-airline"
+            "vim-airline-themes"
             "ctrlp"
             "vim-css-color"
             "rainbow_parentheses"
@@ -123,6 +135,7 @@ in {
 
             # YAML
             "yaml-folds"
+            "vim-yaml"
 
             # Perl
             # "vim-perl"
diff --git a/nix/home-manager/programs/neovim/vimrc b/nix/home-manager/programs/neovim/vimrc
index f1742e2..f928efa 100644
--- a/nix/home-manager/programs/neovim/vimrc
+++ b/nix/home-manager/programs/neovim/vimrc
@@ -53,14 +53,18 @@ let g:ctrlp_custom_ignore = {
 "let g:ctrlp_match_func = { 'match': 'pymatcher#PyMatch' }
 "let g:pydiction_location = '~/.vim/bundle/pydiction/complete-dict'
 
-" allways show status line
+" always show status line
 set ls=2
+" let g:airline#extensions#tabline#formatter = 'default'
+" let g:airline#extensions#tabline#enabled=1
+let g:airline_theme='papercolor'
 set tabstop=4
 set shiftwidth=4
 set softtabstop=4
 set expandtab
 "set textwidth=80
 
+
 set backspace=indent,eol,start
 
 set wildignore+=*/site/*,*.so,*.swp,*.zip
@@ -124,7 +128,7 @@ augroup END
 " YAML {{{
 augroup ft_yaml
 au!
-setlocal autoindent sw=2 et tabstop=2 shiftwidth=2 softtabstop=2
+setlocal tabstop=2 shiftwidth=2 softtabstop=2 expandtab
 augroup END
 " }}}
 
diff --git a/nix/os/devices/default.nix b/nix/os/devices/default.nix
index 5b58d94..3697a45 100644
--- a/nix/os/devices/default.nix
+++ b/nix/os/devices/default.nix
@@ -23,12 +23,13 @@ let
     else
       ""
       }
-    nixos-rebuild -I nixos-config=''${NIXOS_CONFIG} ${rebuildarg} ${moreargs}
+    nixos-rebuild --show-trace -I nixos-config=''${NIXOS_CONFIG} ${rebuildarg} ${moreargs}
     if test -L result; then
       rm result
     fi
   '';
 
+
 in {
   recipes = {
     inherit rebuild;