From 945eddd33eebfc41b4dfccabb60ca122b2315d79 Mon Sep 17 00:00:00 2001
From: elkowar <5300871+elkowar@users.noreply.github.com>
Date: Thu, 6 May 2021 19:35:35 +0200
Subject: [PATCH] some stuff

---
 files/.config/nvim/fnl/init.fnl        | 27 +++++++++++++-------------
 files/.config/nvim/fnl/macros.fnl      |  6 +++---
 files/.config/nvim/fnl/plugins/lsp.fnl | 12 ++++++------
 files/.config/nvim/init.vim            |  1 +
 files/.config/nvim/plugins.lua         |  5 +++++
 5 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/files/.config/nvim/fnl/init.fnl b/files/.config/nvim/fnl/init.fnl
index 09bd5da..37c6109 100644
--- a/files/.config/nvim/fnl/init.fnl
+++ b/files/.config/nvim/fnl/init.fnl
@@ -1,28 +1,27 @@
 (module init 
-  {require {a aniseed.core
-            fennel aniseed.fennel
-            nvim aniseed.nvim
+  {require {utils utils
             str aniseed.string
-            kb keybinds
-            utils utils}
+            nvim aniseed.nvim
+            a aniseed.core
+            fennel aniseed.fennel}
    require-macros [macros]})
 
 (macro make-errors-epic [f]
   `(xpcall #,f #(a.println (fennel.traceback $1))))
 
 (make-errors-epic (require "plugins.lsp"))
+(make-errors-epic (require "keybinds"))
 
-(when (utils.plugin-installed? :telescope.nvim)
+(pkg telescope.nvim []
   (make-errors-epic (require "plugins.telescope")))
-(when (utils.plugin-installed? :galaxyline.nvim)
+(pkg galaxyline.nvim []
   (make-errors-epic (require "plugins.galaxyline")))
-(when (utils.plugin-installed? :nvim-bufferline.lua)
+(pkg nvim-bufferline.lua []
   (make-errors-epic (require "plugins.bufferline")))
 
-
 (def- colors utils.colors)
 
-(when (utils.plugin-installed? :conjure)
+(pkg conjure []
   (set vim.g.conjure#client#fennel#aniseed#aniseed_module_prefix "aniseed."))
 
 ; Colors  ------------------------------------------------------- foldstart
@@ -38,7 +37,7 @@
 ; Treesitter  ------------------------------------------------------- foldstart
 
 
-(pkg :nvim-treesitter [configs (require "nvim-treesitter.configs")]
+(pkg nvim-treesitter [configs (require "nvim-treesitter.configs")]
   (configs.setup 
     {:ensure_installed "all" 
      :highlight {:enable true
@@ -67,7 +66,7 @@
 
 ; gitsigns.nvim ------------------------------------------------------- foldstart
 ; https://github.com/lewis6991/gitsigns.nvim
-(pkg :gitsigns.nvim [gitsigns (require "gitsigns")]
+(pkg gitsigns.nvim [gitsigns (require "gitsigns")]
   (gitsigns.setup
     {:signs {:add {:text "▍"}
              :change {:text "▍"}
@@ -86,8 +85,8 @@
 ; foldend
 
 ; :: diffview  ------------------------------------------------------------------- foldstart
-(pkg :diffview.nvim [diffview (require "diffview")
-                     cb (. (require "diffview.config") :diffview_callback)]
+(pkg diffview.nvim [diffview (require "diffview")
+                    cb (. (require "diffview.config") :diffview_callback)]
   (diffview.setup
    {:diff_binaries false
     :file_panel {:width 35 
diff --git a/files/.config/nvim/fnl/macros.fnl b/files/.config/nvim/fnl/macros.fnl
index 080799a..335e0ca 100644
--- a/files/.config/nvim/fnl/macros.fnl
+++ b/files/.config/nvim/fnl/macros.fnl
@@ -26,9 +26,9 @@
 
  :pkg
  (fn [name mappings ...]
-   `(if (~= nil (. packer_plugins ,name))
-      (let ,mappings ,...)
-      (print (.. "plugin disabled " ,name))))}
+   (if (~= nil (. packer_plugins `,(tostring name)))
+       `(let ,mappings ,...)
+       (print (.. "plugin disabled " `,(tostring name)))))}
 
 
 
diff --git a/files/.config/nvim/fnl/plugins/lsp.fnl b/files/.config/nvim/fnl/plugins/lsp.fnl
index d7a6faa..73c4101 100644
--- a/files/.config/nvim/fnl/plugins/lsp.fnl
+++ b/files/.config/nvim/fnl/plugins/lsp.fnl
@@ -10,14 +10,14 @@
 
 (def- colors utils.colors)
 
-(pkg :symbols-outline.nvim [symbols-outline (require "symbols-outline")]
+(pkg symbols-outline.nvim [symbols-outline (require "symbols-outline")]
   (symbols-outline.setup { :highlight_hovered_item true :show_guides true}))
 
 
 ; LSP config -------------------------------------------------------------------------------- <<<<<
 
 (fn on_attach [client bufnr]
-  (pkg :lsp_signature.nvim [lsp_signature (require "lsp_signature")]
+  (pkg lsp_signature.nvim [lsp_signature (require "lsp_signature")]
     (lsp_signature.on_attach))
 
   (if client.resolved_capabilities.document_highlight
@@ -71,7 +71,7 @@
 ; >>>>>
 
 ; compe -------------------------------------------------------------------------------- <<<<<
-(pkg :nvim-compe [compe (require "compe")]
+(pkg nvim-compe [compe (require "compe")]
   (compe.setup 
    {:enabled true
     :autocomplete false
@@ -96,7 +96,7 @@
 ; >>>>>
 
 ; LSP saga  -------------------------------------------------------------------------------- <<<<<
-(pkg :lspsaga.nvim [saga (require "lspsaga")]
+(pkg lspsaga.nvim [saga (require "lspsaga")]
   (saga.init_lsp_saga 
     {:border_style "single" ; single double round plus
      :code_action_prompt {:enable true
@@ -142,7 +142,7 @@
 ; >>>>>
 
 ; LSP trouble -------------------------------------------------------------------------------- <<<<<
-(pkg :lsp-trouble.nvim [trouble (require "trouble")]
+(pkg lsp-trouble.nvim [trouble (require "trouble")]
   (trouble.setup
    {:icons false
     :auto_preview true
@@ -170,7 +170,7 @@
 
 ; >>>>>
 
-(pkg :rust-tools.nvim [rust-tools (require "rust-tools")]
+(pkg rust-tools.nvim [rust-tools (require "rust-tools")]
   (rust-tools.setup { :tools { :inlay_hints { :show_parameter_hints false}}}))
 
 (set vim.o.signcolumn "yes")
diff --git a/files/.config/nvim/init.vim b/files/.config/nvim/init.vim
index e4365d9..f6d8066 100644
--- a/files/.config/nvim/init.vim
+++ b/files/.config/nvim/init.vim
@@ -252,6 +252,7 @@ hi SignifySignAdd    cterm=NONE gui=NONE guifg='#8ec07c'
 "source $VIM_ROOT/whichkeyConfig.vim
 
 let g:aniseed#env = v:true
+"let g:aniseed#env = { "compile": v:false }
 
 "let g:lexima_no_default_rules = v:true
 "call lexima#set_default_rules()
diff --git a/files/.config/nvim/plugins.lua b/files/.config/nvim/plugins.lua
index 99f8733..57a439f 100644
--- a/files/.config/nvim/plugins.lua
+++ b/files/.config/nvim/plugins.lua
@@ -98,6 +98,11 @@ require("packer").startup(function(use)
   use "honza/vim-snippets"
   use "tommcdo/vim-exchange"
   use "kien/rainbow_parentheses.vim"
+
+  --use {
+    --"eraserhd/parinfer-rust",
+    --run = "cargo build --release"
+  --}
   use "bhurlow/vim-parinfer"