From 36d138771b21d8001d2a55d296934a48e291160b Mon Sep 17 00:00:00 2001
From: Wang Shidong <wsdjeg@outlook.com>
Date: Sun, 3 Jun 2018 20:14:17 +0800
Subject: [PATCH] Glyph free theme (#1784)

* Add Glyph-free theme
---
 autoload/SpaceVim/layers/core/statusline.vim |  8 ++++++--
 config/plugins/vim-startify.vim              | 19 ++++++++++++-------
 mode/basic.toml                              |  9 +++++----
 mode/dark_powered.toml                       |  4 ++--
 4 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/autoload/SpaceVim/layers/core/statusline.vim b/autoload/SpaceVim/layers/core/statusline.vim
index ce2bc32a5..e7ef794f6 100644
--- a/autoload/SpaceVim/layers/core/statusline.vim
+++ b/autoload/SpaceVim/layers/core/statusline.vim
@@ -139,9 +139,13 @@ function! s:major_mode() abort
 endfunction
 
 function! s:modes() abort
-  let m = ' ❖ '
+  if g:spacevim_statusline_unicode_symbols
+    let m = ' ❖ '
+  else
+    let m = ' # '
+  endif
   for mode in s:loaded_modes
-    if g:spacevim_statusline_unicode_symbols == 1
+    if g:spacevim_statusline_unicode_symbols
       let m .= s:modes[mode].icon . ' '
     else
       let m .= s:modes[mode].icon_asc . ' '
diff --git a/config/plugins/vim-startify.vim b/config/plugins/vim-startify.vim
index 363756bf2..b5d23aea4 100644
--- a/config/plugins/vim-startify.vim
+++ b/config/plugins/vim-startify.vim
@@ -62,12 +62,17 @@ if !exists('g:startify_custom_header')
 endif
 call SpaceVim#mapping#space#def('nnoremap', ['a','s'], 'Startify | doautocmd WinEnter', 'fancy start screen',1)
 
-function! FileIcon(path)
-  let icon = s:FILE.fticon(a:path)
-  return empty(icon) ? ' ' : icon
-endfunction
+if g:spacevim_enable_tabline_filetype_icon
+
+  function! FileIcon(path)
+    let icon = s:FILE.fticon(a:path)
+    return empty(icon) ? ' ' : icon
+  endfunction
+
+  function! StartifyEntryFormat()
+    return 'FileIcon(entry_path) ."  ". entry_path'
+  endfunction
+
+endif
 
-function! StartifyEntryFormat()
-  return 'FileIcon(entry_path) ."  ". entry_path'
-endfunction
 " vim:set et sw=2:
diff --git a/mode/basic.toml b/mode/basic.toml
index 059fbffb3..276f2848d 100644
--- a/mode/basic.toml
+++ b/mode/basic.toml
@@ -15,17 +15,18 @@
     background = "dark"
     # Disable guicolors in basic mode, many terminal do not support 24bit
     # true colors
-    guicolors = false
+    enable_guicolors = false
     # Disable statusline separator, if you want to use other value, please
     # install nerd fonts
     statusline_separator = "nil"
     statusline_inactive_separator = "bar"
     buffer_index_type = 4
+    windows_index_type = 3
     enable_tabline_filetype_icon = false
-    statusline_display_mode = false
+    enable_statusline_display_mode = false
+    statusline_unicode_symbols = false
     # Enable vim compatible mode, avoid changing origin vim key bindings
-    vimcompatible = 1
-
+    vimcompatible = true
 # Enable autocomplete layer
 [[layers]]
 name = 'autocomplete'
diff --git a/mode/dark_powered.toml b/mode/dark_powered.toml
index 31d44d4a8..2fefbb63d 100644
--- a/mode/dark_powered.toml
+++ b/mode/dark_powered.toml
@@ -15,14 +15,14 @@
     background = "dark"
     # Disable guicolors in basic mode, many terminal do not support 24bit
     # true colors
-    guicolors = true
+    enable_guicolors = true
     # Disable statusline separator, if you want to use other value, please
     # install nerd fonts
     statusline_separator = "arrow"
     statusline_inactive_separator = "arrow"
     buffer_index_type = 4
     enable_tabline_filetype_icon = true
-    statusline_display_mode = false
+    enable_statusline_display_mode = false
 
 # Enable autocomplete layer
 [[layers]]