From c06bedc73ca434f4549271cdce01112cac63022f Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Wed, 22 May 2024 13:26:07 +0200 Subject: [PATCH] feat: add pennae as root and bump jobserver Signed-off-by: Raito Bezarius --- flake.lock | 8 ++++---- flake.nix | 2 +- modules/users/friends.nix | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 0c1856a..74d34c3 100644 --- a/flake.lock +++ b/flake.lock @@ -336,17 +336,17 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1716155578, - "narHash": "sha256-+ocwkKmur5q8MJpm8ao0O2wdbMYBxPtFDrCvjqnkZYA=", + "lastModified": 1716330751, + "narHash": "sha256-JLvLi84gRMwgF9DumUwiOUA5UciXf9e2Aaa07sKx4Y0=", "owner": "pennae", "repo": "nixpkgs", - "rev": "093d16ae7a4c6b5f215152972a223b9fbcd3343a", + "rev": "8e505de834edbac6d581589ebd18339c38d32731", "type": "github" }, "original": { "owner": "pennae", - "ref": "stdenv-jobserver", "repo": "nixpkgs", + "rev": "8e505de834edbac6d581589ebd18339c38d32731", "type": "github" } }, diff --git a/flake.nix b/flake.nix index c52f6dd..06af59b 100644 --- a/flake.nix +++ b/flake.nix @@ -10,7 +10,7 @@ flake-parts.url = "github:hercules-ci/flake-parts"; flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs"; - nixpkgs.url = "github:pennae/nixpkgs/stdenv-jobserver"; + nixpkgs.url = "github:pennae/nixpkgs/8e505de834edbac6d581589ebd18339c38d32731"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; nixos-hardware.url = "github:NixOS/nixos-hardware"; diff --git a/modules/users/friends.nix b/modules/users/friends.nix index 62fcbe7..d7aa355 100644 --- a/modules/users/friends.nix +++ b/modules/users/friends.nix @@ -61,7 +61,8 @@ in home = "/home/pennae"; shell = "/run/current-system/sw/bin/zsh"; uid = 2006; - extraGroups = trustedFriendGroups; + # Raito: Allowed to debug jobserver. + extraGroups = [ "wheel" ] ++ trustedFriendGroups; openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC5Wf5/IbyFpdziWfwxkQqxOf3r1L9pYn6xQBEKFwmMY" "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIK8icXjHkb4XzbIVN3djH4CE7RvgGd+3xbG4cgh0Yls5AAAABHNzaDo="