merge

config/vim/autoload/os.vim

@@ -6,9 +6,3 @@ func! os#getOS()
     endif
 endfunc
 
-function! os#setWindows()
-    set updatetime=50
-    set shell=powershell
-endfunction
-
-

config/vim/lua/lua-plugin-settings/indent-blankline-nvim-config.lua

@@ -2,12 +2,11 @@
 if not Animation_enable then
   if HasPlug('indent-blankline.nvim') then
     -- Example config in Lua
-    require("indent_blankline").setup {
-      show_current_context = true,
-      use_treesitter = true,
-      filetype_exclude = { "lspinfo", "packer", "checkhealth",
-        "help", "man", "", "startify", }
-      -- use_treesitter = true,
+    require("ibl").setup {
+      exclude = {
+        buftypes = {"lspinfo", "packer", "checkhealth",
+        "help", "man", "", "startify"},
+      }
     }
   end
 end

config/vim/lua/lua-plugin-settings/project-nvim-config.lua

@@ -2,7 +2,7 @@
 if HasPlug('project.nvim') then
   require("project_nvim").setup {
     detection_methods = { "lsp", "pattern" },
-    patterns = { ".git", "_darcs", ".hg", ".bzr", ".svn", "Makefile", "package.json", "src" },
+    patterns = { ".git" },
 
     -- Don't calculate root dir on specific directories
     -- Ex: { "~/.cargo/*", ... }
@@ -11,7 +11,7 @@ if HasPlug('project.nvim') then
     show_hidden = false,
     -- When set to false, you will get a message when project.nvim changes your
     -- directory.
-    silent_chdir = false,
+    silent_chdir = true,
     -- Path where project.nvim will store the project history for use in
     -- telescope
     datapath = vim.g.vim_dir .. "/.vimproject/"

config/vim/lua/lua-plugin-settings/telescope-nvim-config.lua

@@ -13,24 +13,11 @@ if HasPlug('telescope.nvim') then
     layout_config)
     layout.prompt.title = ''
     layout.results.title = ''
-    -- layout.preview.title = ''
     -- layout.prompt.borderchars = { '─', '│', '─', '│', '┌', '┐', '┘', '└' }
     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 = {
@@ -45,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

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

config/vim/lua/lua-plugin-settings/vim-matchup-config.lua

@@ -1,9 +0,0 @@
-
-if HasPlug('vim-illuminate') then
-  require'nvim-treesitter.configs'.setup {
-    matchup = {
-      enable = true,
-      disable = { },
-    },
-  }
-end

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()