chore(flake.nix): general cleanup and simplification

nvim-neorg · May 27, 2024 · 06fd3da · 06fd3da
1 parent e5ca4c4
commit 06fd3da
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/nix/checks/default.nix b/nix/checks/default.nix
@@ -34,7 +34,7 @@
 
       neorocks-test =
         (pkgs.neorocksTest {
-          src = self;
+          src = "${self}";
           name = "neorg";
           version = "scm-1";
           neovim = pkgs.neovim-unwrapped;

diff --git a/nix/overlays/installed-dependencies.nix b/nix/overlays/installed-dependencies.nix
@@ -1,12 +1,14 @@
 {
   lib,
-  pkgs,
+  runCommand,
+  lua51Packages,
+  wget,
   self,
 }: let
   dependencies = builtins.fromJSON (builtins.readFile "${self}/res/deps.json");
 in
-  pkgs.runCommand "install-neorg-dependencies" {
-    nativeBuildInputs = with pkgs; [lua51Packages.luarocks wget];
+  runCommand "install-neorg-dependencies" {
+    nativeBuildInputs = [lua51Packages.luarocks wget];
     outputHashAlgo = "sha256";
     outputHashMode = "recursive";
     outputHash = "sha256-tvMqTgTshVApj3muQyvwj+as/8b7tw1r0BlCTpMlGuU=";

diff --git a/nix/overlays/luarc.nix b/nix/overlays/luarc.nix
@@ -4,17 +4,11 @@
   lib,
   lua51Packages,
   mk-luarc,
-  pkgs,
   self,
 }: let
   luarc = mk-luarc {};
 in
-  luarc
-  // {
-    inherit (luarc) runtime;
-    inherit (luarc.Lua) diagnostics globals;
-    Lua.workspace = {
-      inherit (luarc.Lua.workspace) ignoreDir;
-      library = luarc.Lua.workspace.library ++ ["${installed-dependencies}/luarocks/share/lua/5.1/"];
-    };
+  lib.recursiveUpdate luarc
+  {
+    Lua.workspace.library = luarc.Lua.workspace.library ++ ["${installed-dependencies}/luarocks/share/lua/5.1/"];
   }