lib: move library to its own directory

2 files changed, 50 insertions, 46 deletions

diff --git a/flake.nix b/flake.nix
index 7e52714..e106ad8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,52 +14,7 @@
         nixpkgs.overlays = [ self.overlay ];
       };
 
-      lib = rec {
-        # Mapping of board name to the appropriate system
-        boardSystem = {
-          omnia = {
-            config = "armv7l-unknown-linux-gnueabihf";
-            system = "armv7l-linux";
-          };
-          mox = {
-            config = "aarch64-unknown-linux-gnu";
-            system = "aarch64-linux";
-          };
-        };
-
-        # NixOS system for specific Turris board
-        nixturrisSystem = {
-          board,
-          system ? boardSystem.${board}.system,
-          nixpkgs ? nixpkgs-stable,
-          modules ? [],
-          override ? {}
-        }: nixpkgs.lib.nixosSystem ({
-          system = system;
-          modules = [
-            self.nixosModule
-            ({
-              turris.board = board;
-            } // nixpkgs.lib.optionalAttrs (system != boardSystem.${board}.system) {
-              nixpkgs.crossSystem = boardSystem.${board};
-            })
-          ] ++ modules;
-        } // override);
-
-        # The minimalized system to decrease amount of ram needed for rebuild
-        # TODO this does not work right now as it requires just load of work to do
-        nixturrisMinSystem = {
-          nixpkgs ? nixpkgs-stable,
-          modules,
-          ...
-        } @args: self.lib.nixturrisSystem (args // {
-          nixpkgs = nixpkgs;
-          modules = modules ++ [ ./nixos/nixos-modules-minfake.nix ];
-          override = {
-            baseModules = import ./nixos/nixos-modules.nix nixpkgs;
-          };
-        });
-      };
+      lib = import ./lib { self = self; nixpkgs-stable = nixpkgs-stable; };
 
     } // flake-utils.lib.eachSystem (flake-utils.lib.defaultSystems ++ ["armv7l-linux"]) (
       system: {
diff --git a/lib/default.nix b/lib/default.nix
new file mode 100644
index 0000000..163e06b
--- /dev/null
+++ b/lib/default.nix
@@ -0,0 +1,49 @@
+{ self, nixpkgs-stable }: rec {
+
+  # Mapping of board name to the appropriate system
+  boardSystem = {
+    omnia = {
+      config = "armv7l-unknown-linux-gnueabihf";
+      system = "armv7l-linux";
+    };
+    mox = {
+      config = "aarch64-unknown-linux-gnu";
+      system = "aarch64-linux";
+    };
+  };
+
+
+  # NixOS system for specific Turris board
+  nixturrisSystem = {
+    board,
+    system ? boardSystem.${board}.system,
+    nixpkgs ? nixpkgs-stable,
+    modules ? [],
+    override ? {}
+  }: nixpkgs.lib.nixosSystem ({
+    system = system;
+    modules = [
+      self.nixosModule
+      ({
+        turris.board = board;
+      } // nixpkgs.lib.optionalAttrs (system != boardSystem.${board}.system) {
+        nixpkgs.crossSystem = boardSystem.${board};
+      })
+    ] ++ modules;
+  } // override);
+
+  # The minimalized system to decrease amount of ram needed for rebuild
+  # TODO this does not work right now as it requires just load of work to do
+  nixturrisMinSystem = {
+    nixpkgs ? nixpkgs-stable,
+    modules,
+    ...
+  } @args: self.lib.nixturrisSystem (args // {
+    nixpkgs = nixpkgs;
+    modules = modules ++ [ ../nixos/nixos-modules-minfake.nix ];
+    override = {
+      baseModules = import ../nixos/nixos-modules.nix nixpkgs;
+    };
+  });
+
+}