diff --git a/README.md b/README.md index 9fbba36..cbe8b2b 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index 04b76e6..52d9ca4 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -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 diff --git a/flake.nix b/flake.nix index c85dde6..b1915e8 100644 --- a/flake.nix +++ b/flake.nix @@ -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 { diff --git a/lib/default.nix b/lib/default.nix index 860d1dd..c1593aa 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -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; }; diff --git a/lib/systems.nix b/lib/systems.nix index a3188f2..4cb2607 100644 --- a/lib/systems.nix +++ b/lib/systems.nix @@ -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 diff --git a/modules/autopull.nix b/modules/autopull.nix index 1b114f2..545b1ea 100644 --- a/modules/autopull.nix +++ b/modules/autopull.nix @@ -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 ]; diff --git a/modules/kub_net.nix b/modules/kub_net.nix index 5361106..58fa949 100644 --- a/modules/kub_net.nix +++ b/modules/kub_net.nix @@ -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; diff --git a/modules/yubikey.nix b/modules/yubikey.nix index e2430ad..3b98a77 100644 --- a/modules/yubikey.nix +++ b/modules/yubikey.nix @@ -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"; }; diff --git a/shell.nix b/shell.nix index 604d119..662d47d 100644 --- a/shell.nix +++ b/shell.nix @@ -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 ]; }; diff --git a/systems/artemision/configuration.nix b/systems/artemision/configuration.nix index cfb3843..9bf71c9 100644 --- a/systems/artemision/configuration.nix +++ b/systems/artemision/configuration.nix @@ -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; }; diff --git a/systems/palatine-hill/docker/archiveteam.nix b/systems/palatine-hill/docker/archiveteam.nix index 43ae592..c07f941 100644 --- a/systems/palatine-hill/docker/archiveteam.nix +++ b/systems/palatine-hill/docker/archiveteam.nix @@ -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; diff --git a/systems/palatine-hill/docker/minecraft.nix b/systems/palatine-hill/docker/minecraft.nix index 37fae2b..0a5d0db 100644 --- a/systems/palatine-hill/docker/minecraft.nix +++ b/systems/palatine-hill/docker/minecraft.nix @@ -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) ) ]; };