add gitsigns

files/.config/configstore/nodemon.json

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

files/.config/configstore/update-notifier-npm.json

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

files/.config/nvim/fnl/init.fnl

@@ -4,8 +4,9 @@
             nvim aniseed.nvim 
             kb keybinds 
             utils utils
-            nvim-treesitter-configs nvim-treesitter.configs}
-            ;gitsigns gitsigns}
+            nvim-treesitter-configs nvim-treesitter.configs
+            gitsigns gitsigns}
+            ;nvim-biscuits nvim-biscuits}
     require-macros [macros]})
 
 (require "plugins.telescope")
@@ -33,26 +34,32 @@
                    :scope_incremental "gsj"
                    :scope_decremental "gsk"}}
 
-    :rainbow { :enable true
-               :extended_mode true}
+    ; disabled due to it fucking with gitsigns.nvim
+    ;:rainbow { :enable true
+               ;:extended_mode 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
-;(gitsigns.setup
-  ;{ :signs { :add {:text "▍"}
-             ;:change {:text "▍"}
-             ;:delete {:text "▍"}
-             ;:topdelete {:text "▍"}
-             ;:changedelete {:text "▍"}}}
-  ;{ :keymaps {  :noremap true :buffer true}
-    ;:current_line_blame false})
+(gitsigns.setup
+  { :signs { :add {:text "▍"}
+             :change {:text "▍"}
+             :delete {:text "▍"}
+             :topdelete {:text "▍"}
+             :changedelete {:text "▍"}}
+    :keymaps { :noremap true 
+               :buffer (do (a.println "TESTTESTTEST")
+                           true)}
+    :current_line_blame false})
 
-;(utils.highlight "GitSignsAdd"    {:bg "NONE" :fg colors.bright_aqua})
-;(utils.highlight "GitSignsDelete" {:bg "NONE" :fg colors.neutral_red})
-;(utils.highlight "GitSignsChange" {:bg "NONE" :fg colors.bright_blue})
+(utils.highlight "GitSignsAdd"    {:bg "NONE" :fg colors.bright_aqua})
+(utils.highlight "GitSignsDelete" {:bg "NONE" :fg colors.neutral_red})
+(utils.highlight "GitSignsChange" {:bg "NONE" :fg colors.bright_blue})
 
 ; >>>>>
 

files/.config/nvim/fnl/plugins/lsp.fnl

@@ -61,6 +61,7 @@
 (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 :hls           { :settings { :languageServerHaskell { :formattingProvider "stylish-haskell"}}})
+(init-lsp :ocamllsp)
 (init-lsp :vimls)
 (init-lsp :bashls)
 (init-lsp :erlangls)
@@ -157,12 +158,11 @@
 
 ; >>>>>
 
-
 ; 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")
 

files/.config/nvim/plugins.lua

@@ -59,8 +59,8 @@ require("packer").startup(function(use)
     cmd = "Goyo",
   }
 
- use "mhinz/vim-signify"
-  --use "lewis6991/gitsigns.nvim"
+  use "mhinz/vim-signify"
+  use "lewis6991/gitsigns.nvim"
 
   use "tpope/vim-fugitive"
   use "preservim/nerdcommenter"

files/nix-stuff/nixpkgs/modules/term/zsh/default.nix

@@ -93,7 +93,6 @@ let
     #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'
 
-
   '';
 
 in
@@ -153,6 +152,7 @@ in
     '';
 
     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=0"'