programs/emacs/default.nix

@@ -84,9 +84,8 @@
         direnv
         rainbow-delimiters
         aggressive-indent
-        python-docstring
         nix-mode
-        lua-mode
+        python-docstring
 
         # Media
         emms

programs/lua/default.nix

@@ -1,6 +1,6 @@
 {pkgs, ...}: {
   home.packages = with pkgs; [
-    (luajit.withPackages (ps: [
+    (lua.withPackages (ps: [
       (ps.callPackage ./luarocks/scilua.nix {})
     ]))
   ];

programs/lua/luarocks/scilua.nix

@@ -1,13 +1,12 @@
 {
   buildLuarocksPackage,
   fetchurl,
+  lua,
   luaAtLeast,
   luaOlder,
-  callPackage,
-  luajit,
-  openblas,
+  luaPackages,
 }: let
-  xsys = callPackage ./xsys.nix {};
+  xsys = luaPackages.callPackage ./xsys.nix {};
 in
   buildLuarocksPackage {
     pname = "sci";
@@ -24,7 +23,7 @@ in
     };
 
     disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
-    propagatedBuildInputs = [luajit xsys openblas];
+    propagatedBuildInputs = [lua xsys];
 
     meta = {
       homepage = "https://github.com/stepelu/lua-sci";

programs/lua/luarocks/xsys.nix

@@ -1,9 +1,9 @@
 {
   buildLuarocksPackage,
   fetchurl,
+  lua,
   luaAtLeast,
   luaOlder,
-  luajit,
 }:
 buildLuarocksPackage {
   pname = "xsys";
@@ -20,7 +20,7 @@ buildLuarocksPackage {
   };
 
   disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
-  propagatedBuildInputs = [luajit];
+  propagatedBuildInputs = [lua];
 
   meta = {
     homepage = "http://scilua.org/xsys.html";