X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=flakes%2Fopenarc%2Fflake.nix;h=fbb7fb13a8bc72bc18b7a0200d013b4897e1b8cf;hb=HEAD;hp=f47afcf0ee4d30dc4587a2cf99414c58839a9b94;hpb=5e2ec9fb8628136e7f9f618c68c0e42ab086b80e;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/flakes/openarc/flake.nix b/flakes/openarc/flake.nix
index f47afcf..17a3fdd 100644
--- a/flakes/openarc/flake.nix
+++ b/flakes/openarc/flake.nix
@@ -2,9 +2,7 @@
   description = "Open source ARC implementation";
 
   inputs.myuids = {
-    url = "https://git.immae.eu/perso/Immae/Config/Nix.git";
-    type = "git";
-    dir = "flakes/myuids";
+    url = "path:../myuids";
   };
   inputs.flake-utils.url = "github:numtide/flake-utils";
   inputs.nixpkgs.url = "github:NixOS/nixpkgs";
@@ -63,9 +61,11 @@
       nixosModule = { config, lib, pkgs, ... }:
         let
           cfg = config.services.openarc;
-          defaultSock = "local:/run/openarc/openarc.sock";
-          args = [ "-f" "-p" cfg.socket ] ++ lib.optionals (cfg.configFile != null) [ "-c" cfg.configFile ];
+          defaultSock = "/run/openarc/openarc.sock";
+          args = [ "-f" "-p" "local:${cfg.socket}" ] ++ lib.optionals (cfg.configFile != null) [ "-c" cfg.configFile ];
         in {
+          # Necessary for situations where flake gets included multiple times
+          key = builtins.hashString "sha256" (builtins.path { path = self.sourceInfo.outPath; name = "source"; });
           options = {
             services.openarc = {
               enable = lib.mkOption {
@@ -102,6 +102,7 @@
           };
 
           config = lib.mkIf cfg.enable {
+            nixpkgs.overlays = [ self.overlay ];
             users.users = lib.optionalAttrs (cfg.user == "openarc") {
               openarc = {
                 group = cfg.group;
@@ -113,7 +114,7 @@
               openarc.gid = myuids.lib.gids.openarc;
             };
 
-            environment.systemPackages = [ self.defaultPackage."${pkgs.system}" ];
+            environment.systemPackages = [ pkgs.openarc ];
 
             systemd.services.openarc = {
               description = "OpenARC daemon";