diff --git a/flake.lock b/flake.lock index d807c7d..de52b3c 100644 --- a/flake.lock +++ b/flake.lock @@ -64,6 +64,24 @@ "type": "github" } }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -101,11 +119,48 @@ "type": "github" } }, + "nixseparatedebuginfod": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1699185600, + "narHash": "sha256-jxU+5plCvsOJYEdLQTi7sKOOAnndin2sslYOF0Ys66g=", + "owner": "symphorien", + "repo": "nixseparatedebuginfod", + "rev": "232591f5274501b76dbcd83076a57760237fcd64", + "type": "github" + }, + "original": { + "owner": "symphorien", + "repo": "nixseparatedebuginfod", + "type": "github" + } + }, "root": { "inputs": { "agenix": "agenix", "bscpkgs": "bscpkgs", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "nixseparatedebuginfod": "nixseparatedebuginfod" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" } } }, diff --git a/flake.nix b/flake.nix index 807721a..6b19cc5 100644 --- a/flake.nix +++ b/flake.nix @@ -5,6 +5,8 @@ agenix.inputs.nixpkgs.follows = "nixpkgs"; bscpkgs.url = "git+https://git.sr.ht/~rodarima/bscpkgs"; bscpkgs.inputs.nixpkgs.follows = "nixpkgs"; + nixseparatedebuginfod.url = "github:symphorien/nixseparatedebuginfod"; + nixseparatedebuginfod.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = { self, nixpkgs, agenix, bscpkgs, ... }: diff --git a/m/eudy/configuration.nix b/m/eudy/configuration.nix index c627bf8..7d1f5e1 100644 --- a/m/eudy/configuration.nix +++ b/m/eudy/configuration.nix @@ -10,6 +10,7 @@ ./fs.nix ./users.nix ./slurm.nix + ../module/debuginfod.nix ]; # Select this using the ID to avoid mismatches diff --git a/m/hut/configuration.nix b/m/hut/configuration.nix index 9187812..d571053 100644 --- a/m/hut/configuration.nix +++ b/m/hut/configuration.nix @@ -5,6 +5,7 @@ ../common/main.nix ../module/ceph.nix + ../module/debuginfod.nix ./gitlab-runner.nix ./monitoring.nix ./nfs.nix diff --git a/m/module/debuginfod.nix b/m/module/debuginfod.nix new file mode 100644 index 0000000..6d3c135 --- /dev/null +++ b/m/module/debuginfod.nix @@ -0,0 +1,12 @@ +{ theFlake, ... }: + +let + nixseparatedebuginfod = theFlake.inputs.nixseparatedebuginfod; +in +{ + imports = [ + nixseparatedebuginfod.nixosModules.default + ]; + + services.nixseparatedebuginfod.enable = true; +}