mirror of
https://github.com/ksyasuda/rice.git
synced 2024-11-22 03:19:58 -08:00
update
This commit is contained in:
parent
b20371a2f5
commit
35f38e4180
@ -34,5 +34,17 @@
|
|||||||
"command": "pyright",
|
"command": "pyright",
|
||||||
"filetypes": ["python", "py"]
|
"filetypes": ["python", "py"]
|
||||||
}
|
}
|
||||||
}
|
},
|
||||||
|
"hover.floatConfig": {
|
||||||
|
"border": true,
|
||||||
|
"shadow": true,
|
||||||
|
"focusable": true,
|
||||||
|
"highlight": "CocFloating",
|
||||||
|
"borderhighlight": "CocFloating"
|
||||||
|
},
|
||||||
|
"diagnostic.virtualText": true,
|
||||||
|
"diagnostic.virtualTextLines": 5,
|
||||||
|
"diagnostic.virtualTextLevel": "information",
|
||||||
|
"codeLens.enable": true,
|
||||||
|
"codeLens.position": "eol"
|
||||||
}
|
}
|
||||||
|
@ -86,6 +86,7 @@ if has('nvim')
|
|||||||
Plug 'kyazdani42/nvim-web-devicons'
|
Plug 'kyazdani42/nvim-web-devicons'
|
||||||
Plug 'kyazdani42/nvim-tree.lua'
|
Plug 'kyazdani42/nvim-tree.lua'
|
||||||
Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
|
Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
|
||||||
|
Plug 'TimUntersberger/neogit'
|
||||||
|
|
||||||
Plug 'NTBBloodbath/doom-one.nvim'
|
Plug 'NTBBloodbath/doom-one.nvim'
|
||||||
Plug 'Mofiqul/dracula.nvim'
|
Plug 'Mofiqul/dracula.nvim'
|
||||||
@ -112,6 +113,7 @@ if has('nvim')
|
|||||||
source ~/.config/nvim/plugins/dashboard-nvim.lua
|
source ~/.config/nvim/plugins/dashboard-nvim.lua
|
||||||
source ~/.config/nvim/plugins/nvimtree.lua
|
source ~/.config/nvim/plugins/nvimtree.lua
|
||||||
source ~/.config/nvim/plugins/treesitter.lua
|
source ~/.config/nvim/plugins/treesitter.lua
|
||||||
|
source ~/.config/nvim/plugins/neogit.lua
|
||||||
|
|
||||||
|
|
||||||
source ~/.config/nvim/plugins/doomone.lua
|
source ~/.config/nvim/plugins/doomone.lua
|
||||||
@ -225,7 +227,7 @@ command! -bang -nargs=? -complete=dir AllFiles
|
|||||||
"------------------------------------------------------------------------------
|
"------------------------------------------------------------------------------
|
||||||
|
|
||||||
let g:ale_sh_shellcheck_executable = '/usr/bin/shellcheck'
|
let g:ale_sh_shellcheck_executable = '/usr/bin/shellcheck'
|
||||||
let g:ale_sh_shellcheck_options = '-s bash -o all -e 2250'
|
let g:ale_sh_shellcheck_options = '-S info -s bash -o all -e 2250'
|
||||||
let g:ale_sh_shfmt_options = '-i=4 -ci -sr'
|
let g:ale_sh_shfmt_options = '-i=4 -ci -sr'
|
||||||
let g:ale_fix_on_save = 1
|
let g:ale_fix_on_save = 1
|
||||||
" let g:ale_set_quickfix = 1
|
" let g:ale_set_quickfix = 1
|
||||||
@ -610,7 +612,11 @@ nmap <C-K> :bprev<CR>
|
|||||||
" git
|
" git
|
||||||
nmap <leader>gc :CocCommand fzf-preview.GitLogs<CR>
|
nmap <leader>gc :CocCommand fzf-preview.GitLogs<CR>
|
||||||
nmap <leader>gf :CocCommand fzf-preview.GitFiles<CR>
|
nmap <leader>gf :CocCommand fzf-preview.GitFiles<CR>
|
||||||
|
if has('nvim')
|
||||||
|
nmap <leader>gg :Neogit<CR>
|
||||||
|
else
|
||||||
nmap <leader>gg :FloatermNew --title=lazygit --opener=vsplit --width=1.0 --height=1.0 lazygit<CR>
|
nmap <leader>gg :FloatermNew --title=lazygit --opener=vsplit --width=1.0 --height=1.0 lazygit<CR>
|
||||||
|
endif
|
||||||
nmap <leader>gs :CocCommand fzf-preview.GitStatus<CR>
|
nmap <leader>gs :CocCommand fzf-preview.GitStatus<CR>
|
||||||
nmap gr :<C-u>CocCommand fzf-preview.CocReferences<CR>
|
nmap gr :<C-u>CocCommand fzf-preview.CocReferences<CR>
|
||||||
" help/history
|
" help/history
|
||||||
|
73
nvim/plugins/neogit.lua
Normal file
73
nvim/plugins/neogit.lua
Normal file
@ -0,0 +1,73 @@
|
|||||||
|
local neogit = require("neogit")
|
||||||
|
|
||||||
|
neogit.setup {
|
||||||
|
disable_signs = false,
|
||||||
|
disable_hint = false,
|
||||||
|
disable_context_highlighting = false,
|
||||||
|
disable_commit_confirmation = false,
|
||||||
|
auto_refresh = true,
|
||||||
|
disable_builtin_notifications = false,
|
||||||
|
use_magit_keybindings = false,
|
||||||
|
commit_popup = {
|
||||||
|
kind = "split",
|
||||||
|
},
|
||||||
|
-- Change the default way of opening neogit
|
||||||
|
kind = "tab",
|
||||||
|
-- kind = "vsplit",
|
||||||
|
-- customize displayed signs
|
||||||
|
signs = {
|
||||||
|
-- { CLOSED, OPENED }
|
||||||
|
section = { ">", "v" },
|
||||||
|
item = { ">", "v" },
|
||||||
|
hunk = { "", "" },
|
||||||
|
},
|
||||||
|
integrations = {
|
||||||
|
-- Neogit only provides inline diffs. If you want a more traditional way to look at diffs, you can use `sindrets/diffview.nvim`.
|
||||||
|
-- The diffview integration enables the diff popup, which is a wrapper around `sindrets/diffview.nvim`.
|
||||||
|
--
|
||||||
|
-- Requires you to have `sindrets/diffview.nvim` installed.
|
||||||
|
-- use {
|
||||||
|
-- 'TimUntersberger/neogit',
|
||||||
|
-- requires = {
|
||||||
|
-- 'nvim-lua/plenary.nvim',
|
||||||
|
-- 'sindrets/diffview.nvim'
|
||||||
|
-- }
|
||||||
|
-- }
|
||||||
|
--
|
||||||
|
diffview = false
|
||||||
|
},
|
||||||
|
-- Setting any section to `false` will make the section not render at all
|
||||||
|
sections = {
|
||||||
|
untracked = {
|
||||||
|
folded = false
|
||||||
|
},
|
||||||
|
unstaged = {
|
||||||
|
folded = false
|
||||||
|
},
|
||||||
|
staged = {
|
||||||
|
folded = false
|
||||||
|
},
|
||||||
|
stashes = {
|
||||||
|
folded = true
|
||||||
|
},
|
||||||
|
unpulled = {
|
||||||
|
folded = true
|
||||||
|
},
|
||||||
|
unmerged = {
|
||||||
|
folded = false
|
||||||
|
},
|
||||||
|
recent = {
|
||||||
|
folded = true
|
||||||
|
},
|
||||||
|
},
|
||||||
|
-- override/add mappings
|
||||||
|
mappings = {
|
||||||
|
-- modify status buffer mappings
|
||||||
|
status = {
|
||||||
|
-- Adds a mapping with "B" as key that does the "BranchPopup" command
|
||||||
|
["B"] = "BranchPopup",
|
||||||
|
-- Removes the default mapping of "s"
|
||||||
|
["s"] = "",
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -39,8 +39,8 @@ require'nvim-tree'.setup {
|
|||||||
timeout = 500,
|
timeout = 500,
|
||||||
},
|
},
|
||||||
view = {
|
view = {
|
||||||
width = 45,
|
width = 35,
|
||||||
height = 45,
|
height = 35,
|
||||||
hide_root_folder = false,
|
hide_root_folder = false,
|
||||||
side = 'left',
|
side = 'left',
|
||||||
auto_resize = false,
|
auto_resize = false,
|
||||||
|
Loading…
Reference in New Issue
Block a user