feat:update neovim config

Author: beardnick

navi/git.cheat

@@ -77,3 +77,4 @@ git stash clear
 git branch -r | grep -v '\->' | while read remote; do git branch --track "${remote#origin/}" "$remote"; done 
 
 $ stash: git stash list  | awk -F: '{print $1}' --- --preview-window "80%" --preview 'git  stash show --color=always {1} -p'
+$ branch_name: git branch

shell/.zshrc

@@ -112,3 +112,9 @@ setopt append_history
 [[ -f "$LOCAL_CONFIG" ]] && source "$LOCAL_CONFIG"
 
 add_path "$HOME/.local/bin"
+
+
+HISTFILE=~/.zsh_history
+HISTSIZE=10000
+SAVEHIST=1000
+setopt SHARE_HISTORY

vim/my.nvim/default.vim

@@ -327,3 +327,5 @@ command! -range SnakeCase silent! call <SID>Snakeize(<range>)
 
 
 command! -bang -nargs=* Rgx call fzf#vim#grep("rg --column --line-number --no-heading --color=always --smart-case ".<q-args>, 1, <bang>0)
+
+let g:indentLine_setConceal = 0

vim/my.nvim/lazy-lock.json

@@ -34,8 +34,7 @@
   "nvim-dap-virtual-text": { "branch": "master", "commit": "57f1dbd0458dd84a286b27768c142e1567f3ce3b" },
   "nvim-notify": { "branch": "master", "commit": "e4a2022f4fec2d5ebc79afa612f96d8b11c627b3" },
   "nvim-osc52": { "branch": "main", "commit": "89307570b3bffe115d8b6b6fd3a4066cde0ba2d7" },
-  "nvim-transparent": { "branch": "main", "commit": "8b7a90720e196b360adccf8b4a946e42a22433f1" },
-  "nvim-treesitter": { "branch": "master", "commit": "584ccea56e2d37b31ba292da2b539e1a4bb411ca" },
+  "nvim-treesitter": { "branch": "master", "commit": "adf72368f6af026b4cd19851d34a313a54159857" },
   "nvim-web-devicons": { "branch": "master", "commit": "5efb8bd06841f91f97c90e16de85e96d57e9c862" },
   "onedark.vim": { "branch": "main", "commit": "57b77747694ea5676c3ca0eeaf9567dc499730c0" },
   "open-browser.vim": { "branch": "master", "commit": "7d4c1d8198e889d513a030b5a83faa07606bac27" },
@@ -59,7 +58,7 @@
   "todo.txt-vim": { "branch": "master", "commit": "ed9d639de2e34eafb82f2682010ab361966ee40f" },
   "toggleterm.nvim": { "branch": "main", "commit": "6b334b9d1266b0f58ab1b6965c1e5b7eb5c34523" },
   "traces.vim": { "branch": "master", "commit": "9663fcf84de5776bee71b6c816c25ccb6ea11d1a" },
-  "ultisnips": { "branch": "master", "commit": "204b501cc8f4acd7f32ebdea262bd5772ca007a2" },
+  "ultisnips": { "branch": "master", "commit": "b393ba65386d47664421e1f8b246a87a6e8b218c" },
   "vim-applescript": { "branch": "master", "commit": "91a5af926da819dd9d812ed79a8aac6bbdedeee9" },
   "vim-bookmarks": { "branch": "feature-relative-path", "commit": "fc3ff7facb451267f05f28be3f106e093165750b" },
   "vim-choosewin": { "branch": "master", "commit": "839da609d9b811370216bdd9d4512ec2d0ac8644" },
@@ -96,4 +95,4 @@
   "vimtex": { "branch": "master", "commit": "941485f8b046ac00763dad2546f0701e85e5e02c" },
   "vista.vim": { "branch": "master", "commit": "290b815cd5a5ff1fb65a48936633d93e2bf14dbd" },
   "wildfire.vim": { "branch": "master", "commit": "dfcf48aad2e80c63272df67a1b81e37cbc443412" }
-}
+}

vim/my.nvim/lua/plugins/dap.lua

@@ -9,11 +9,11 @@ local map = vim.api.nvim_set_keymap
 local dap = require('dap')
 
 function _G.dapContinue()
-    if vim.fn.filereadable('.vim/launch.json') then
-        require('dap.ext.vscode').load_launchjs('.vim/launch.json')
-    elseif vim.fn.filereadable('.vscode/launch.json') then
-        require('dap.ext.vscode').load_launchjs('.vscode/launch.json')
-    end
+    --if vim.fn.filereadable('.vim/launch.json') then
+    --    require('dap.ext.vscode').load_launchjs('.vim/launch.json')
+    --elseif vim.fn.filereadable('.vscode/launch.json') then
+    --    require('dap.ext.vscode').load_launchjs('.vscode/launch.json')
+    --end
 
     require('dap').continue()
 end

