diff --git a/flake.nix b/flake.nix index 09f54fe..480d512 100644 --- a/flake.nix +++ b/flake.nix @@ -68,7 +68,7 @@ }; nixseparatedebuginfod = { - url = "github:symphorien/nixseparatedebuginfod"; + url = "github:symphorien/nixseparatedebuginfod/466110a37e11a33a3551b44d9da5e323a8924cfa"; inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-utils.follows = "flake-utils"; }; diff --git a/modules/optional/dev/default.nix b/modules/optional/dev/default.nix index 33372f3..4c29439 100644 --- a/modules/optional/dev/default.nix +++ b/modules/optional/dev/default.nix @@ -18,21 +18,10 @@ lib.optionalAttrs (!minimal) { # Add the agenix-rekey sandbox path permanently to avoid adding myself to trusted-users nix.settings.extra-sandbox-paths = ["/var/tmp/agenix-rekey"]; - services.nixseparatedebuginfod.enable = true; - # We need a system-level user to be able to use nix.settings.allowed-users with it. - # TODO: remove once https://github.com/NixOS/nix/issues/9071 is fixed - systemd.services.nixseparatedebuginfod.serviceConfig = { - DynamicUser = lib.mkForce false; - User = "nixseparatedebuginfod"; - Group = "nixseparatedebuginfod"; - PrivateTmp = true; + services.nixseparatedebuginfod = { + enable = true; + # We need a system-level user to be able to use nix.settings.allowed-users with it. + # TODO: remove once https://github.com/NixOS/nix/issues/9071 is fixed + allowUser = true; }; - users = { - groups.nixseparatedebuginfod = {}; - users.nixseparatedebuginfod = { - description = "nixseparatedebuginfod user"; - group = "nixseparatedebuginfod"; - }; - }; - nix.settings.allowed-users = ["nixseparatedebuginfod"]; }