Merge pull request #178 from NotAShelf/assert-assertions

flake.nix

@@ -38,12 +38,19 @@
       };
 
       perSystem = {
+        self',
         config,
         pkgs,
         ...
       }: {
-        devShells.default = pkgs.mkShell {nativeBuildInputs = [config.packages.nix];};
         formatter = pkgs.alejandra;
+        devShells = {
+          default = self'.devShells.lsp;
+          nvim-nix = pkgs.mkShell {nativeBuildInputs = [config.packages.nix];};
+          lsp = pkgs.mkShell {
+            nativeBuildInputs = with pkgs; [nil statix deadnix];
+          };
+        };
       };
     };
 

lib/default.nix

@@ -4,4 +4,5 @@
   types = import ./types {inherit lib;};
   languages = import ./languages.nix {inherit lib;};
   lua = import ./lua.nix {inherit lib;};
+  vim = import ./vim.nix {inherit lib;};
 }

lib/lua.nix

@@ -1,11 +1,8 @@
 # Helpers for converting values to lua
-{lib}: rec {
-  # yes? no.
-  yesNo = value:
-    if value
-    then "yes"
-    else "no";
-
+{lib}: let
+  inherit (lib) mapAttrsToList filterAttrs concatStringsSep concatMapStringsSep stringToCharacters boolToString;
+  inherit (builtins) hasAttr head;
+in rec {
   # Convert a null value to lua's nil
   nullString = value:
     if value == null
@@ -46,4 +43,44 @@
     + " }";
   # Convert a list of lua expressions to a lua table. The difference to listToLuaTable is that the elements here are expected to be lua expressions already, whereas listToLuaTable converts from nix types to lua first
   luaTable = items: ''{${builtins.concatStringsSep "," items}}'';
+
+  toLuaObject = args:
+    if builtins.isAttrs args
+    then
+      if hasAttr "__raw" args
+      then args.__raw
+      else if hasAttr "__empty" args
+      then "{ }"
+      else
+        "{"
+        + (concatStringsSep ","
+          (mapAttrsToList
+            (n: v:
+              if head (stringToCharacters n) == "@"
+              then toLuaObject v
+              else "[${toLuaObject n}] = " + (toLuaObject v))
+            (filterAttrs
+              (
+                _: v:
+                  (v != null) && (toLuaObject v != "{}")
+              )
+              args)))
+        + "}"
+    else if builtins.isList args
+    then "{" + concatMapStringsSep "," toLuaObject args + "}"
+    else if builtins.isString args
+    then
+      # This should be enough!
+      builtins.toJSON args
+    else if builtins.isPath args
+    then builtins.toJSON (toString args)
+    else if builtins.isBool args
+    then "${boolToString args}"
+    else if builtins.isFloat args
+    then "${toString args}"
+    else if builtins.isInt args
+    then "${toString args}"
+    else if (args != null)
+    then "nil"
+    else "";
 }

lib/vim.nix

@@ -0,0 +1,26 @@
+{lib}: let
+  inherit (builtins) isInt isBool toJSON;
+in rec {
+  # yes? no.
+  yesNo = value:
+    if value
+    then "yes"
+    else "no";
+
+  # convert a boolean to a vim compliant boolean string
+  mkVimBool = val:
+    if val
+    then "1"
+    else "0";
+
+  # convert a literal value to a vim compliant value
+  valToVim = val:
+    if (isInt val)
+    then (builtins.toString val)
+    else
+      (
+        if (isBool val)
+        then (mkVimBool val)
+        else (toJSON val)
+      );
+}

modules/assistant/copilot/config.nix

@@ -3,17 +3,18 @@
   config,
   lib,
   ...
-}:
-with lib;
-with builtins; let
+}: let
+  inherit (builtins) toJSON;
+  inherit (lib) mkIf nvim mkLuaBinding mkMerge;
+
   cfg = config.vim.assistant.copilot;
 
   wrapPanelBinding = luaFunction: key: ''
     function()
       local s, _ = pcall(${luaFunction})
 
       if not s then
-        local termcode = vim.api.nvim_replace_termcodes(${builtins.toJSON key}, true, false, true)
+        local termcode = vim.api.nvim_replace_termcodes(${toJSON key}, true, false, true)
 
         vim.fn.feedkeys(termcode, 'n')
       end

modules/assistant/copilot/copilot.nix

@@ -3,9 +3,9 @@
   config,
   lib,
   ...
