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

add gitsigns

Browse source
This commit is contained in:
elkowar 2021-05-01 12:01:13 +02:00
parent cc6754014a
commit bfd8def726
6 changed files with 32 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
files/.config/configstore/nodemon.json Normal file
View file

@ -0,0 +1,3 @@
{
"lastCheck": 1619814354426
}

2
files/.config/configstore/update-notifier-npm.json
View file

@ -1,4 +1,4 @@
{ {
"optOut": false, "optOut": false,
"lastUpdateCheck": 1619546337423 "lastUpdateCheck": 1619802461034
} }

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

@ -4,8 +4,9 @@
nvim aniseed.nvim nvim aniseed.nvim
kb keybinds kb keybinds
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")
@ -33,26 +34,32 @@
:scope_incremental "gsj" :scope_incremental "gsj"
:scope_decremental "gsk"}} :scope_decremental "gsk"}}
:rainbow { :enable true ; disabled due to it fucking with gitsigns.nvim
:extended_mode true} ;:rainbow { :enable true
;:extended_mode true}
:context_commentstring { :enable true}}) :context_commentstring { :enable true}})
;(nvim-biscuits.setup {}
;{ :on_events ["InsertLeave" "CursorHoldI"]})
; gitsigns.nvim - inactive due to weird issue with keybinds not being removable <<<<<
; gitsigns.nvim ------------------------------------------------------- <<<<<
; https://github.com/lewis6991/gitsigns.nvim ; https://github.com/lewis6991/gitsigns.nvim
;(gitsigns.setup (gitsigns.setup
;{ :signs { :add {:text "▍"} { :signs { :add {:text "▍"}
;:change {:text "▍"} :change {:text "▍"}
;:delete {:text "▍"} :delete {:text "▍"}
;:topdelete {:text "▍"} :topdelete {:text "▍"}
;:changedelete {:text "▍"}}} :changedelete {:text "▍"}}
;{ :keymaps { :noremap true :buffer true} :keymaps { :noremap true
;:current_line_blame false}) :buffer (do (a.println "TESTTESTTEST")
true)}
:current_line_blame false})
;(utils.highlight "GitSignsAdd" {:bg "NONE" :fg colors.bright_aqua}) (utils.highlight "GitSignsAdd" {:bg "NONE" :fg colors.bright_aqua})
;(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})
; >>>>> ; >>>>>

4
files/.config/nvim/fnl/plugins/lsp.fnl
View file

@ -61,6 +61,7 @@
(init-lsp :jsonls { :commands { :Format [ #(vim.lsp.buf.range_formatting [] [0 0] [(vim.fn.line "$") 0])]}}) (init-lsp :jsonls { :commands { :Format [ #(vim.lsp.buf.range_formatting [] [0 0] [(vim.fn.line "$") 0])]}})
(init-lsp :denols { :root_dir (better_root_pattern [".git"] ["package.json"])}) (init-lsp :denols { :root_dir (better_root_pattern [".git"] ["package.json"])})
(init-lsp :hls { :settings { :languageServerHaskell { :formattingProvider "stylish-haskell"}}}) (init-lsp :hls { :settings { :languageServerHaskell { :formattingProvider "stylish-haskell"}}})
(init-lsp :ocamllsp)
(init-lsp :vimls) (init-lsp :vimls)
(init-lsp :bashls) (init-lsp :bashls)
(init-lsp :erlangls) (init-lsp :erlangls)
@ -157,12 +158,11 @@
; >>>>> ; >>>>>
; Empty template -------------------------------------------------------------------------------- <<<<< ; Empty template -------------------------------------------------------------------------------- <<<<<
; >>>>> ; >>>>>
(rust-tools.setup { :inlay_hints { :show_parameter_hints false}}) (rust-tools.setup { :tools { :inlay_hints { :show_parameter_hints false}}})
(set vim.o.signcolumn "yes") (set vim.o.signcolumn "yes")

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

@ -60,7 +60,7 @@ require("packer").startup(function(use)
} }
use "mhinz/vim-signify" use "mhinz/vim-signify"
--use "lewis6991/gitsigns.nvim" use "lewis6991/gitsigns.nvim"
use "tpope/vim-fugitive" use "tpope/vim-fugitive"
use "preservim/nerdcommenter" use "preservim/nerdcommenter"

2
files/nix-stuff/nixpkgs/modules/term/zsh/default.nix
View file

@ -93,7 +93,6 @@ let
#zstyle ':fzf-tab:complete:ls:*' extra-opts --preview=$extract'exa --icons -1 --color=always $realpath' #zstyle ':fzf-tab:complete:ls:*' extra-opts --preview=$extract'exa --icons -1 --color=always $realpath'
#zstyle ':fzf-tab:complete:*:*' extra-opts --preview=$extract'if [ -f $realpath ]; then bat -p --color=always $realpath; else exa --icons -1 --color=always $realpath; fi' #zstyle ':fzf-tab:complete:*:*' extra-opts --preview=$extract'if [ -f $realpath ]; then bat -p --color=always $realpath; else exa --icons -1 --color=always $realpath; fi'
''; '';
in in
@ -153,6 +152,7 @@ in
''; '';
initExtra = '' initExtra = ''
eval $(opam env)
export MANPAGER='nvim +Man! +"set nocul" +"set noshowcmd" +"set noruler" +"set noshowmode" +"set laststatus=2" +"set statusline=\ %t"' export MANPAGER='nvim +Man! +"set nocul" +"set noshowcmd" +"set noruler" +"set noshowmode" +"set laststatus=2" +"set statusline=\ %t"'
export MANPAGER='nvim +Man! +"set nocul" +"set noshowcmd" +"set noruler" +"set noshowmode" +"set laststatus=0"' export MANPAGER='nvim +Man! +"set nocul" +"set noshowcmd" +"set noruler" +"set noshowmode" +"set laststatus=0"'