From 14731c0d2565f717ca2a9edb5719b8827458a6be Mon Sep 17 00:00:00 2001
From: doyle <doylet@protonmail.com>
Date: Fri, 20 May 2022 14:52:23 +1000
Subject: [PATCH] minor fixes

---
 Installer/os_vimrc | 65 +++++++++++++++++++---------------------------
 win_install.bat    |  1 +
 2 files changed, 27 insertions(+), 39 deletions(-)

diff --git a/Installer/os_vimrc b/Installer/os_vimrc
index 97af615..7f5a2ad 100644
--- a/Installer/os_vimrc
+++ b/Installer/os_vimrc
@@ -105,48 +105,35 @@ let g:gruvbox_italic=0
 let g:gruvbox_bold=0
 colorscheme gruvbox
 
-if has("gui_running")
-    " NOTE(doyle): Some list chars in gui don't show correctly in terminal so separate logic
-    " old listchars=tab:>-,eol:¬,trail:■,extends:»,precedes:«
-    set listchars+=trail:■,extends:»,precedes:«
-    if s:running_windows
-        set guifont=JetBrains_Mono:h9,Consolas:h11
-    else
-        set guifont=InputMonoCondensed:h10
-    endif
-
-    " Don't show trailing spaces in insert mode
-    augroup trailing
-      au!
-      au InsertEnter * :set listchars-=trail:■
-      au InsertLeave * :set listchars+=trail:■
-    augroup END
-
-    " Increase font size using (Ctrl+Up Arrow) or (Ctrl+Down Arrow) if we are using
-    " gvim Otherwise font size is determined in terminal
-    nnoremap <C-Up> :silent! let &guifont = substitute(
-     \ &guifont,
-     \ ':h\zs\d\+',
-     \ '\=eval(submatch(0)+1)',
-     \ 'g')<CR>
-    nnoremap <C-Down> :silent! let &guifont = substitute(
-     \ &guifont,
-     \ ':h\zs\d\+',
-     \ '\=eval(submatch(0)-1)',
-     \ 'g')<CR>
-
+" NOTE(doyle): Some list chars in gui don't show correctly in terminal so separate logic
+" old listchars=tab:>-,eol:¬,trail:■,extends:»,precedes:«
+set listchars+=trail:■,extends:»,precedes:«
+if s:running_windows
+    set guifont=JetBrains_Mono:h9,Consolas:h9
 else
-    set t_Co=256            " 256 colors
-    let &t_AB="\e[48;5;%dm" " vodoo magic for CONEMU
-    let &t_AF="\e[38;5;%dm" " vodoo magic for CONEMU
-
-    set listchars+=trail:$,extends:>,precedes:<
-
-    " Fix Cmder backspace bug
-    inoremap <Char-0x07F> <BS>
-    nnoremap <Char-0x07F> <BS>
+    set guifont=InputMonoCondensed:h9
 endif
 
+" Don't show trailing spaces in insert mode
+augroup trailing
+  au!
+  au InsertEnter * :set listchars-=trail:■
+  au InsertLeave * :set listchars+=trail:■
+augroup END
+
+" Increase font size using (Ctrl+Up Arrow) or (Ctrl+Down Arrow) if we are using
+" gvim Otherwise font size is determined in terminal
+nnoremap <C-Up> :silent! let &guifont = substitute(
+ \ &guifont,
+ \ ':h\zs\d\+',
+ \ '\=eval(submatch(0)+1)',
+ \ 'g')<CR>
+nnoremap <C-Down> :silent! let &guifont = substitute(
+ \ &guifont,
+ \ ':h\zs\d\+',
+ \ '\=eval(submatch(0)-1)',
+ \ 'g')<CR>
+
 " Formatting options (see :h fo-table)
 augroup persistent_settings
   au!
diff --git a/win_install.bat b/win_install.bat
index 89c347d..fb90b41 100644
--- a/win_install.bat
+++ b/win_install.bat
@@ -582,6 +582,7 @@ if not exist "!nvim_exe!" (
 
 call :FileHashCheck sha256 "!nvim_exe!" "!nvim_exe_sha256!" || exit /B
 call :MakeBatchShortcutInBinDir "nvim" "!nvim_exe!"
+call :MakeBatchShortcutInBinDir "nvim-qt" "!nvim_dir!\bin\nvim-qt.exe"
 
 REM ----------------------------------------------------------------------------
 REM Neovide