mirror of
https://github.com/elkowar/dots-of-war.git
synced 2024-12-26 14:12:23 +00:00
Epic git signs and scroll bar
This commit is contained in:
parent
04986ceca7
commit
7bc13818c9
5 changed files with 19 additions and 8 deletions
|
@ -65,8 +65,9 @@
|
||||||
:nvim-telescope/telescope.nvim {:config #(require "dots.plugins.telescope")
|
:nvim-telescope/telescope.nvim {:config #(require "dots.plugins.telescope")
|
||||||
:cmd ["Telescope"]
|
:cmd ["Telescope"]
|
||||||
:dependencies [:nvim-lua/popup.nvim
|
:dependencies [:nvim-lua/popup.nvim
|
||||||
:nvim-lua/plenary.nvim
|
:nvim-lua/plenary.nvim]}
|
||||||
:nvim-telescope/telescope-ui-select.nvim]}
|
|
||||||
|
:petertriho/nvim-scrollbar {:config #(setup :scrollbar)}
|
||||||
|
|
||||||
; editing and movement <<<
|
; editing and movement <<<
|
||||||
:jiangmiao/auto-pairs {}
|
:jiangmiao/auto-pairs {}
|
||||||
|
@ -120,9 +121,12 @@
|
||||||
:sindrets/diffview.nvim {:cmd ["DiffviewOpen" "DiffviewToggleFiles"]
|
:sindrets/diffview.nvim {:cmd ["DiffviewOpen" "DiffviewToggleFiles"]
|
||||||
:config #(require "dots.plugins.diffview")}
|
:config #(require "dots.plugins.diffview")}
|
||||||
|
|
||||||
:lewis6991/gitsigns.nvim {:dependencies [:vim-gruvbox8]
|
:lewis6991/gitsigns.nvim {:dependencies [:vim-gruvbox8
|
||||||
|
:petertriho/nvim-scrollbar]
|
||||||
:config #(require "dots.plugins.gitsigns")}
|
:config #(require "dots.plugins.gitsigns")}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
:ruanyl/vim-gh-line {}
|
:ruanyl/vim-gh-line {}
|
||||||
:rhysd/conflict-marker.vim {}
|
:rhysd/conflict-marker.vim {}
|
||||||
:tpope/vim-fugitive {}
|
:tpope/vim-fugitive {}
|
||||||
|
@ -154,8 +158,8 @@
|
||||||
; >>>
|
; >>>
|
||||||
|
|
||||||
; cmp <<<
|
; cmp <<<
|
||||||
:hrsh7th/vim-vsnip {:lazy true}
|
:hrsh7th/vim-vsnip {}
|
||||||
:hrsh7th/vim-vsnip-integ {:lazy true}
|
:hrsh7th/vim-vsnip-integ {}
|
||||||
:rafamadriz/friendly-snippets {}
|
:rafamadriz/friendly-snippets {}
|
||||||
|
|
||||||
:hrsh7th/nvim-cmp {:lazy true
|
:hrsh7th/nvim-cmp {:lazy true
|
||||||
|
|
|
@ -15,6 +15,8 @@
|
||||||
:current_line_blame false
|
:current_line_blame false
|
||||||
:update_debounce 100})
|
:update_debounce 100})
|
||||||
|
|
||||||
|
(let [scrollbar-gitsigns (require "scrollbar.handlers.gitsigns")]
|
||||||
|
(scrollbar-gitsigns.setup))
|
||||||
|
|
||||||
(vim.cmd
|
(vim.cmd
|
||||||
(..
|
(..
|
||||||
|
@ -23,6 +25,10 @@
|
||||||
autocmd ColorScheme * :hi! GitSignsAdd gui='NONE' guibg='NONE' guifg='" colors.bright_aqua "'
|
autocmd ColorScheme * :hi! GitSignsAdd gui='NONE' guibg='NONE' guifg='" colors.bright_aqua "'
|
||||||
autocmd ColorScheme * :hi! GitSignsDelete gui='NONE' guibg='NONE' guifg='" colors.neutral_red "'
|
autocmd ColorScheme * :hi! GitSignsDelete gui='NONE' guibg='NONE' guifg='" colors.neutral_red "'
|
||||||
autocmd ColorScheme * :hi! GitSignsChange gui='NONE' guibg='NONE' guifg='" colors.bright_blue "'
|
autocmd ColorScheme * :hi! GitSignsChange gui='NONE' guibg='NONE' guifg='" colors.bright_blue "'
|
||||||
|
|
||||||
|
autocmd ColorScheme * :hi! ScrollbarGitAdd gui='NONE' guibg='NONE' guifg='" colors.bright_aqua "'
|
||||||
|
autocmd ColorScheme * :hi! ScrollbarGitDelete gui='NONE' guibg='NONE' guifg='" colors.neutral_red "'
|
||||||
|
autocmd ColorScheme * :hi! ScrollbarGitChange gui='NONE' guibg='NONE' guifg='" colors.bright_blue "'
|
||||||
augroup END
|
augroup END
|
||||||
"))
|
"))
|
||||||
;(utils.highlight :GitSignsAdd {:bg "NONE" :fg colors.bright_aqua})
|
;(utils.highlight :GitSignsAdd {:bg "NONE" :fg colors.bright_aqua})
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
:extensions {:ui-select [((. (require "telescope.themes") :get_dropdown))]}})
|
:extensions {:ui-select [((. (require "telescope.themes") :get_dropdown))]}})
|
||||||
|
|
||||||
(telescope.load_extension "dap")
|
(telescope.load_extension "dap")
|
||||||
(telescope.load_extension "ui-select")
|
;(telescope.load_extension "ui-select")
|
||||||
|
|
||||||
(utils.keymap :n :<C-p> ":Telescope find_files<CR>")
|
(utils.keymap :n :<C-p> ":Telescope find_files<CR>")
|
||||||
|
|
||||||
|
|
|
@ -48,6 +48,7 @@
|
||||||
"nvim-dap": { "branch": "master", "commit": "5a1479c5d633daa0db06988ed44663f07f10f5dd" },
|
"nvim-dap": { "branch": "master", "commit": "5a1479c5d633daa0db06988ed44663f07f10f5dd" },
|
||||||
"nvim-dap-ui": { "branch": "master", "commit": "b80227ea56a48177786904f6322abc8b2dc0bc36" },
|
"nvim-dap-ui": { "branch": "master", "commit": "b80227ea56a48177786904f6322abc8b2dc0bc36" },
|
||||||
"nvim-lspconfig": { "branch": "master", "commit": "8ebe6894dddaeb1459e1397c865f54fa5ecaac80" },
|
"nvim-lspconfig": { "branch": "master", "commit": "8ebe6894dddaeb1459e1397c865f54fa5ecaac80" },
|
||||||
|
"nvim-scrollbar": { "branch": "main", "commit": "6a2065fbcd032075a06d2ab54508b69842bc4496" },
|
||||||
"nvim-treesitter": { "branch": "master", "commit": "1c89f9b5bc885ff0e2b1cdb7ff40847784b1436b" },
|
"nvim-treesitter": { "branch": "master", "commit": "1c89f9b5bc885ff0e2b1cdb7ff40847784b1436b" },
|
||||||
"nvim-ts-context-commentstring": { "branch": "main", "commit": "4a42b30376c1bd625ab5016c2079631d531d797a" },
|
"nvim-ts-context-commentstring": { "branch": "main", "commit": "4a42b30376c1bd625ab5016c2079631d531d797a" },
|
||||||
"nvim-web-devicons": { "branch": "master", "commit": "6c38926351372ea87034dec26182b62c835ff3bc" },
|
"nvim-web-devicons": { "branch": "master", "commit": "6c38926351372ea87034dec26182b62c835ff3bc" },
|
||||||
|
@ -68,7 +69,6 @@
|
||||||
"tabular": { "branch": "master", "commit": "339091ac4dd1f17e225fe7d57b48aff55f99b23a" },
|
"tabular": { "branch": "master", "commit": "339091ac4dd1f17e225fe7d57b48aff55f99b23a" },
|
||||||
"targets.vim": { "branch": "master", "commit": "8d6ff2984cdfaebe5b7a6eee8f226a6dd1226f2d" },
|
"targets.vim": { "branch": "master", "commit": "8d6ff2984cdfaebe5b7a6eee8f226a6dd1226f2d" },
|
||||||
"telescope-dap.nvim": { "branch": "master", "commit": "313d2ea12ae59a1ca51b62bf01fc941a983d9c9c" },
|
"telescope-dap.nvim": { "branch": "master", "commit": "313d2ea12ae59a1ca51b62bf01fc941a983d9c9c" },
|
||||||
"telescope-ui-select.nvim": { "branch": "master", "commit": "62ea5e58c7bbe191297b983a9e7e89420f581369" },
|
|
||||||
"telescope.nvim": { "branch": "master", "commit": "b69b33eded07341253bc1f0b4ae6bbc5c411a2ab" },
|
"telescope.nvim": { "branch": "master", "commit": "b69b33eded07341253bc1f0b4ae6bbc5c411a2ab" },
|
||||||
"todo-comments.nvim": { "branch": "main", "commit": "077c59586d9d0726b0696dc5680eb863f4e04bc5" },
|
"todo-comments.nvim": { "branch": "main", "commit": "077c59586d9d0726b0696dc5680eb863f4e04bc5" },
|
||||||
"trouble.nvim": { "branch": "main", "commit": "83ec606e7065adf134d17f4af6bae510e3c491c1" },
|
"trouble.nvim": { "branch": "main", "commit": "83ec606e7065adf134d17f4af6bae510e3c491c1" },
|
||||||
|
@ -96,7 +96,7 @@
|
||||||
"vim-visual-multi": { "branch": "master", "commit": "724bd53adfbaf32e129b001658b45d4c5c29ca1a" },
|
"vim-visual-multi": { "branch": "master", "commit": "724bd53adfbaf32e129b001658b45d4c5c29ca1a" },
|
||||||
"vim-vsnip": { "branch": "master", "commit": "8dde8c0ef10bb1afdbb301e2bd7eb1c153dd558e" },
|
"vim-vsnip": { "branch": "master", "commit": "8dde8c0ef10bb1afdbb301e2bd7eb1c153dd558e" },
|
||||||
"vim-vsnip-integ": { "branch": "master", "commit": "1cf89903f12777b90dd79eb4b3d7fbc0b9a254a1" },
|
"vim-vsnip-integ": { "branch": "master", "commit": "1cf89903f12777b90dd79eb4b3d7fbc0b9a254a1" },
|
||||||
"vimtex": { "branch": "master", "commit": "bd0173e7d3c0097c5b855265ce83f5863f073c85" },
|
"vimtex": { "branch": "master", "commit": "57da13348bce93dda80d4d4494db42e07c96b018" },
|
||||||
"webapi-vim": { "branch": "master", "commit": "70c49ada7827d3545a65cbdab04c5c89a3a8464e" },
|
"webapi-vim": { "branch": "master", "commit": "70c49ada7827d3545a65cbdab04c5c89a3a8464e" },
|
||||||
"which-key.nvim": { "branch": "main", "commit": "e4fa445065a2bb0bbc3cca85346b67817f28e83e" },
|
"which-key.nvim": { "branch": "main", "commit": "e4fa445065a2bb0bbc3cca85346b67817f28e83e" },
|
||||||
"yats.vim": { "branch": "master", "commit": "4bf3879055847e675335f1c3050bd2dd11700c7e" },
|
"yats.vim": { "branch": "master", "commit": "4bf3879055847e675335f1c3050bd2dd11700c7e" },
|
||||||
|
|
|
@ -48,6 +48,7 @@ zinit wait lucid for \
|
||||||
"zsh-users/zsh-autosuggestions" \
|
"zsh-users/zsh-autosuggestions" \
|
||||||
"olets/zsh-abbr" \
|
"olets/zsh-abbr" \
|
||||||
"sudosubin/zsh-github-cli" \
|
"sudosubin/zsh-github-cli" \
|
||||||
|
"wfxr/forgit" \
|
||||||
"pkulev/zsh-rustup-completion"
|
"pkulev/zsh-rustup-completion"
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue