4 files changed, 2 insertions, 38 deletions
diff --git a/home/neovim/config.nix b/home/neovim/config.nix
index 8e04b84..a0c66dd 100644
--- a/home/neovim/config.nix
+++ b/home/neovim/config.nix
@@ -1,11 +1,10 @@
 {
   lib,
   config,
-  self,
 }: let
   inherit (lib) optionalAttrs;
 in
-  self.lib.toLua {
+  (lib.generators.toLua {}) {
     # Width of tabs in the editor
     tabwidth = 4;
     # If tabs should be expanded to spaces
diff --git a/home/neovim/default.nix b/home/neovim/default.nix
index 7d3f331..b5f34d6 100644
--- a/home/neovim/default.nix
+++ b/home/neovim/default.nix
@@ -2,10 +2,9 @@
   config,
   lib,
   pkgs,
-  self,
   ...
 }: let
-  lua_cfg = import ./config.nix {inherit lib config self;};
+  lua_cfg = import ./config.nix {inherit lib config;};
   lua = builtins.readFile ./init.lua;
 in {
   environment.variables.EDITOR = "nvim";
diff --git a/lib/default.nix b/lib/default.nix
index d342bf8..ae838af 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -1,8 +1,6 @@
 {...} @ inputs: let
   callLibs = file: import file inputs;
-  lua = callLibs ./lua.nix;
   files = callLibs ./files.nix;
 in {
-  inherit (lua) toLua;
   inherit (files) getFiles certs sshKeys gpgKeys;
 }
diff --git a/lib/lua.nix b/lib/lua.nix
deleted file mode 100644
index 9bde6bb..0000000
--- a/lib/lua.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{lib, ...}: let
-  toLua = val:
-  # nil
-    if val == null
-    then "nil"
-    # boolean
-    else if builtins.isBool val
-    then
-      if val
-      then "true"
-      else "false"
-    # number
-    else if builtins.isInt val || builtins.isFloat val
-    then toString val
-    # string
-    else if builtins.isString val
-    then "'${val}'"
-    # table (array)
-    else if builtins.isList val
-    then "{ " + (lib.concatStringsSep ", " (map toLua val)) + " }"
-    # table (object)
-    else if builtins.isAttrs val
-    then
-      "{ "
-      + (lib.concatStringsSep ", "
-        (lib.mapAttrsToList (k: v: "${k} = ${toLua v}") val))
-      + " }"
-    # invalid
-    else throw "Unsupported value: ${toString val}";
-in {
-  inherit toLua;
-}