diff options
Diffstat (limited to '')
| -rw-r--r-- | flake/overlays.nix | 2 | ||||
| -rw-r--r-- | machines/darwin/aarch64-darwin/HQ-KWNY2VH41P.nix (renamed from machines/darwin/aarch64-darwin/hq-kwny2vh41p.nix) | 3 | ||||
| -rw-r--r-- | users/profiles/work.nix | 18 |
3 files changed, 11 insertions, 12 deletions
diff --git a/flake/overlays.nix b/flake/overlays.nix index 83eadd0..1429138 100644 --- a/flake/overlays.nix +++ b/flake/overlays.nix @@ -3,6 +3,8 @@ flake.overlays.default = _final: prev: { llmPython = prev.callPackage "${self}/pkgs/llmPython/" { }; + sapi = prev.callPackage "${self}/pkgs/sapi" { }; + hashi = prev.callPackage "${self}/pkgs/hashi" { }; }; perSystem = diff --git a/machines/darwin/aarch64-darwin/hq-kwny2vh41p.nix b/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P.nix index e0ebf11..640ec4b 100644 --- a/machines/darwin/aarch64-darwin/hq-kwny2vh41p.nix +++ b/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P.nix @@ -13,9 +13,6 @@ system.primaryUser = adminUser.name; - # https://github.com/nix-darwin/nix-darwin/issues/1339 - ids.gids.nixbld = 30000; - fonts.packages = with pkgs; [ source-code-pro ]; diff --git a/users/profiles/work.nix b/users/profiles/work.nix index 8d0f4fd..33a1e3e 100644 --- a/users/profiles/work.nix +++ b/users/profiles/work.nix @@ -30,8 +30,8 @@ in home.packages = with pkgs; [ awscli2 boundary # for secure remote access - customPackages.hashi - customPackages.sapi + hashi + sapi nomad-prod tfswitch vault @@ -68,11 +68,11 @@ in builtins.concatMap (env: [ { name = "ssh-sign-${env.alias}"; - value = "${pkgs.customPackages.hashi}/bin/hashi -e ${env.name} sign --output-path=/Users/fcuny/.ssh/cert-${env.alias} --key=(${pkgs._1password-cli}/bin/op read 'op://employee/default rbx ssh key/public key'|psub) key"; + value = "${pkgs.hashi}/bin/hashi -e ${env.name} sign --output-path=/Users/fcuny/.ssh/cert-${env.alias} --key=(${pkgs._1password-cli}/bin/op read 'op://employee/default rbx ssh key/public key'|psub) key"; } { name = "hashi-${env.alias}"; - value = "${pkgs.customPackages.hashi}/bin/hashi -e ${env.name} show v"; + value = "${pkgs.hashi}/bin/hashi -e ${env.name} show v"; } { name = "ssh-${env.alias}"; @@ -83,11 +83,11 @@ in # Add any additional non-environment specific aliases additionalAliases = { - "sjump-st1-snc2" = "${pkgs.customPackages.sapi}/bin/sapi jump sitetest1-snc2"; - "sjump-st1-snc3" = "${pkgs.customPackages.sapi}/bin/sapi jump sitetest3-snc2"; - "sjump-st2-snc2" = "${pkgs.customPackages.sapi}/bin/sapi jump sitetest2-snc2"; - "sjump-st3" = "${pkgs.customPackages.sapi}/bin/sapi jump sitetest3"; - "sjump" = "${pkgs.customPackages.sapi}/bin/sapi jump"; + "sjump-st1-snc2" = "${pkgs.sapi}/bin/sapi jump sitetest1-snc2"; + "sjump-st1-snc3" = "${pkgs.sapi}/bin/sapi jump sitetest3-snc2"; + "sjump-st2-snc2" = "${pkgs.sapi}/bin/sapi jump sitetest2-snc2"; + "sjump-st3" = "${pkgs.sapi}/bin/sapi jump sitetest3"; + "sjump" = "${pkgs.sapi}/bin/sapi jump"; "ssh-edge" = "ssh -o StrictHostKeyChecking=no -o IdentitiesOnly=yes -J chi1-jumpcontainer-es -i (${pkgs._1password-cli}/bin/op read 'op://Infra-Compute-Edge-rks/ice_ssh-private-key/ice_rsa'|psub)"; }; |