vim/my.nvim/lua/setup.lua

@@ -3,11 +3,21 @@ local ____exports = {}
 local loadVscode, loadVim, ensurePluginManager, ensurePlugins, configCoc, configVim
 local plug = require("plug")
 function loadVscode()
-    local vscode = require("vscode.init")
+    local vscode = require("vs.init")
     if not vim.g.pluginDir then
         vim.g.pluginDir = vim.fn.stdpath("data") .. "/mynvim"
     end
     vscode.setup()
+    vim.g.localConfigAfter = vim.fn.expand("$HOME/.config/local/config_vim.vim")
+    vim.g.localConfigLuaAfter = vim.fn.expand("$HOME/.config/local/config_nvim.lua")
+    vim.fn.execute(
+        "source " .. tostring(vim.g.localConfigAfter),
+        "silent!"
+    )
+    vim.fn.execute(
+        "luafile " .. tostring(vim.g.localConfigLuaAfter),
+        "silent!"
+    )
 end
 function loadVim()
     if not vim.g.pluginDir then
@@ -49,7 +59,6 @@ function ensurePlugins(dir)
         "mg979/vim-visual-multi",
         "luochen1990/rainbow",
         {[1] = "neoclide/coc.nvim", branch = "master", build = "yarn install --frozen-lockfile"},
-        "ludovicchabant/vim-gutentags",
         "mhinz/vim-startify",
         "scrooloose/nerdcommenter",
         "SirVer/ultisnips",
@@ -128,7 +137,6 @@ function ensurePlugins(dir)
         {[1] = "nvim-telescope/telescope-fzf-native.nvim", build = "make"},
         "fannheyward/telescope-coc.nvim",
         "nvim-treesitter/nvim-treesitter",
-        "xiyaowong/nvim-transparent",
         "github/copilot.vim",
         "theHamsta/nvim-dap-virtual-text",
         "Weissle/persistent-breakpoints.nvim",

vim/my.nvim/lua/vscode/init.lua vim/my.nvim/lua/vs/init.lua

@@ -66,7 +66,7 @@ local function loadConfig()
         }
     )
 
-    map('n', 's', require('flash').jump, mapopt)
+    map('n', 's', [[<cmd>lua require('flash').jump()<cr>]], mapopt)
 
     vim.api.nvim_set_hl(0, "FlashLabel", { ctermbg = 0, bg = '#fa036a' })
     vim.api.nvim_set_hl(0, "FlashMatch", { ctermbg = 0, bg = '#2f50cd' })

vim/my.nvim/lua/vscode/keybindings.json vim/my.nvim/lua/vs/keybindings.json

@@ -12,8 +12,16 @@ function loadVscode() {
   if (!vim.g.pluginDir) {
     vim.g.pluginDir = `${vim.fn.stdpath("data")}/mynvim`;
   }
-  import * as vscode from "vscode/init";
+  import * as vscode from "vs/init";
   vscode.setup();
+  vim.g.localConfigAfter = vim.fn.expand("$HOME/.config/local/config_vim.vim");
+  vim.g.localConfigLuaAfter = vim.fn.expand(
+    "$HOME/.config/local/config_nvim.lua"
+  );
+
+  vim.fn.execute(`source ${vim.g.localConfigAfter}`, "silent!");
+  vim.fn.execute(`luafile ${vim.g.localConfigLuaAfter}`, "silent!");
+
 }
 
 function loadVim() {
@@ -62,7 +70,7 @@ function ensurePlugins(dir: string) {
         branch: "master",
         build: "yarn install --frozen-lockfile",
       },
-      "ludovicchabant/vim-gutentags",
+      //"ludovicchabant/vim-gutentags",
       "mhinz/vim-startify",
       "scrooloose/nerdcommenter",
       "SirVer/ultisnips",
@@ -142,7 +150,7 @@ function ensurePlugins(dir: string) {
       { 1: "nvim-telescope/telescope-fzf-native.nvim", build: "make" },
       "fannheyward/telescope-coc.nvim",
       "nvim-treesitter/nvim-treesitter",
-      "xiyaowong/nvim-transparent",
+      //"xiyaowong/nvim-transparent",
       "github/copilot.vim",
       "theHamsta/nvim-dap-virtual-text",
       "Weissle/persistent-breakpoints.nvim",