From 9aa3dd7cb776482d85015e5da42027161b509b84 Mon Sep 17 00:00:00 2001
From: Jovan Djokic-Sumarac <sumarac@protonmail.com>
Date: Tue, 16 Jul 2024 16:22:53 +0200
Subject: [PATCH] replace nvim api commands with hibiscus macros

---
 fnl/options/colors.fnl |  5 ++++-
 fnl/options/opts.fnl   | 36 +++++++++++++++++++++++++++++++++++-
 fnl/plugins/lazy.fnl   |  2 ++
 init.fnl               | 32 --------------------------------
 4 files changed, 41 insertions(+), 34 deletions(-)

diff --git a/fnl/options/colors.fnl b/fnl/options/colors.fnl
index fe3901e..eed4adf 100644
--- a/fnl/options/colors.fnl
+++ b/fnl/options/colors.fnl
@@ -1 +1,4 @@
-(vim.cmd "colorscheme carbonfox")
+(import-macros {: set! : exec!} :hibiscus.vim)
+
+(set! background :dark)
+(exec! [colorscheme carbonfox])
diff --git a/fnl/options/opts.fnl b/fnl/options/opts.fnl
index 1ca36e2..0956cd3 100644
--- a/fnl/options/opts.fnl
+++ b/fnl/options/opts.fnl
@@ -1,4 +1,4 @@
-(import-macros {: set!} :hibiscus.vim)
+(import-macros {: set! : g!} :hibiscus.vim)
 
 (set! number true)			; enable line number
 (set! relativenumber true) 	; enable relative line number
@@ -37,3 +37,37 @@
 (set! signcolumn :yes:1)
 (set! shell :/bin/zsh)
 (set! splitright false)
+
+
+; Skip loading of following neovim builtins
+(local default_plugins {
+	:2html_plugin
+	:getscript
+	:getscriptPlugin
+	:gzip
+	:logipat
+	:netrw
+	:netrwPlugin
+	:netrwSettings
+	:netrwFileHandlers
+	:matchit
+	:tar
+	:tarPlugin
+	:rrhelper
+	:spellfile_plugin
+	:vimball
+	:vimballPlugin
+	:zip
+	:zipPlugin
+	:tutor
+	:rplugin
+	:syntax
+	:synmenu
+	:optwin
+	:compiler
+	:bugreport
+	:ftplugin })
+
+(each [_ plug (ipairs default_plugins)]
+	(g! (.. :loaded plug) 1))
+
diff --git a/fnl/plugins/lazy.fnl b/fnl/plugins/lazy.fnl
index 825d1ba..74e73a7 100755
--- a/fnl/plugins/lazy.fnl
+++ b/fnl/plugins/lazy.fnl
@@ -12,6 +12,8 @@
 
 (lazy.setup [
 	:EdenEast/nightfox.nvim
+	:nyoom-engineering/oxocarbon.nvim
+
 	:lambdalisue/nerdfont.vim
 	:gelguy/wilder.nvim
 
diff --git a/init.fnl b/init.fnl
index 2925c4c..ef74604 100644
--- a/init.fnl
+++ b/init.fnl
@@ -22,38 +22,6 @@
 	(g! neovide_cursor_animate_in_insert_mode true)
 	(g! neovide_cursor_vfx_mode "ripple")))
 
-; Skip loading of following neovim builtins
-(local default_plugins {
-	:2html_plugin
-	:getscript
-	:getscriptPlugin
-	:gzip
-	:logipat
-	:netrw
-	:netrwPlugin
-	:netrwSettings
-	:netrwFileHandlers
-	:matchit
-	:tar
-	:tarPlugin
-	:rrhelper
-	:spellfile_plugin
-	:vimball
-	:vimballPlugin
-	:zip
-	:zipPlugin
-	:tutor
-	:rplugin
-	:syntax
-	:synmenu
-	:optwin
-	:compiler
-	:bugreport
-	:ftplugin })
-
-(each [id plug (ipairs default_plugins)]
-	(g! (.. :loaded plug) 1))
-
 
 (require :plugins)
 (require :options)