diff --git a/git/config b/git/config index 9427241..535c4d8 100644 --- a/git/config +++ b/git/config @@ -2,7 +2,7 @@ defaultBranch = main [user] email = i@d0zingcat.dev - name = d0zingcat + name = Lee Tang signingkey = 39E301C2 [url "https://"] insteadOf = git:// @@ -22,7 +22,8 @@ cmd = difft "$LOCAL" "$REMOTE" [alias] lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit - pr = pull --rebase origin master + pr = pull --rebase origin + unstage = reset HEAD -- p = push st = status co = checkout diff --git a/nvim/lua/config/nvim_nerdcommenter.lua b/nvim/lua/config/nvim_nerdcommenter.lua deleted file mode 100644 index bb2388e..0000000 --- a/nvim/lua/config/nvim_nerdcommenter.lua +++ /dev/null @@ -1,8 +0,0 @@ -local map = require('utils').map -local g = vim.g - --- nerdcommenter -map('', 'cc', 'V}:call NERDComment("x", "toggle")') -map('', 'cu', 'V{:call NERDComment("x", "toggle")') -g['NERDTrimTrailingWhitespace'] = 1 -g['NERDSpaceDelims'] = 1 diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua index 0b96c63..faa7f89 100644 --- a/nvim/lua/plugins.lua +++ b/nvim/lua/plugins.lua @@ -72,11 +72,11 @@ return require('packer').startup(function(use) use('wakatime/vim-wakatime') --use('psf/black') use({ - 'preservim/nerdcommenter', + 'numToStr/Comment.nvim', config = function() - require('config.nvim_vimgo') + require('Comment').setup() end, - }) + }) use({ 'windwp/nvim-autopairs', config = function() diff --git a/wezterm/wezterm.lua b/wezterm/wezterm.lua index e0250ca..f87bb9e 100644 --- a/wezterm/wezterm.lua +++ b/wezterm/wezterm.lua @@ -48,14 +48,14 @@ return { --{ key = 's', mods = 'CMD', action = wezterm.action({ ShowLauncherArgs = { flags = 'FUZZY|WORKSPACES' } }) }, { key = 'w', mods = 'CMD', action = wezterm.action({ CloseCurrentPane = { confirm = false } }) }, }, - hyperlink_rules = { - { - regex = [[\b(https|http)://\S*\b]], - format = '$0', - }, - { - regex = [[["]?([\w\d]{1}[-\w\d]+)(/){1}([-\w\d\.]+)["]?]], - format = 'https://www.github.com/$1/$3', - } - } + -- hyperlink_rules = { + -- { + -- regex = [[\b(https|http)://\S*\b]], + -- format = '$0', + -- }, + -- { + -- regex = [[["]?([\w\d]{1}[-\w\d]+)(/){1}([-\w\d\.]+)["]?]], + -- format = 'https://www.github.com/$1/$3', + -- } + -- } }