fennel-ify neovim

nvim/fnl/config/core.fnl

@@ -0,0 +1,11 @@
+(module config.core
+  {autoload {nvim aniseed.nvim}})
+
+(set nvim.o.termguicolors true)
+(set nvim.o.list true)
+(set nvim.o.spell true)
+(set nvim.o.wildmenu true)
+(set nvim.o.wildmode "list:longest,full")
+(set nvim.o.mouse "a")
+(set nvim.o.updatetime 500)
+(set nvim.o.sessionoptions "blank,curdir,folds,help,tabpages,winsize")

nvim/fnl/config/init.fnl

@@ -0,0 +1,4 @@
+(module config.init
+  {require [config.core
+            config.mapping
+	    config.plugin]})

nvim/fnl/config/mapping.fnl

@@ -0,0 +1,27 @@
+(module config.mapping
+  {autoload {nvim aniseed.nvim
+             nu aniseed.nvim.util
+             core aniseed.core}})
+
+(defn- noremap [mode from to]
+  "Sets a mapping with {:noremap true}"
+  (nvim.set_keymap mode from to {:noremap true}))
+
+(set nvim.g.mapleader " ")
+(set nvim.g.maplocalleader ",")
+
+(set nvim.o.signcolumn "yes")
+
+(noremap :n :<leader>u ":UndotreeToggle<cr>")
+
+(noremap :n :<leader>h :<c-w><c-h>)
+(noremap :n :<leader>j :<c-w><c-j>)
+(noremap :n :<leader>k :<c-w><c-k>)
+(noremap :n :<leader>l :<c-w><c-l>)
+(noremap :n :<c-k> :<c-u>)
+(noremap :n :<c-j> :<c-d>)
+(noremap :v :<c-k> :<c-u>)
+(noremap :v :<c-j> :<c-d>)
+
+(nvim.set_keymap :v :v ":<C-U>call expand_region#next('v', '+')<CR>" {})
+(nvim.set_keymap :v :<c-v> ":<C-U>call expand_region#next('v', '-')<CR>" {})

nvim/fnl/config/module/core.fnl

@@ -0,0 +1,12 @@
+(local nvim (require :aniseed.nvim))
+
+;; Generic Neovim configuration.
+(set nvim.o.termguicolors true)
+(set nvim.o.list true)
+(set nvim.o.spell true)
+(set nvim.o.wildmenu true)
+(set nvim.o.wildmode "list:longest,full")
+(set nvim.o.mouse "a")
+(set nvim.o.updatetime 500)
+(set nvim.o.sessionoptions "blank,curdir,folds,help,tabpages,winsize")
+;; (nvim.colorscheme "base16-oceanicnext")

nvim/fnl/config/module/plugin.fnl

