remove RAD references #74

Merged
ahuston-0 merged 3 commits from feature/resync-hydra into main 2025-04-01 15:27:47 -04:00
12 changed files with 18 additions and 21 deletions

View File

@ -14,9 +14,7 @@ to onboard a new user or system.
Although we are not actively looking for new members to join in on this repo,
we are not strictly opposed. Please reach out to
[@ahuston-0](https://github.com/ahuston-0) or
[@RichieCahill](https://github.com/RichieCahill)
for further information.
[@ahuston-0](https://nayeonie.com/ahuston-0) for further information.
## Repo Structure

View File

@ -107,8 +107,7 @@ rules.
We allow secrets to be embedded in the repository using `sops-nix`. As part of
the process everything is encrypted, however adding a new user is a change
that every existing SOPS user needs to participate in. Please reach out to
[@ahuston-0](https://github.com/ahuston-0) or
[@RichieCahill](https://github.com/RichieCahill) if you are interested
[@ahuston-0](https://nayeonie.com/ahuston-0) or if you are interested
in using secrets on your machines.
## CI/CD

View File

@ -136,7 +136,7 @@
systems = [
"x86_64-linux"
# disable arm for now as hydra isn't set up for it
# "aarch64-linux"
# "aarch64-linuxa
];
forEachSystem = lib.genAttrs systems;
@ -152,7 +152,7 @@
lib = self;
}
);
inherit (lib.rad-dev.systems) genSystems getImages;
inherit (lib.adev.systems) genSystems getImages;
inherit (self) outputs; # for hydra
in
rec {

View File

@ -1,7 +1,7 @@
{ lib, ... }:
{
# create rad-dev namespace for lib
rad-dev = rec {
# create adev namespace for lib
adev = rec {
systems = import ./systems.nix { inherit lib; };
container-utils = import ./container-utils.nix { inherit lib; };

View File

@ -176,7 +176,7 @@ rec {
(configPath + "/configuration.nix")
]
++ modules
++ (lib.rad-dev.fileList (src + "/modules"))
++ (lib.adev.fileList (src + "/modules"))
++ genWrapper sops genSops args
++ genWrapper home genHome args
++ genWrapper true genUsers args
@ -222,7 +222,7 @@ rec {
// import configPath { inherit inputs; }
);
}
) (lib.rad-dev.lsdir path)
) (lib.adev.lsdir path)
);
# gets all the images of a specified format

View File

@ -61,7 +61,7 @@ in
lib.mkIf cfg.enable {
environment.systemPackages =
[ pkgs.git ]
++ lib.optionals (lib.any (ssh-key: ssh-key != "") (lib.rad-dev.mapGetAttr "ssh-key" repos)) [
++ lib.optionals (lib.any (ssh-key: ssh-key != "") (lib.adev.mapGetAttr "ssh-key" repos)) [
pkgs.openssh
];

View File

@ -1,10 +1,10 @@
{ lib, config, ... }:
let
cfg = config.services.rad-dev.k3s-net;
cfg = config.services.adev.k3s-net;
in
{
options = {
services.rad-dev.k3s-net = {
services.adev.k3s-net = {
enable = lib.mkOption {
default = false;
example = true;

View File

@ -5,11 +5,11 @@
...
}:
let
cfg = config.services.rad-dev.yubikey;
cfg = config.services.adev.yubikey;
in
{
options = {
services.rad-dev.yubikey = {
services.adev.yubikey = {
enable = lib.mkEnableOption "enable yubikey defaults";
enable-desktop-app = lib.mkEnableOption "installs desktop application";
};

View File

@ -38,7 +38,7 @@ forEachSystem (
};
# constructs a custom shell with commonly used utilities
rad-dev = pkgs.mkShell {
adev = pkgs.mkShell {
packages = with pkgs; [
deadnix
pre-commit
@ -56,7 +56,7 @@ forEachSystem (
default = pkgs.mkShell {
inputsFrom = [
pre-commit
rad-dev
adev
sops
];
};

View File

@ -75,7 +75,7 @@
fprintd.enable = lib.mkForce false;
openssh.enable = lib.mkForce false;
rad-dev.yubikey = {
adev.yubikey = {
enable = true;
enable-desktop-app = true;
};

View File

@ -122,7 +122,7 @@ let
cmd = lib.splitString " " "--concurrent 6 AmAnd0";
};
inherit (lib.rad-dev.container-utils) createTemplatedContainers;
inherit (lib.adev.container-utils) createTemplatedContainers;
vars = import ../vars.nix;
at_path = vars.primary_archiveteam;

View File

@ -46,7 +46,7 @@ in
cmd = [
(
"--mapping=mc.alicehuston.xyz=${defaultServer}:25565"
+ (lib.rad-dev.mapAttrsToString (hostname: url: "," + url + "=" + hostname + ":25565") servers)
+ (lib.adev.mapAttrsToString (hostname: url: "," + url + "=" + hostname + ":25565") servers)
)
];
};