Extract overlay.nix from flake.nix

zedeus · Oct 25, 2022 · dd1fefc · dd1fefc
1 parent 8fa43b4
commit dd1fefc
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 35 deletions.
diff --git a/flake.nix b/flake.nix
@@ -15,44 +15,11 @@
         nixosModules.kinoplex = import ./system/module.nix;
         nixosModules.default = nixosModules.kinoplex;
 
-        overlays.default = final: prev: {
-          nimPackages = prev.nimPackages.overrideScope' (nimfinal: nimprev: {
-            inherit (prev) stew;
-
-            ws = nimprev.ws.overrideAttrs (oldAttrs: {
-              inherit (nimprev.ws) pname version src;
-              doCheck = false;
-            });
-
-            karax = nimprev.karax.overrideAttrs (oldAttrs: {
-              inherit (nimprev.karax) pname version src;
-              doCheck = false;
-            });
-
-            questionable = nimprev.karax.overrideAttrs (oldAttrs: {
-              inherit (nimprev.questionable) pname version src;
-              doCheck = false;
-            });
-
-            ast_pattern_matching = nimprev.ast_pattern_matching.overrideAttrs (oldAttrs: {
-              inherit (nimprev.ast_pattern_matching) pname version src;
-              doCheck = false;
-            });
-
-            kinoplex = nimprev.buildNimPackage {
-              pname = "kinoplex";
-              version = "0.1.0";
-              src = ./.;
-              propagatedBuildInputs = with nimfinal;
-                [ ws patty karax jswebsockets telebot questionable ];
-            };
-          });
-        };
+        overlays.default = import ./overlay.nix;
 
         packages = flake-utils.lib.flattenTree {
-          kinoplex = pkgs.nimPackages.kinoplex;
+          inherit (pkgs.nimPackages) kinoplex;
         };
-
         defaultPackage = packages.kinoplex;
 
         apps = {

diff --git a/overlay.nix b/overlay.nix
@@ -0,0 +1,33 @@
+final: prev: {
+  nimPackages = prev.nimPackages.overrideScope' (nimfinal: nimprev: {
+    inherit (prev) stew;
+
+    ws = nimprev.ws.overrideAttrs (oldAttrs: {
+      inherit (nimprev.ws) pname version src;
+      doCheck = false;
+    });
+
+    karax = nimprev.karax.overrideAttrs (oldAttrs: {
+      inherit (nimprev.karax) pname version src;
+      doCheck = false;
+    });
+
+    questionable = nimprev.karax.overrideAttrs (oldAttrs: {
+      inherit (nimprev.questionable) pname version src;
+      doCheck = false;
+    });
+
+    ast_pattern_matching = nimprev.ast_pattern_matching.overrideAttrs (oldAttrs: {
+      inherit (nimprev.ast_pattern_matching) pname version src;
+      doCheck = false;
+    });
+
+    kinoplex = nimprev.buildNimPackage {
+      pname = "kinoplex";
+      version = "0.1.0";
+      src = ./.;
+      propagatedBuildInputs = with nimfinal;
+        [ ws patty karax jswebsockets telebot questionable ];
+    };
+  });
+}