diff --git a/flake.lock b/flake.lock index 2196667..61f5016 100644 --- a/flake.lock +++ b/flake.lock @@ -160,11 +160,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1693833206, - "narHash": "sha256-wHOY0nnD6gWj8u9uI85/YlsganYyWRK1hLFZulZwfmY=", + "lastModified": 1694435990, + "narHash": "sha256-yLQPD2eZGepu3yvdwABXrR3GhAqWRWTj9rn3a4knYuk=", "owner": "numtide", "repo": "devshell", - "rev": "65114ea495a8d3cc1352368bf170d67ef005aa5a", + "rev": "f6aec2e8b1cdddcab10ce7fc2eac66886e3deaad", "type": "github" }, "original": { @@ -180,11 +180,11 @@ ] }, "locked": { - "lastModified": 1694069327, - "narHash": "sha256-Si2otUNjCe8kY5nsV7tILi4PsI0odBFrdSu8cCjn/eQ=", + "lastModified": 1694710969, + "narHash": "sha256-5nMY+3JF/ktW8D8URataP6MCbbnID13P4CixARNoq6w=", "owner": "nix-community", "repo": "disko", - "rev": "7bee8de8e6755506c70323b864a884f9624cc23a", + "rev": "91af5b4a53ee8e57f4178ef58036dce49fbda91a", "type": "github" }, "original": { @@ -359,11 +359,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1692799911, - "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -377,11 +377,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1692799911, - "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -440,11 +440,11 @@ ] }, "locked": { - "lastModified": 1694134858, - "narHash": "sha256-fG/ESauOGmiojKlpJG8gB62dJa5Wd+ZIuiDMKK/HD3g=", + "lastModified": 1694643239, + "narHash": "sha256-pv2k/5FvyirDE8g4TNehzwZ0T4UOMMmqWSQnM/luRtE=", "owner": "nix-community", "repo": "home-manager", - "rev": "19c6a4081b14443420358262f8416149bd79561a", + "rev": "d9b88b43524db1591fb3d9410a21428198d75d49", "type": "github" }, "original": { @@ -455,11 +455,11 @@ }, "impermanence": { "locked": { - "lastModified": 1690797372, - "narHash": "sha256-GImz19e33SeVcIvBB7NnhbJSbTpFFmNtWLh7Z85Y188=", + "lastModified": 1694622745, + "narHash": "sha256-z397+eDhKx9c2qNafL1xv75lC0Q4nOaFlhaU1TINqb8=", "owner": "nix-community", "repo": "impermanence", - "rev": "e3a7acd113903269a1b5c8b527e84ce7ee859851", + "rev": "e9643d08d0d193a2e074a19d4d90c67a874d932e", "type": "github" }, "original": { @@ -474,11 +474,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1693844549, - "narHash": "sha256-q37gKJEJ8H+bvcQRuZpbGTDU/GvyrpMtaejhFvS8mSc=", + "lastModified": 1694606970, + "narHash": "sha256-ZFLOqdkQ5mww+hSyi3197iwD+3qKiZyrspumzmyo5GQ=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "80552e56920ed1acc248596a13d8f0b4932138d3", + "rev": "d3726e6c98c3110deb9901346a9cfaeac844d292", "type": "github" }, "original": { @@ -509,11 +509,11 @@ ] }, "locked": { - "lastModified": 1693938349, - "narHash": "sha256-EfBNsd0okJz0PrBiLxTKQVpZKxrQe+Xn/Ji/o4bCTyc=", + "lastModified": 1694526290, + "narHash": "sha256-HiWr+tfJE/hcn8atRC0S5KweSUknQLEduPLTEiSr5J8=", "owner": "astro", "repo": "microvm.nix", - "rev": "8d2a99baa151bc120b3f062aadbfaca7a942c23a", + "rev": "03e7f11cf915a911277c2cdea5d7da9717597aa2", "type": "github" }, "original": { @@ -529,11 +529,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1694051403, - "narHash": "sha256-TbCcylrAPLhKu7s7mnjwQjkrqBMjI9/ysiysfKn5XHs=", + "lastModified": 1694654058, + "narHash": "sha256-Wo0yw5ow7OSJvK94CD708zcSVfm9CCi5WFopP3BDaVc=", "owner": "nix-community", "repo": "nix-eval-jobs", - "rev": "9cc7944c28c2bc5de3c96c253b3fd814c1cb85dd", + "rev": "3e635f33fb31b39305ff378ed66149a4b3715985", "type": "github" }, "original": { @@ -580,11 +580,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1693718952, - "narHash": "sha256-+nGdJlgTk0MPN7NygopipmyylVuAVi7OItIwTlwtGnw=", + "lastModified": 1694710316, + "narHash": "sha256-uRh46iIC86D8BD1wCDA5gRrt+hslUXiD0kx/UjnjBcs=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "793de77d9f83418b428e8ba70d1e42c6507d0d35", + "rev": "570256327eb6ca6f7bebe8d93af49459092a0c43", "type": "github" }, "original": { @@ -616,11 +616,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1693985761, - "narHash": "sha256-K5b+7j7Tt3+AqbWkcw+wMeqOAWyCD1MH26FPZyWXpdo=", + "lastModified": 1694422566, + "narHash": "sha256-lHJ+A9esOz9vln/3CJG23FV6Wd2OoOFbDeEs4cMGMqc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0bffda19b8af722f8069d09d8b6a24594c80b352", + "rev": "3a2786eea085f040a66ecde1bc3ddc7099f6dbeb", "type": "github" }, "original": { @@ -632,11 +632,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1693701915, - "narHash": "sha256-waHPLdDYUOHSEtMKKabcKIMhlUOHPOOPQ9UyFeEoovs=", + "lastModified": 1694306727, + "narHash": "sha256-26fkTOJOI65NOTNKFvtcJF9mzzf/kK9swHzfYt1Dl6Q=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "f5af57d3ef9947a70ac86e42695231ac1ad00c25", + "rev": "c30b6a84c0b84ec7aecbe74466033facc9ed103f", "type": "github" }, "original": { @@ -687,11 +687,11 @@ ] }, "locked": { - "lastModified": 1694153975, - "narHash": "sha256-ah3bonusoGdKsdluVCg2f+8MiJzwFitl2zzYqImzpDc=", + "lastModified": 1694708370, + "narHash": "sha256-9d+LPbFuxUOVZNEDz5w6mJAbqVMkkedNi5qSvF171Jg=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "30761a7314d5f71d057d6c914685acbf550b280d", + "rev": "a6cdb64d5a278ff7059a684561fd1d54f6117bcf", "type": "github" }, "original": { @@ -702,11 +702,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1694048283, - "narHash": "sha256-QexXMDukc4fmXq5SJsDg8WRA6+FiEOt+PB3hx+fbc8o=", + "lastModified": 1694651847, + "narHash": "sha256-W+2eI96glLiEwLnX/kWn5HDO7WfKKkF0lKW9yyNLEbY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "308e5f73e17dc2fe43ba95ec83697999b5dd544d", + "rev": "46ea94edba83944a236850bbc0bfd92785736b00", "type": "github" }, "original": { @@ -716,6 +716,29 @@ "type": "github" } }, + "nixseparatedebuginfod": { + "inputs": { + "flake-utils": [ + "flake-utils" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1687629384, + "narHash": "sha256-p0m0AXL2s1RhymW7BXfcR6oYfZhYDNmnSiuTQoyP/2o=", + "owner": "symphorien", + "repo": "nixseparatedebuginfod", + "rev": "08d4f56a656c38eb414aeedecd9f02cb57ffb2a8", + "type": "github" + }, + "original": { + "owner": "symphorien", + "repo": "nixseparatedebuginfod", + "type": "github" + } + }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat_3", @@ -757,11 +780,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1692274144, - "narHash": "sha256-BxTQuRUANQ81u8DJznQyPmRsg63t4Yc+0kcyq6OLz8s=", + "lastModified": 1694364351, + "narHash": "sha256-oadhSCqopYXxURwIA6/Anpe5IAG11q2LhvTJNP5zE6o=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "7e3517c03d46159fdbf8c0e5c97f82d5d4b0c8fa", + "rev": "4f883a76282bc28eb952570afc3d8a1bf6f481d7", "type": "github" }, "original": { @@ -788,6 +811,7 @@ "nixos-nftables-firewall": "nixos-nftables-firewall", "nixpkgs": "nixpkgs", "nixpkgs-wayland": "nixpkgs-wayland", + "nixseparatedebuginfod": "nixseparatedebuginfod", "pre-commit-hooks": "pre-commit-hooks_2", "templates": "templates" } @@ -934,11 +958,11 @@ ] }, "locked": { - "lastModified": 1693817438, - "narHash": "sha256-fg3+n4Ky1gCzDtPm0MomMTFw0YkH05Y8ojy5t7bkfHg=", + "lastModified": 1694528738, + "narHash": "sha256-aWMEjib5oTqEzF9f3WXffC1cwICo6v/4dYKjwNktV8k=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "b8d3a059f5487d6767d07c3716386753e3132d9f", + "rev": "7a49c388d7a6b63bb551b1ddedfa4efab8f400d8", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c824a29..d6e43cd 100644 --- a/flake.nix +++ b/flake.nix @@ -54,6 +54,12 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + nixseparatedebuginfod = { + url = "github:symphorien/nixseparatedebuginfod"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.flake-utils.follows = "flake-utils"; + }; + microvm = { url = "github:astro/microvm.nix"; inputs.nixpkgs.follows = "nixpkgs"; @@ -91,6 +97,7 @@ nixos-generators, nixpkgs, nixpkgs-wayland, + nixseparatedebuginfod, pre-commit-hooks, ... } @ inputs: let @@ -150,6 +157,7 @@ elewrap.overlays.default microvm.overlay nixpkgs-wayland.overlay + nixseparatedebuginfod.overlays.default ]; }; diff --git a/modules/optional/dev/default.nix b/modules/optional/dev/default.nix index 4e2f576..187477d 100644 --- a/modules/optional/dev/default.nix +++ b/modules/optional/dev/default.nix @@ -1,8 +1,14 @@ -{ +{pkgs, ...}: { imports = [ ./documentation.nix ./yubikey.nix ]; + environment.systemPackages = with pkgs; [ + (gdb.override { enableDebuginfod = true; }) + hotspot + ]; + environment.enableDebugInfo = true; + services.nixseparatedebuginfod.enable = true; } diff --git a/nix/generate-node.nix b/nix/generate-node.nix index eb1c4f6..ffba54e 100644 --- a/nix/generate-node.nix +++ b/nix/generate-node.nix @@ -7,6 +7,7 @@ home-manager, impermanence, nixos-nftables-firewall, + nixseparatedebuginfod, ... } @ inputs: { # The name of the generated node @@ -35,5 +36,6 @@ home-manager.nixosModules.default impermanence.nixosModules.impermanence nixos-nftables-firewall.nixosModules.default + nixseparatedebuginfod.nixosModules.default ]; }