From a311601aea299174689f48212d8592d5b8980291 Mon Sep 17 00:00:00 2001
From: Nachuan Tang <tangnachuan1208@gmail.com>
Date: Fri, 29 Dec 2023 19:34:35 +0800
Subject: [PATCH] .

---
 .vimrc                                        |  7 +++++++
 config/vim/autoload/os.vim                    |  6 ------
 .../telescope-nvim-config.lua                 | 21 ++++++++-----------
 .../toggleterm-nvim-config.lua                | 14 +++++++++++++
 .../vim-matchup-config.lua                    |  9 --------
 config/vim/plugin/config.vim                  |  4 ----
 main.vim                                      |  4 +---
 7 files changed, 31 insertions(+), 34 deletions(-)
 delete mode 100644 config/vim/lua/lua-plugin-settings/vim-matchup-config.lua

diff --git a/.vimrc b/.vimrc
index c7b3d6e..e76ab59 100644
--- a/.vimrc
+++ b/.vimrc
@@ -16,6 +16,13 @@
     let g:isWSL = 0
     if has("win64") || has("win32") || has("win16")
         let g:os = "Windows"
+        set updatetime=50
+        if executable('pwsh')
+            " prefer to use powershell 7
+            set shell=pwsh
+        else
+            set shell=powershell
+        endif
     else
         let g:os = substitute(system('uname'), '\n', '', '')
         if system('uname -r') =~ "icrosoft"
diff --git a/config/vim/autoload/os.vim b/config/vim/autoload/os.vim
index 52fba39..06fcc89 100644
--- a/config/vim/autoload/os.vim
+++ b/config/vim/autoload/os.vim
@@ -6,9 +6,3 @@ func! os#getOS()
     endif
 endfunc
 
-function! os#setWindows()
-    set updatetime=50
-    set shell=powershell
-endfunction
-
-
diff --git a/config/vim/lua/lua-plugin-settings/telescope-nvim-config.lua b/config/vim/lua/lua-plugin-settings/telescope-nvim-config.lua
index 8d8970a..eaad70a 100644
--- a/config/vim/lua/lua-plugin-settings/telescope-nvim-config.lua
+++ b/config/vim/lua/lua-plugin-settings/telescope-nvim-config.lua
@@ -17,19 +17,7 @@ if HasPlug('telescope.nvim') then
     return layout
   end
   telescope.setup {
-    defaults = {
-      hidden = true,
-      vimgrep_arguments = vimgrep_arguments,
-      file_ignore_patterns = {"node_modules/", ".git/"},
-      layout_config = {
-        -- prompt_position = "top",
-      },
-      layout_strategy = "horizontal_merged",
-    },
     pickers = {
-      find_files = {
-        hidden = true,
-      },
       colorscheme = {
         enable_preview = true,
         mappings = {
@@ -44,6 +32,15 @@ if HasPlug('telescope.nvim') then
         },
       }
     },
+    defaults = {
+      hidden = true,
+      vimgrep_arguments = vimgrep_arguments,
+      file_ignore_patterns = {"^node_modules/", "^.git/"},
+      layout_config = {
+        -- prompt_position = "top",
+      },
+      layout_strategy = "horizontal_merged",
+    },
     extensions = {
       fzf = {
         fuzzy = true,         -- false will only do exact matching
diff --git a/config/vim/lua/lua-plugin-settings/toggleterm-nvim-config.lua b/config/vim/lua/lua-plugin-settings/toggleterm-nvim-config.lua
index 3a9a6b8..60f3ef4 100644
--- a/config/vim/lua/lua-plugin-settings/toggleterm-nvim-config.lua
+++ b/config/vim/lua/lua-plugin-settings/toggleterm-nvim-config.lua
@@ -62,4 +62,18 @@ if HasPlug('toggleterm.nvim') then
   vim.api.nvim_set_keymap("x", "<leader>tl", string.format(":ToggleTermSendVisualSelection %d<CR>", ipythonId),
     { noremap = true, silent = true })
 
+
+  print(vim.o.shell)
+  if vim.o.shell == 'pwsh' or vim.o.shell == 'powershell' then
+    local powershell_options = {
+      shellcmdflag = "-NoLogo -NoProfile -ExecutionPolicy RemoteSigned -Command [Console]::InputEncoding=[Console]::OutputEncoding=[System.Text.Encoding]::UTF8;",
+      shellredir = "-RedirectStandardOutput %s -NoNewWindow -Wait",
+      shellpipe = "2>&1 | Out-File -Encoding UTF8 %s; exit $LastExitCode",
+      shellquote = "",
+      shellxquote = "",
+    }
+    for option, value in pairs(powershell_options) do
+      vim.opt[option] = value
+    end
+  end
 end
diff --git a/config/vim/lua/lua-plugin-settings/vim-matchup-config.lua b/config/vim/lua/lua-plugin-settings/vim-matchup-config.lua
deleted file mode 100644
index 4910a80..0000000
--- a/config/vim/lua/lua-plugin-settings/vim-matchup-config.lua
+++ /dev/null
@@ -1,9 +0,0 @@
-
-if HasPlug('vim-illuminate') then
-  require'nvim-treesitter.configs'.setup {
-    matchup = {
-      enable = true,
-      disable = { },
-    },
-  }
-end
diff --git a/config/vim/plugin/config.vim b/config/vim/plugin/config.vim
index 0563a8f..b7155e1 100644
--- a/config/vim/plugin/config.vim
+++ b/config/vim/plugin/config.vim
@@ -6,8 +6,4 @@ let g:loaded_vim_config = 1
 
 let os = os#getOS()
 
-if os == 'Windows'
-    call os#setWindows()
-endif
-
 call options#init()
diff --git a/main.vim b/main.vim
index 653c797..c5fb384 100644
--- a/main.vim
+++ b/main.vim
@@ -7,7 +7,7 @@
 " KEY_MAPS
 " OTHER_CONFIGS
 
-let g:high_performence = v:true
+let g:high_performence = v:false
 let g:autocomplte_enable = v:true
 let g:copilot_enable = v:true
 
@@ -45,14 +45,12 @@ call plug#begin(g:plugin_dir)
         Plug 'tek256/simple-dark'
         Plug 'sainnhe/everforest'
         Plug 'bluz71/vim-moonfly-colors', { 'as': 'moonfly' }
-        " Plug 'jacoborus/tender.vim'
         Plug 'cocopon/iceberg.vim'
         Plug 'catppuccin/nvim', Cond( has('nvim-0.8.2')  \|\| g:vim_v >= 900  , { 'as': 'catppuccin' })
         Plug 'NLKNguyen/papercolor-theme'
         Plug 'EdenEast/nightfox.nvim', Cond(has('nvim-0.5'))
         Plug 'projekt0n/github-nvim-theme', Cond(has('nvim-0.5'), { 'tag': 'v0.0.7' })
         Plug 'folke/tokyonight.nvim', Cond(g:vim_type == 'nvim', { 'branch': 'main' })
-        " Plug 'junegunn/goyo.vim', { 'on': ['Goyo'] }
         Plug 'andymass/vim-matchup'
     endif
     Plug 'Donaldttt/fuzzyy'