-}:
-with lib;
-with builtins; let
+}: let
+  inherit (lib) mkEnableOption mkOption types;
+
   cfg = config.vim.assistant.copilot;
 in {
   options.vim.assistant.copilot = {

modules/assistant/tabnine/config.nix

@@ -2,9 +2,10 @@
   config,
   lib,
   ...
-}:
-with lib;
-with builtins; let
+}: let
+  inherit (builtins) toJSON;
+  inherit (lib) mkIf mkMerge mkExprBinding boolToString nvim;
+
   cfg = config.vim.assistant.tabnine;
 in {
   config = mkIf cfg.enable {
@@ -17,7 +18,7 @@ in {
           local completion = require("tabnine.completion")
 
         	if not state.completions_cache then
-          	return "${builtins.toJSON cfg.mappings.accept}"
+          	return "${toJSON cfg.mappings.accept}"
           end
 
           vim.schedule(completion.accept)
@@ -29,7 +30,7 @@ in {
           local completion = require("tabnine.completion")
 
         	if not state.completions_cache then
-          	return "${builtins.toJSON cfg.mappings.dismiss}"
+          	return "${toJSON cfg.mappings.dismiss}"
           end
 
           vim.schedule(function()

modules/assistant/tabnine/tabnine.nix

@@ -1,6 +1,6 @@
-{lib, ...}:
-with lib;
-with builtins; {
+{lib, ...}: let
+  inherit (lib) mkEnableOption mkOption types mkMappingOption;
+in {
   options.vim.assistant.tabnine = {
     enable = mkEnableOption "Tabnine assistant";
 

modules/autopairs/nvim-autopairs/config.nix

@@ -2,9 +2,9 @@
   lib,
   config,
   ...
-}:
-with lib;
-with builtins; let
+}: let
+  inherit (lib) mkIf nvim optionalString boolToString;
+
   cfg = config.vim.autopairs;
 in {
   config =

modules/autopairs/nvim-autopairs/nvim-autopairs.nix

@@ -1,6 +1,6 @@
-{lib, ...}:
-with lib;
-with builtins; {
+{lib, ...}: let
+  inherit (lib) mkEnableOption mkOption types;
+in {
   options.vim = {
     autopairs = {
       enable = mkEnableOption "autopairs" // {default = false;};

modules/basic/config.nix

@@ -2,9 +2,10 @@
   lib,
   config,
   ...
-}:
-with lib;
-with builtins; let
+}: let
+  inherit (builtins) concatStringsSep;
+  inherit (lib) optionalString mkIf nvim;
+
   cfg = config.vim;
 in {
   config = {
@@ -57,8 +58,8 @@ in {
     };
 
     vim.configRC.basic = nvim.dag.entryAfter ["globalsScript"] ''
-      " Debug mode settings
       ${optionalString cfg.debugMode.enable ''
+        " Debug mode settings
         set verbose=${toString cfg.debugMode.level}
         set verbosefile=${cfg.debugMode.logFile}
       ''}
@@ -141,7 +142,7 @@ in {
       ''}
       ${optionalString cfg.spellChecking.enable ''
         set spell
-        set spelllang=${builtins.concatStringsSep "," cfg.spellChecking.languages}${optionalString cfg.spellChecking.enableProgrammingWordList ",programming"}
+        set spelllang=${concatStringsSep "," cfg.spellChecking.languages}${optionalString cfg.spellChecking.enableProgrammingWordList ",programming"}
       ''}
       ${optionalString (cfg.leaderKey != null) ''
         let mapleader = "${toString cfg.leaderKey}"

modules/basic/module.nix

@@ -2,9 +2,10 @@
   pkgs,
   lib,
   ...
-}:
-with lib;
-with builtins; {
+}: let
+  inherit (lib) mkEnableOption mkOption;
+  inherit (lib.types) types;
+in {
   options.vim = {
     package = mkOption {
       type = types.package;

modules/comments/comment-nvim/comment-nvim.nix

@@ -1,6 +1,6 @@
-{lib, ...}:
-with lib;
-with builtins; {
+{lib, ...}: let
+  inherit (lib) mkEnableOption mkMappingOption;
+in {
   options.vim.comments.comment-nvim = {
     enable = mkEnableOption "smart and powerful comment plugin for neovim comment-nvim";
 

modules/comments/comment-nvim/config.nix

@@ -2,9 +2,9 @@
   config,
   lib,
   ...
-}:
-with lib;
-with builtins; let
+}: let
+  inherit (lib) mkIf mkMerge mkExprBinding mkBinding nvim;
+
   cfg = config.vim.comments.comment-nvim;
   self = import ./comment-nvim.nix {
     inherit lib;

modules/completion/nvim-cmp/config.nix

@@ -2,9 +2,11 @@
   lib,
   config,
   ...
-}:
-with lib;
-with builtins; let
+}: let
+  inherit (builtins) toJSON;
+  inherit (lib) addDescriptionsToMappings concatMapStringsSep attrNames concatStringsSep mapAttrsToList mkIf mkSetLuaBinding mkMerge optionalString;
+  inherit (lib.nvim) dag;
+
   cfg = config.vim.autocomplete;
   lspkindEnabled = config.vim.lsp.enable && config.vim.lsp.lspkind.enable;
 
@@ -31,8 +33,8 @@ with builtins; let
 
   dagPlacement =
     if lspkindEnabled
-    then nvim.dag.entryAfter ["lspkind"]
-    else nvim.dag.entryAnywhere;
+    then dag.entryAfter ["lspkind"]
+    else dag.entryAnywhere;
 in {
   config = mkIf cfg.enable {
     vim.startPlugins = [
@@ -59,7 +61,7 @@ in {
       (mkSetLuaBinding mappings.confirm ''
         function()
           if not require('cmp').confirm({ select = true }) then
-            local termcode = vim.api.nvim_replace_termcodes(${builtins.toJSON mappings.confirm.value}, true, false, true)
+            local termcode = vim.api.nvim_replace_termcodes(${toJSON mappings.confirm.value}, true, false, true)
 
             vim.fn.feedkeys(termcode, 'n')
           end
@@ -85,7 +87,7 @@ in {
           elseif has_words_before() then
             cmp.complete()
           else
-            local termcode = vim.api.nvim_replace_termcodes(${builtins.toJSON mappings.next.value}, true, false, true)
+            local termcode = vim.api.nvim_replace_termcodes(${toJSON mappings.next.value}, true, false, true)
 
             vim.fn.feedkeys(termcode, 'n')
           end
@@ -152,7 +154,7 @@ in {
           elseif has_words_before() then
             cmp.complete()
           else
-            local termcode = vim.api.nvim_replace_termcodes(${builtins.toJSON mappings.next.value}, true, false, true)
+            local termcode = vim.api.nvim_replace_termcodes(${toJSON mappings.next.value}, true, false, true)
 
             vim.fn.feedkeys(termcode, 'n')
           end