From f361878e130454c21b6e0eca8a85a3cd704ba8c1 Mon Sep 17 00:00:00 2001
From: TECHNOFAB <admin@technofab.de>
Date: Sun, 28 Jul 2024 12:51:14 +0000
Subject: [PATCH] feat: split lib and utils into separate flake

---
 flake.lock                             | 34 ++++++++------------------
 flake.nix                              | 18 +++++---------
 lib/flake.nix                          |  9 +++++++
 flakeModule.nix => lib/flakeModule.nix |  2 --
 utils.nix => lib/utils.nix             |  2 +-
 5 files changed, 26 insertions(+), 39 deletions(-)
 create mode 100644 lib/flake.nix
 rename flakeModule.nix => lib/flakeModule.nix (99%)
 rename utils.nix => lib/utils.nix (99%)

diff --git a/flake.lock b/flake.lock
index 0468da7..c08280e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -5,7 +5,9 @@
         "crane": "crane",
         "flake-compat": "flake-compat",
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
@@ -47,7 +49,7 @@
       "inputs": {
         "flake-compat": "flake-compat_2",
         "nix": "nix",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "pre-commit-hooks": [
           "pre-commit-hooks"
         ]
@@ -228,11 +230,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1702539185,
-        "narHash": "sha256-KnIRG5NMdLIpEkZTnN5zovNYc0hhXjAgv6pfd5Z4c7U=",
+        "lastModified": 1678875422,
+        "narHash": "sha256-T3o6NcQPwXjxJMn2shz86Chch4ljXgZn746c2caGxd8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "aa9d4729cbc99dabacb50e3994dcefb3ea0f7447",
+        "rev": "126f49a01de5b7e35a43fd43f891ecf6d3a51459",
         "type": "github"
       },
       "original": {
@@ -309,22 +311,6 @@
       }
     },
     "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1678875422,
-        "narHash": "sha256-T3o6NcQPwXjxJMn2shz86Chch4ljXgZn746c2caGxd8=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "126f49a01de5b7e35a43fd43f891ecf6d3a51459",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
       "locked": {
         "lastModified": 1705204527,
         "narHash": "sha256-WVz9WdaFBhAwO/7A+HlW8HPJ4VQ8QnpCD1WZAcAPneo=",
@@ -340,7 +326,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1704842529,
         "narHash": "sha256-OTeQA+F8d/Evad33JMfuXC89VMetQbsU4qcaePchGr4=",
@@ -361,7 +347,7 @@
         "flake-compat": "flake-compat_3",
         "flake-utils": "flake-utils_2",
         "gitignore": "gitignore",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_3",
         "nixpkgs-stable": "nixpkgs-stable_2"
       },
       "locked": {
@@ -383,7 +369,7 @@
         "attic": "attic",
         "devenv": "devenv",
         "flake-parts": "flake-parts",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_2",
         "pre-commit-hooks": "pre-commit-hooks",
         "systems": "systems_2"
       }
diff --git a/flake.nix b/flake.nix
index dff4ad4..946a165 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,27 +1,18 @@
 {
   outputs = {
-    self,
     flake-parts,
     systems,
-    nixpkgs,
-    devenv,
     ...
   } @ inputs:
     flake-parts.lib.mkFlake {inherit inputs;} {
       imports = [
         inputs.devenv.flakeModule
-        ./flakeModule.nix
+        ./lib/flakeModule.nix
       ];
       systems = import systems;
-      flake = {
-        imports = [
-          ./utils.nix
-        ];
-        flakeModule = ./flakeModule.nix;
-      };
+      flake = {};
       perSystem = {
         pkgs,
-        system,
         inputs',
         ...
       }: rec {
@@ -161,7 +152,10 @@
       inputs.pre-commit-hooks.follows = "pre-commit-hooks";
     };
     pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
-    attic.url = "gitlab:TECHNOFAB/attic";
+    attic = {
+      url = "gitlab:TECHNOFAB/attic";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   nixConfig = {
diff --git a/lib/flake.nix b/lib/flake.nix
new file mode 100644
index 0000000..5d00bb6
--- /dev/null
+++ b/lib/flake.nix
@@ -0,0 +1,9 @@
+{
+  description = "Nix-CI lib";
+
+  outputs = {...} @ inputs:
+    {
+      flakeModule = import ./flakeModule.nix;
+    }
+    // (import ./utils.nix);
+}
diff --git a/flakeModule.nix b/lib/flakeModule.nix
similarity index 99%
rename from flakeModule.nix
rename to lib/flakeModule.nix
index f359ec7..292df6c 100644
--- a/flakeModule.nix
+++ b/lib/flakeModule.nix
@@ -1,14 +1,12 @@
 {
   flake-parts-lib,
   lib,
-  inputs,
   ...
 }: {
   options.perSystem = flake-parts-lib.mkPerSystemOption (
     {
       config,
       pkgs,
-      system,
       ...
     }: let
       cfg = config.ci.config;
diff --git a/utils.nix b/lib/utils.nix
similarity index 99%
rename from utils.nix
rename to lib/utils.nix
index 7ced939..2fd49d0 100644
--- a/utils.nix
+++ b/lib/utils.nix
@@ -1,4 +1,4 @@
-{...}: {
+{
   mkUtils = {pkgs, ...}: {
     commitAndPushFiles = {
       message,