Merge branch 'master' of github.com:aktersnurra/nvim

5 files changed, 7 insertions, 8 deletions

diff --git a/fnl/config/cmp.fnl b/fnl/config/cmp.fnl
index 4b7c49b..bf4a331 100644
--- a/fnl/config/cmp.fnl
+++ b/fnl/config/cmp.fnl
@@ -25,6 +25,7 @@
               :sources [{:name :nvim_lsp}
                         {:name :nvim_lua}
                         {:name :luasnip}
+                        {:name :spell}
                         {:name :buffer :keyword_length 4}
                         {:name :path :keyword_length 6}]
               :formatting {:format (lspkind.cmp_format {:with_text true
diff --git a/fnl/config/init.fnl b/fnl/config/init.fnl
index 059a42b..860cdc4 100644
--- a/fnl/config/init.fnl
+++ b/fnl/config/init.fnl
@@ -23,7 +23,6 @@
                               config.orgmode
                               config.project
                               config.spectre
-                              config.spellsitter
                               config.stay-in-place
                               config.stabilize
                               config.surround
diff --git a/fnl/config/spellsitter.fnl b/fnl/config/spellsitter.fnl
deleted file mode 100644
index dbd006c..0000000
--- a/fnl/config/spellsitter.fnl
+++ /dev/null
@@ -1,6 +0,0 @@
-;; Enable spell checking in comments.
-(module config.spellsitter {autoload {: util}})
-
-(def- opts {:enable true :debug false})
-
-(util.use-config :spellsitter opts)
diff --git a/fnl/plugins.fnl b/fnl/plugins.fnl
index 2b29d80..09fc301 100644
--- a/fnl/plugins.fnl
+++ b/fnl/plugins.fnl
@@ -10,6 +10,7 @@
  :hrsh7th/cmp-nvim-lsp {}
  :hrsh7th/cmp-path {}
  :saadparwaiz1/cmp_luasnip {}
+ :f3fora/cmp-spell {}
  :numToStr/Comment.nvim {}
  :sindrets/diffview.nvim {}
  :j-hui/fidget.nvim {}
@@ -50,7 +51,6 @@
  :ahmedkhalf/project.nvim {}
  :b0o/SchemaStore.nvim {}
  :rmagatti/session-lens {}
- :lewis6991/spellsitter.nvim {}
  :luukvbaal/stabilize.nvim {}
  :gbprod/stay-in-place.nvim {}
  :nvim-telescope/telescope-file-browser.nvim {}
diff --git a/fnl/settings/options.fnl b/fnl/settings/options.fnl
index 20926b8..0a1a254 100644
--- a/fnl/settings/options.fnl
+++ b/fnl/settings/options.fnl
@@ -1,6 +1,8 @@
 ;; Sets options in neovim
 (module settings.options {autoload {nvim aniseed.nvim}})
 
+(def- spellfile (.. (os.getenv :XDG_CONFIG_HOME) :/nvim/spell/en.utf-8.add))
+
 (defn- apply-opts [opts] (each [k v (pairs opts)]
                            (tset vim.opt k v)))
 
@@ -73,6 +75,9 @@
             ;; is one of my fav
             :scrolloff 8
             :sidescrolloff 8
+            :spell true
+            : spellfile
+            :spelllang [:en_us]
             ;; the font used in graphical neovim applications
             :guifont "monospace:h17"})