diff --git a/credentials.yml b/credentials.yml index f405c85..ef9f47c 100644 --- a/credentials.yml +++ b/credentials.yml @@ -22,6 +22,12 @@ credentials: pubkey_unencrypted: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINOqM08nqvcFhcF6E//dlphXctfck83N0tjKIfil8npY htran@Hung-Tran-MBP.local agepriv: ENC[AES256_GCM,data:Z4qRvam25nvkNr4DuZhhKtN83NIfNcBW5Wq7SGm0Nb31kAjCS25VfkTrXUtrxWIunMCZEYoIdDLiENjRQPAh/NwffGbZn94/ZKY=,iv:t3YtQvRQPdbDcXgEC/A13W1K9/IIlt6rPceR1lAl0BM=,tag:QmiriOk19fGSPOWj98doUQ==,type:str] agepub_unencrypted: age1jz7ajxer3fs02uygr8a374jfk7vuklpnnyugrlq4equ285t7nyfqwqdreq + - kind: + name_unencrypted: win-rdp + name_unencrypted: EGNGoat + ip: ENC[AES256_GCM,data:9/FPJM8l4hLvzDc5pg==,iv:ny1LKtgznhzMd3Bhogwu6b6bOk3/uCNarKTmlWRZAes=,tag:PsleUu2ZE4leEMEcEuJdLQ==,type:str] + user_unencrypted: EGN NOC + password: ENC[AES256_GCM,data:YOL5Sw6zaA==,iv:Cs8gySfGIQUBPivkM5N6kflZsRhp2w9xmPwtl7RrEZE=,tag:LXYKdsX++IP+jQyjL6JBrg==,type:str] sops: kms: [] gcp_kms: [] @@ -46,8 +52,8 @@ sops: Q0ZxRXNvTGlJVHNiZFNyMU5XaTM0YTQKUJvYfdyGqPFmONa+8jKjVb9tbke/HsL2 X33WHFVrQf2uOMRf3yAzRm5SfpdULFQ+JTP3CEUmcZ2nUxTmUs+X6A== -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-02-14T18:27:01Z" - mac: ENC[AES256_GCM,data:2xzBab7XdYxDj4/kRIBlzRMo4AaEFAKRWz2gf8gYUN5hixS/wKra/itJLRBOVQ4VE7CVvjLWfeiMYib/aSSn0wqsjEbdHA7C2f7L1/anafVxPB4oEVdZ+Nvt9j8qQKP5FaDEkjAEw0X+EV20t3vH50Ct3LXdm5ncWH+mYGdriBc=,iv:6bB5P4svjSTLrnC6J/fn6rdpwI3+qLfxDxzRxHzbiGs=,tag:F55VCE8vRoTqeVPuhtil/g==,type:str] + lastmodified: "2023-02-15T17:08:58Z" + mac: ENC[AES256_GCM,data:FKf97bndBFxwp1d+wctwbtkkDPEJR+hsr36gXF1hiCByUyqJwjioejSKo8+ZBqJOezFwB6e77oHV1P1rf2wzC6+IvBspFIvWKZPQgCaLs0zIjbv5nZD8lpbE8nU19mEWGrgzuW0tfVaKmcq4aH1ExQS5M7HBx5Fy0gSgkUHlrmM=,iv:9poN0lEvYV5WcXP/1UdtmIMttUO2DGufQ4vK92GPNaM=,tag:VrQaFCdq3orhtrams4hj5Q==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.7.3 diff --git a/flake.nix b/flake.nix index b5d0b7f..3a1b65e 100644 --- a/flake.nix +++ b/flake.nix @@ -60,6 +60,7 @@ # this function should take simple exports of homeConfigurations.${profile}, # nixosConfigurations.${profile}, devShells.${profile}, packages.${profile} # and correctly produce + supported_systems = flake-utils.lib.defaultSystems; cross_platform = config_fn: let # nixosConfigurations.${profile} -> nixosConfigurations.${system}.${profile} # pass in: path.to.exports.nixosConfigurations @@ -93,7 +94,7 @@ (acc: confName: (strategyMap."${confName}" confName config."${confName}" system)) {} (builtins.attrNames config)); in builtins.foldl' nixlib.lib.recursiveUpdate {} ( - builtins.map (system: (mapConfig (config_fn system) system)) flake-utils.lib.defaultSystems + builtins.map (system: (mapConfig (config_fn system) system)) supported_systems ); in cross_platform (system: let @@ -175,6 +176,6 @@ debug = { inherit final_inputs hosts users modules lib inputs_w_lib unit_tests pkgs nixpkgs nixlib; }; - formatter."${system}" = pkgs.nixpkgs-fmt; + # formatter."${system}" = pkgs.nixpkgs-fmt; }); } diff --git a/native_configs/ssh/config b/native_configs/ssh/config index 34043ac..ee37eae 100644 --- a/native_configs/ssh/config +++ b/native_configs/ssh/config @@ -85,3 +85,9 @@ Host d3l-3 HostName 10.111.103.65 User htran Port 22 + +Host goat + HostName 10.133.32.100 + User "EGN NOC" + Port 22 + diff --git a/templates/py-poetry/README.md b/templates/py-poetry/README.md index 2b1e13a..8d5e3da 100644 --- a/templates/py-poetry/README.md +++ b/templates/py-poetry/README.md @@ -23,6 +23,11 @@ poetry init ### Libraries worth integrating +- [pytest](https://github.com/pytest-dev/pytest) Testing framework for Python + +```sh +poetry add --group dev pytest +``` - [tophat/syrupy](https://github.com/tophat/syrupy) Snapshot testing plugin for (builtin) pytest ```sh