diff --git a/.golangci.yml b/.golangci.yml index ce220f7..2c92323 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -92,7 +92,7 @@ linters-settings: - name: cognitive-complexity severity: warning disabled: false - arguments: [10] + arguments: [14] # https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md#constant-logical-expr - name: constant-logical-expr severity: warning diff --git a/README.md b/README.md index cb6e80d..e70b62d 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,13 @@ ### 使用 + ```shell git clone https://github.com/Laily123/.dotfile.git ~/.dotfile ``` + ### zsh 安装 + 安装 zsh + ```shell https://github.com/robbyrussell/oh-my-zsh/wiki/Installing-ZSH # macOS @@ -15,10 +19,13 @@ apt install zsh ``` 安装 oh-my-zsh + ```shell sh -c "$(wget https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh -O -)" ``` + 初始化配置 + ```shell ln -sf ~/.dotfile/.zshrc ~/ ln -sf ~/.dotfile/laily.zsh-theme ~/.oh-my-zsh/themes/ @@ -27,9 +34,10 @@ ln -sf ~/.dotfile/.gitconfig ~/.gitconfig ``` ### spacevim 安装 + 安装 `curl -sLf https://spacevim.org/install.sh | bash` 初始化配置 `ln -sf ~/.dotfile/.SpaceVim.d ~/` - +# diff --git a/nvim/lua/pluginconfig/nvim-tree.lua b/nvim/lua/pluginconfig/nvim-tree.lua index 30b7873..55c5c62 100644 --- a/nvim/lua/pluginconfig/nvim-tree.lua +++ b/nvim/lua/pluginconfig/nvim-tree.lua @@ -12,7 +12,9 @@ local function my_on_attach(bufnr) vim.keymap.set('n', '', api.tree.change_root_to_parent, opts('Up')) vim.keymap.set('n', '?', api.tree.toggle_help, opts('Help')) vim.keymap.set('n', 'l', api.node.open.edit, opts('Edit')) - vim.keymap.set('n', 'h', api.node.navigate.parent_close, opts('Parent Close')) + vim.keymap.set('n', 'h', api.node.navigate.parent_close, opts('Parent Close')) + vim.keymap.set('n', 's', api.node.open.horizontal, opts('Horizontal Split')) + vim.keymap.set('n', 'v', api.node.open.vertical, opts('Vertical Split')) end require'nvim-tree'.setup { @@ -34,7 +36,7 @@ require'nvim-tree'.setup { enable = true, -- update the root directory of the tree to the one of the folder containing the file if the file is not under the current root directory -- only relevant when `update_focused_file.enable` is true - update_cwd = true, + update_cwd = false, -- list of buffer names / filetypes that will not update the cwd if the file isn't found under the current root directory -- only relevant when `update_focused_file.update_cwd` is true and `update_focused_file.enable` is true ignore_list = {} diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua index 27b4f2e..0fc4ad5 100644 --- a/nvim/lua/plugins.lua +++ b/nvim/lua/plugins.lua @@ -203,13 +203,14 @@ return require("packer").startup(function(use) } -- markdown - use { 'godlygeek/tabular' } - use { 'preservim/vim-markdown' } - use { - 'iamcco/markdown-preview.nvim', - run = function() vim.fn['mkdp#util#install']() end, - ft = { 'markdown' } - } + -- use { 'godlygeek/tabular' } + -- use { 'preservim/vim-markdown' } + + -- use { + -- 'iamcco/markdown-preview.nvim', + -- run = function() vim.fn['mkdp#util#install']() end, + -- ft = { 'markdown' } + -- } use {'tpope/vim-fugitive'} diff --git a/nvim/lua/settings.lua b/nvim/lua/settings.lua index a9e82f5..9c919ed 100644 --- a/nvim/lua/settings.lua +++ b/nvim/lua/settings.lua @@ -41,6 +41,7 @@ vim.cmd('filetype plugin on') -- filetype detection vim.o.guifont = "FiraCode Nerd Font:h17" -- vim.o.guifont = "JetBrains\\ Mono\\ Regular\\ Nerd\\ Font\\ Complete" +vim.g.vim_markdown_folding_disabled = 1 vim.g.vimspector_enable_mappings = 'HUMAN' vim.g['test#go#rspec#options'] = { nearest= '--v', suite= '--v' }