@@ -0,0 +1,79 @@
+(local nvim (require :aniseed.nvim))
+(local core (require :aniseed.core))
+(local util (require :config.util))
+
+(lambda plug [coord ?opts]
+  "Defines a plugin through vim-plug."
+  (if (= opts nil) 
+    (nvim.fn.plug# coord)
+    (nvim.fn.plug# coord opts)))
+
+(fn known-plugin? [candidate]
+  "Returns true if the given name can be found within any of the required
+  plugin names. So `deoplete` would match `deoplete.nvim`."
+  (or (. nvim.g.plugs candidate)
+      (->> (core.keys nvim.g.plugs)
+           (core.some
+             (fn [plug-name]
+               (plug-name:find candidate 1 true))))))
+
+;; Set up vim-plug, like in init.vim earlier.
+(nvim.fn.plug#begin (.. (nvim.fn.stdpath "data") "/plugged"))
+
+;; This is in init.vim but if it's not here too sync.sh will delete it.
+; (plug "Olical/aniseed")
+(plug "Olical/aniseed" {:branch :develop})
+
+(plug "inkarkat/vim-ReplaceWithRegister")
+(plug "chriskempson/base16-vim")
+
+;; LSP Stuff
+(plug "williamboman/mason.nvim")
+(plug "williamboman/mason-lspconfig.nvim")
+(plug "neovim/nvim-lspconfig")
+
+;; Lisp-in-lua
+(plug "Olical/conjure")
+(plug "bakpakin/fennel.vim")
+
+(plug "ctrlpvim/ctrlp.vim")
+
+;; Usable dispatch
+(plug "tpope/vim-dispatch")
+(plug "radenling/vim-dispatch-neovim")
+
+;; Follow symlinks
+(plug "moll/vim-bbye")
+(plug "aymericbeaumet/vim-symlink")
+
+;; Respect editorconfig
+(plug "gpanders/editorconfig.nvim")
+
+(plug "terryma/vim-expand-region")
+
+
+;; TODO CONFIGURE
+(plug "nvim-treesitter/nvim-treesitter" {:do ":TSUpdate"})
+(plug "https://git.sr.ht/~p00f/nvim-ts-rainbow")
+
+;; TODO CONFIGURE
+(plug  "datwaft/bubbly.nvim")
+
+(plug "tpope/vim-fugitive")
+(plug "mhinz/vim-signify")
+(plug "tpope/vim-commentary")
+(plug "mbbill/undotree")
+(plug "folke/which-key.nvim")
+(plug "airblade/vim-rooter")
+
+;; Define all required plugins.
+(nvim.fn.plug#end)
+
+;; Load plugin configuration modules.
+(core.run!
+  (fn [path]
+    (let [name (nvim.fn.fnamemodify path ":t:r")]
+      (if (known-plugin? name)
+        (require (.. "config.module.plugin." name))
+        (print (.. "Orphan plugin configuration: " name)))))
+  (util.glob (.. (nvim.fn.stdpath "config") "/lua/config/module/plugin/*.lua")))

nvim/fnl/config/module/plugin/base16-vim.fnl

@@ -0,0 +1,4 @@
+(local nvim (require :aniseed.nvim))
+
+(nvim.ex.colorscheme "base16-oceanicnext")
+

nvim/fnl/config/module/plugin/bubbly.fnl

@@ -0,0 +1,3 @@
+(local nvim (require :aniseed.nvim))
+
+(set nvim.g.bubbly_tabline 1)

nvim/fnl/config/module/plugin/mason.fnl

@@ -0,0 +1,4 @@
+(local nvim (require :aniseed.nvim))
+
+(nvim.ex.lua "require('mason').setup()")
+(nvim.ex.lua "require('mason-lspconfig').setup()")

nvim/fnl/config/plugin.fnl

@@ -0,0 +1,64 @@
+(module config.plugin
+  {autoload {nvim aniseed.nvim
+             a aniseed.core
+             util config.util
+             : packer}})
+
+
+(defn safe-require-plugin-config [name]
+  (let [(ok? val-or-err) (pcall require (.. :config.plugin. name))]
+    (when (not ok?)
+      (print (.. "config error: " val-or-err)))))
+
+(defn- use [...]
+  "Iterates through the arguments as pairs and calls packer's use function for
+  each of them. Works around Fennel not liking mixed associative and sequential
+  tables as well."
+  (let [pkgs [...]]
+    (packer.startup
+      (fn [use]
+        (for [i 1 (a.count pkgs) 2]
+          (let [name (. pkgs i)
+                opts (. pkgs (+ i 1))]
+            (-?> (. opts :mod) (safe-require-plugin-config))
+            (use (a.assoc opts 1 name)))))))
+  nil)
+
+(use
+    ;; Defined further up
+    :wbthomason/packer.nvim {}
+    :Olical/aniseed {}
+    :lewis6991/impatient.nvim {}
+
+
+    :inkarkat/vim-ReplaceWithRegister {}
+    :chriskempson/base16-vim {:mod :colorscheme}
+
+    :williamboman/mason.nvim {}
+    :williamboman/mason-lspconfig.nvim {}
+    :neovim/nvim-lspconfig {:mod :lspconfig :requires [[:williamboman/mason.nvim] [:williamboman/mason-lspconfig.nvim]]}
+
+    :ctrlpvim/ctrlp.vim {:mod :ctrlp}
+
+    :radenling/vim-dispatch-neovim {:requires [[:tpope/vim-dispatch]]}
+
+    :moll/vim-bbye {}
+    :aymericbeaumet/vim-symlink {}
+    :gpanders/editorconfig.nvim {}
+
+    :terryma/vim-expand-region {}
+
+    ;; TODO CONFIGURE
+    :nvim-treesitter/nvim-treesitter {:mod :treesitter :event ["BufEnter"] :run ":TSUpdate"}
+
+    "https://git.sr.ht/~p00f/nvim-ts-rainbow" {:requires [[:nvim-treesitter/nvim-treesitter]]}
+
+    ;; TODO CONFIGURE
+    :datwaft/bubbly.nvim {:mod :bubbly}
+
+    :tpope/vim-fugitive {:mod :fugitive}
+    :mhinz/vim-signify {}
+    :tpope/vim-commentary {}
+    :mbbill/undotree {}
+    :folke/which-key.nvim {:mod :which-key}
+    :airblade/vim-rooter {})

nvim/fnl/config/plugin/bubbly.fnl

@@ -0,0 +1,18 @@
+(module config.plugin.bubbly
+  {autoload {nvim aniseed.nvim}})
+
+(set nvim.g.bubbly_palette {
+                            :background "#34343c"
+                            :foreground "#c5cdd9"
+                            :black "3e4249"
+                            :red "#ec5f67"
+                            :green "#99c794"
+                            :yellow "#fac863"
+                            :blue "#6699cc"
+                            :purple "#c594c5"
+                            :cyan "#62b3b2"
+                            :white "#ffffff"
+                            :lightgrey "#a7adba"
+                            :darkgrey "#65737e"
+                            })
+

nvim/fnl/config/plugin/colorscheme.fnl

@@ -0,0 +1,4 @@
+(module config.plugin.colorscheme
+  {autoload {nvim aniseed.nvim}})
+
+(nvim.ex.colorscheme "base16-oceanicnext")

nvim/fnl/config/plugin/ctrlp.fnl

@@ -0,0 +1,6 @@
+(module config.plugin.ctrlp
+  {autoload {nvim aniseed.nvim}})
+
+(set nvim.g.ctrlp_map "<Leader>p")
+(set nvim.g.ctrlp_cmd "CtrlPMixed")
+(set nvim.g.ctrlp_user_command "rg --files %s")

nvim/fnl/config/plugin/fugitive.fnl

@@ -0,0 +1,2 @@
+(module config.plugin.fugitive
+  {autoload {nvim aniseed.nvim}})

nvim/fnl/config/plugin/lspconfig.fnl

@@ -0,0 +1,13 @@
+(module config.plugin.lspconfig
+  {autoload {nvim aniseed.nvim
+             util config.util}})
+
+
+(let [(lspconfig? lspconfig) (pcall require :lspconfig)
+      (mason? mason) (pcall require :mason)
+      (mason-lsp? mason-lsp) (pcall require :mason-lspconfig)]
+  (when ok?
+    (mason.setup)
+    (mason-lsp.setup)
+    (lspconfig.rust_analyzer.setup {})
+    (lspconfig.yamlls.setup {})))

nvim/fnl/config/plugin/treesitter.fnl

@@ -0,0 +1,37 @@
+(module config.plugin.treesitter
+  {autoload {nvim aniseed.nvim}})
+
+(let [(ok? ts) (pcall require :nvim-treesitter.configs)]
+  (when ok?
+    (ts.setup
+              {:highlight {:enable true :additional_vim_regex_highlighting false}
+               :rainbow {:enable true
+                         :extended_mode true
+                         :max_files_lines nil}
+               :incremental_selection {
+                                       :enable true
+                                       :keymaps {
+                                                 :init_selection "<Leader>s"
+                                                 :node_incremental "u"
+                                                 :scope_incremental "s"
+                                                 :node_decremental "d"
+                                                 }
+                                       }
+               :refactor {
+                          :highlight_definitions {:enable true}
+                          :smart_rename {
+                                         :enable true
+                                         :keymaps {
+                                                   :smart_rename "<Leader>r"
+                                                   }
+                                         }
+                          }
+               :navigation {
+                            :enable true
+                            :keymaps {:goto_definition "<Leader>tg"
+                                      :list_definition "<Leader>ta"}
+                            }
+               :ensure_installed [:python :yaml :rust :fennel :lua]})
+    (set nvim.o.foldmethod "expr")
+    (set nvim.o.foldexpr "nvim_treesitter#foldexpr()")
+    ))

nvim/fnl/config/plugin/which-key.fnl

@@ -0,0 +1,5 @@
+(module config.plugin.which-key)
+
+(let [(ok? which-key) (pcall #(require :which-key))]
+  (when ok?
+    (which-key.setup {})))

nvim/fnl/config/util.fnl

@@ -0,0 +1,26 @@
+(module config.util
+  {autoload {nvim aniseed.nvim
+             a aniseed.core}})
+
+(fn expand [path]
+  (nvim.fn.expand path))
+
+(fn glob [path]
+  (nvim.fn.glob path true true true))
+
+(fn exists? [path]
+  (= (nvim.fn.filereadable path) 1))
+
+(fn lua-file [path]
+  (nvim.ex.luafile path))
+
+(defn nnoremap [from to opts]
+  (let [map-opts {:noremap true}
+        to (.. ":" to "<cr>")]
+    (if (a.get opts :local?)
+      (nvim.buf_set_keymap 0 :n from to map-opts)
+      (nvim.set_keymap :n from to map-opts))))
+
+(defn lnnoremap [from to]
+  (nnoremap (.. "<leader>" from) to))
+

nvim/init.lua

@@ -0,0 +1,26 @@
+local execute = vim.api.nvim_command
+local fn = vim.fn
+
+local pack_path = fn.stdpath("data") .. "/site/pack"
+local fmt = string.format
+
+function ensure (user, repo)
+  -- Ensures a given github.com/USER/REPO is cloned in the pack/packer/start directory.
+  local install_path = fmt("%s/packer/start/%s", pack_path, repo)
+  if fn.empty(fn.glob(install_path)) > 0 then
+    execute(fmt("!git clone https://github.com/%s/%s %s", user, repo, install_path))
+    execute(fmt("packadd %s", repo))
+  end
+end
+
+ensure("wbthomason", "packer.nvim")
+ensure("Olical", "aniseed")
+ensure("lewis6991", "impatient.nvim")
+
+require("impatient")
+
+vim.g["aniseed#env"] = {
+	module = "config.init",
+	compile = true
+}
+