From 74f2ea1e2c82f3f0535b385c53c69f96bbab27da Mon Sep 17 00:00:00 2001
From: Matei Adriel <rafaeladriel11@gmail.com>
Date: Sat, 23 Dec 2023 01:29:08 +0100
Subject: [PATCH] Enable abbreviations by default

---
 .../config/lua/my/abbreviations/global.lua     | 18 +++++++++---------
 home/features/neovim/config/lua/my/init.lua    |  1 +
 modules/common/neovim.nix                      |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/home/features/neovim/config/lua/my/abbreviations/global.lua b/home/features/neovim/config/lua/my/abbreviations/global.lua
index 4b4927e..f615b5b 100644
--- a/home/features/neovim/config/lua/my/abbreviations/global.lua
+++ b/home/features/neovim/config/lua/my/abbreviations/global.lua
@@ -4,17 +4,17 @@ local M = {}
 
 -- {{{ Ascii
 M.ascii = {
-  { "tto",   "->" }, -- [t]o
+  { "tto", "->" }, -- [t]o
   { "ffrom", "<-" }, -- [f]rom
-  { "iip",   "=>" }, -- [i]t [i]m[p]lies
-  { "iib",   "<=" }, -- [i]t's [i]mplied [b]ly
+  { "iip", "=>" }, -- [i]t [i]m[p]lies
+  { "iib", "<=" }, -- [i]t's [i]mplied [b]ly
 
-  { "leq",   "<=" }, -- [l]ess than or [e][q]ual
-  { "geq",   ">=" }, -- [g]reater than or [e][q]ual
-  { "seq",   "=" },  -- [s]ingle [e][q]ual
-  { "deq",   "==" }, -- [d]ouble [e][q]ual
-  { "land",  "/\\" }, -- [l]ogial [a][n][d]
-  { "lor",   "\\/" }, -- [l]ogial [o][r]
+  { "leq", "<=" }, -- [l]ess than or [e][q]ual
+  { "geq", ">=" }, -- [g]reater than or [e][q]ual
+  { "seq", "=" }, -- [s]ingle [e][q]ual
+  { "deq", "==" }, -- [d]ouble [e][q]ual
+  { "land", "/\\" }, -- [l]ogial [a][n][d]
+  { "lor", "\\/" }, -- [l]ogial [o][r]
 }
 -- }}}
 
diff --git a/home/features/neovim/config/lua/my/init.lua b/home/features/neovim/config/lua/my/init.lua
index 9100155..74d201a 100644
--- a/home/features/neovim/config/lua/my/init.lua
+++ b/home/features/neovim/config/lua/my/init.lua
@@ -5,6 +5,7 @@ function M.setup()
   require("my.options").setup()
   require("my.keymaps").setup()
   require("my.lazy").setup()
+  require("my.abbreviations").setup()
 end
 
 return M
diff --git a/modules/common/neovim.nix b/modules/common/neovim.nix
index 2ca4de8..6c7ba77 100644
--- a/modules/common/neovim.nix
+++ b/modules/common/neovim.nix
@@ -579,7 +579,7 @@ in
             package = e.nullOr e.string;
             dir = assert propXor "package" "dir" opts; e.nullOr e.string;
             tag = assert propImplies "tag" "package" opts; e.nullOr e.string;
-            version = assert propImplies "tag" "package" opts; e.nullOr e.string;
+            version = assert propImplies "version" "package" opts; e.nullOr e.string;
             name = e.nullOr e.string;
             main = e.nullOr e.string;
             dependencies = e.map (d: d.lua) (e.tryNonemptyList (e.stringOr lazyObjectEncoder));