ElKowar/dots-of-war
1
0
Fork 0
mirror of https://github.com/elkowar/dots-of-war.git synced 2024-12-25 05:42:22 +00:00
Code Issues 1 Projects 1 Releases Packages Wiki Activity

difffview

Browse source
This commit is contained in:
elkowar 2021-05-02 12:32:09 +02:00
parent 444fa36714
commit f491331410
2 changed files with 31 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
files/.config/nvim/fnl/init.fnl
View file

@ -7,7 +7,6 @@
utils utils utils utils
nvim-treesitter-configs nvim-treesitter.configs nvim-treesitter-configs nvim-treesitter.configs
gitsigns gitsigns} gitsigns gitsigns}
;nvim-biscuits nvim-biscuits}
require-macros [macros]}) require-macros [macros]})
(require "plugins.telescope") (require "plugins.telescope")
@ -21,7 +20,8 @@
(set vim.g.conjure#client#fennel#aniseed#aniseed_module_prefix "aniseed.") (set vim.g.conjure#client#fennel#aniseed#aniseed_module_prefix "aniseed.")
; Treesitter ------------------------------------------------------- <<<<< ; Treesitter ------------------------------------------------------- foldstart
(nvim-treesitter-configs.setup (nvim-treesitter-configs.setup
{ :ensure_installed "all" { :ensure_installed "all"
:highlight { :enable true :highlight { :enable true
@ -46,9 +46,9 @@
;(nvim-biscuits.setup {} ;(nvim-biscuits.setup {}
;{ :on_events ["InsertLeave" "CursorHoldI"]}) ;{ :on_events ["InsertLeave" "CursorHoldI"]})
; >>>>> ; foldend
; gitsigns.nvim ------------------------------------------------------- <<<<< ; gitsigns.nvim ------------------------------------------------------- foldstart
; https://github.com/lewis6991/gitsigns.nvim ; https://github.com/lewis6991/gitsigns.nvim
(gitsigns.setup (gitsigns.setup
{:signs {:add {:text "▍"} {:signs {:add {:text "▍"}
@ -65,11 +65,23 @@
(utils.highlight "GitSignsDelete" {:bg "NONE" :fg colors.neutral_red}) (utils.highlight "GitSignsDelete" {:bg "NONE" :fg colors.neutral_red})
(utils.highlight "GitSignsChange" {:bg "NONE" :fg colors.bright_blue}) (utils.highlight "GitSignsChange" {:bg "NONE" :fg colors.bright_blue})
; >>>>> ; foldend
; :: diffview ------------------------------------------------------------------- foldstart
(let [diffview (require "diffview")
cb (. (require "diffview.config") :diffview_callback)]
(diffview.setup
{:diff_binaries false
:file_panel {:width 35
:use_icons false}
:key_bindings {:view {:<leader>dn (cb "select_next_entry")
:<leader>dp (cb "select_prev_entry")
:<leader>dd (cb "toggle_files")}}}))
; " :: and _ as space ------------------------------------------------------------------- <<<<< ; foldend
; :: and _ as space ------------------------------------------------------------------- foldstart
(var remapped-space nil) (var remapped-space nil)
(fn _G.RebindShit [newKey] (fn _G.RebindShit [newKey]
(set remapped-space {:old (vim.fn.maparg :<Space> :i) (set remapped-space {:old (vim.fn.maparg :<Space> :i)
@ -95,6 +107,6 @@
(utils.keymap :i "<Tab>k" "<space><C-o>:call v:lua.RebindShit('::')<CR>") (utils.keymap :i "<Tab>k" "<space><C-o>:call v:lua.RebindShit('::')<CR>")
(utils.keymap :n "ö" "a") (utils.keymap :n "ö" "a")
; >>>>> ; foldend
; vim:foldmarker=<<<<<,>>>>> ; vim:foldmarker=foldstart,foldend

2
files/.config/nvim/plugins.lua
View file

@ -35,6 +35,8 @@ require("packer").startup(function(use)
use "folke/which-key.nvim" use "folke/which-key.nvim"
use "folke/lsp-trouble.nvim" use "folke/lsp-trouble.nvim"
use "sindrets/diffview.nvim"
-- better quickfix window -- better quickfix window
--use "kevinhwang91/nvim-bqf" --use "kevinhwang91/nvim-bqf"