From e208d038e956e79402144dafcee2022c8aa56e2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= <es.ensar@gmail.com>
Date: Wed, 4 May 2022 14:06:58 +0200
Subject: [PATCH] Migrate to conjure instead of fireplace.vim

---
 symlinks/config/nvim/after/ftplugin/clojure.vim   |  9 ---------
 symlinks/config/nvim/after/plugin/testing.vim     | 14 --------------
 symlinks/config/nvim/init.lua                     |  1 +
 symlinks/config/nvim/lua/esensar/init/options.lua |  2 +-
 symlinks/config/nvim/lua/esensar/init/plugins.lua |  4 ++--
 symlinks/config/nvim/plugin/sexp.lua              |  3 +++
 6 files changed, 7 insertions(+), 26 deletions(-)
 delete mode 100644 symlinks/config/nvim/after/plugin/testing.vim
 create mode 100644 symlinks/config/nvim/plugin/sexp.lua

diff --git a/symlinks/config/nvim/after/ftplugin/clojure.vim b/symlinks/config/nvim/after/ftplugin/clojure.vim
index 621312c..fa15b9a 100644
--- a/symlinks/config/nvim/after/ftplugin/clojure.vim
+++ b/symlinks/config/nvim/after/ftplugin/clojure.vim
@@ -1,11 +1,2 @@
 setlocal ts=2 sts=2 sw=2 expandtab autoindent
 let b:undo_ftplugin .= '|setlocal ts< sts< sw< expandtab< autoindent<'
-
-function s:FireplaceStartAndConnect()
-	let port = luaeval('math.random(35000, 39999)')
-	silent execute "Dispatch lein repl :start :port " . l:port
-	sleep 3
-	execute "FireplaceConnect nrepl://localhost:" . l:port
-endfunction
-
-command! -nargs=0 FireplaceStartLeinRepl call <SID>FireplaceStartAndConnect()
diff --git a/symlinks/config/nvim/after/plugin/testing.vim b/symlinks/config/nvim/after/plugin/testing.vim
deleted file mode 100644
index 64350b4..0000000
--- a/symlinks/config/nvim/after/plugin/testing.vim
+++ /dev/null
@@ -1,14 +0,0 @@
-" -----------------------------------------------------------------------------
-"     - Vim-test and general testing config -
-" -----------------------------------------------------------------------------
-
-" make test commands execute using dispatch.vim
-let test#strategy = "dispatch"
-let test#csharp#runner = "dotnettest"
-
-" Map test running commands
-nmap <silent> <Leader>tn :TestNearest<CR>
-nmap <silent> <Leader>tf :TestFile<CR>
-nmap <silent> <Leader>ts :TestSuite<CR>
-nmap <silent> <Leader>tl :TestLast<CR>
-nmap <silent> <Leader>tg :TestVisit<CR>
diff --git a/symlinks/config/nvim/init.lua b/symlinks/config/nvim/init.lua
index 24cf189..43f0285 100644
--- a/symlinks/config/nvim/init.lua
+++ b/symlinks/config/nvim/init.lua
@@ -14,6 +14,7 @@ vim.api.nvim_exec('let $VIMPLUGINS = expand($VIMHOME."/lua/personal/plugins.lua"
 
 -- Leader config to <Space>
 vim.g.mapleader = " "
+vim.g.maplocalleader = " "
 
 require("esensar.init.plugins")
 
diff --git a/symlinks/config/nvim/lua/esensar/init/options.lua b/symlinks/config/nvim/lua/esensar/init/options.lua
index 88b2f3f..6beaa7f 100644
--- a/symlinks/config/nvim/lua/esensar/init/options.lua
+++ b/symlinks/config/nvim/lua/esensar/init/options.lua
@@ -26,7 +26,7 @@ opt.showcmd = true -- Display incomplete commands
 opt.incsearch = true -- Do incremental searching
 opt.autoread = true -- Reload files changed outside
 opt.hidden = true -- Allow leaving unsaved buffers
-opt.inccommand = "nosplit" -- Enable live preview of text replacement
+opt.inccommand = "split" -- Enable live preview of text replacement
 opt.hlsearch = true
 opt.mouse = "a"
 
diff --git a/symlinks/config/nvim/lua/esensar/init/plugins.lua b/symlinks/config/nvim/lua/esensar/init/plugins.lua
index afd18b8..d1d38f4 100644
--- a/symlinks/config/nvim/lua/esensar/init/plugins.lua
+++ b/symlinks/config/nvim/lua/esensar/init/plugins.lua
@@ -51,8 +51,8 @@ return require("packer").startup({
 		-- Language support
 		use("tpope/vim-rails") -- Enables all rails command through vim and integrates with projectionist
 		use("c-brenn/phoenix.vim") -- Similar to vim-rails, but for phoenix
-		use("tpope/vim-salve") -- Clojure integration with projectionist
-		use("tpope/vim-fireplace") -- Clojure REPL and integration
+		use("Olical/conjure") -- Lisp languages REPL integration
+		use("Olical/aniseed") -- Fennel nvim support
 		use("vimwiki/vimwiki") -- Vimwiki - personal wiki in vim
 		use("esensar/vimwiki-reviews-lua") -- Vimwiki extension for periodic reviews
 		use("ledger/vim-ledger") -- Support for ledger-cli format
diff --git a/symlinks/config/nvim/plugin/sexp.lua b/symlinks/config/nvim/plugin/sexp.lua
new file mode 100644
index 0000000..12ff442
--- /dev/null
+++ b/symlinks/config/nvim/plugin/sexp.lua
@@ -0,0 +1,3 @@
+-- Vim-sexp config
+
+vim.g.sexp_filetypes = "clojure,scheme,lisp,timl,fennel,janet,hy,racket"