5 files changed, 19 insertions, 7 deletions

diff --git a/flakes/openarc/flake.nix b/flakes/openarc/flake.nix
index 6110b2d..bdb0358 100644
--- a/flakes/openarc/flake.nix
+++ b/flakes/openarc/flake.nix
@@ -117,13 +117,15 @@
           };
 
           config = lib.mkIf cfg.enable {
-            users.users.openarc = lib.optionalAttrs (cfg.user == "openarc") {
-              group = cfg.group;
-              uid = myuids.lib.uids.openarc;
+            users.users = lib.optionalAttrs (cfg.user == "openarc") {
+              openarc = {
+                group = cfg.group;
+                uid = myuids.lib.uids.openarc;
+              };
             };
 
-            users.groups.openarc = lib.optionalAttrs (cfg.group == "openarc") {
-              gid = myuids.lib.gids.openarc;
+            users.groups = lib.optionalAttrs (cfg.group == "openarc") {
+              openarc.gid = myuids.lib.gids.openarc;
             };
 
             environment.systemPackages = [ self.defaultPackage."${pkgs.system}" ];
diff --git a/lib/default.nix b/lib/default.nix
index 57bde79..7b392f1 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -1,6 +1,7 @@
 { pkgs }:
 with pkgs;
 rec {
+  flakeCompat = import ./flake-compat.nix;
   nodeEnv = import ./node-env.nix;
 
   fetchedGithub = path:
diff --git a/lib/flake-compat.nix b/lib/flake-compat.nix
new file mode 100644
index 0000000..1f0d492
--- /dev/null
+++ b/lib/flake-compat.nix
@@ -0,0 +1,6 @@
+src:
+(import (
+  fetchTarball {
+    url = "https://github.com/edolstra/flake-compat/archive/99f1c2157fba4bfe6211a321fd0ee43199025dbf.tar.gz";
+    sha256 = "0x2jn3vrawwv9xp15674wjz9pixwjyj3j771izayl962zziivbx2";
+  }) { inherit src; }).defaultNix
diff --git a/modules/default.nix b/modules/default.nix
index 03b9adc..059a9d8 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,3 +1,6 @@
+let
+  flakeCompat = import ../lib/flake-compat.nix;
+in
 {
   myids = ./myids.nix;
   secrets = ./secrets.nix;
@@ -12,7 +15,7 @@
   fiche = ./webapps/fiche.nix;
 
   opendmarc = ./opendmarc.nix;
-  openarc = ./openarc.nix;
+  openarc = (flakeCompat ../flakes/openarc).nixosModule;
 
   duplyBackup = ./duply_backup;
   rsyncBackup = ./rsync_backup;
diff --git a/pkgs/default.nix b/pkgs/default.nix
index b260f97..ff21a20 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -22,7 +22,7 @@ rec {
   notmuch-python2 = callPackage ./notmuch/notmuch-python { pythonPackages = python2Packages; };
   notmuch-python3 = callPackage ./notmuch/notmuch-python { pythonPackages = python3Packages; };
   notmuch-vim = callPackage ./notmuch/notmuch-vim {};
-  openarc = callPackage ./openarc { inherit mylibs; };
+  openarc = (mylibs.flakeCompat ../flakes/openarc).default;
   opendmarc = callPackage ./opendmarc { libspf2 = callPackage ./opendmarc/libspf2.nix {}; };
   pg_activity = callPackage ./pg_activity { inherit mylibs; };
   pgloader = callPackage ./pgloader {};