Syzygial/New-Alan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Syzygial:b8e8615282ac7c569a9c582cdc3fea4f91a9e6f9
Branches Tags
Syzygial:main
...
compare: Syzygial:a9e4a58f1fa4d1d81429adf436868fab1407beb9
Branches Tags
Syzygial:main

7 Commits
b8e8615282 ... a9e4a58f1f

Author SHA1 Message Date
DavidCrompton1192@gmail.com
a9e4a58f1f Add Secret Tools to Dev Env 2023-03-08 23:28:26 -05:00
DavidCrompton1192@gmail.com
5dae7744ef Container Deployment 2023-03-08 23:28:13 -05:00
DavidCrompton1192@gmail.com
fc1505314f Changed Key 2023-03-08 23:28:03 -05:00
DavidCrompton1192@gmail.com
ed4ee91239 Secrets Time 2023-03-08 23:16:42 -05:00
DavidCrompton1192@gmail.com
96830ee2c3 Update Deploy Flake 2023-03-08 00:46:23 -05:00
DavidCrompton1192@gmail.com
9b384f8757 Move deploy 2023-03-08 00:20:20 -05:00
DavidCrompton1192@gmail.com
1acef51a6f Deploy Nix Config 2023-03-07 23:18:11 -05:00
7 changed files with 264 additions and 18 deletions
Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -5,3 +5,4 @@ node_modules
/target
result*
.DS_Store
/.tmp

9
.sops.yaml Normal file
View File

@@ -0,0 +1,9 @@
keys:
- &hydra age12qq2fn4nxx9g99vp5knndtn0xa0p6g9ztn48gv9ap8054am39c3qsezz90
- &universedesk age1apajqje4zvah0n2dzds3kstlsakqr2ntk64xl7xc4erzedsuy9jqqk7cd7
creation_rules:
- path_regex: secrets/[^/]+\.yaml$
key_groups:
- age:
- *hydra
- *universedesk

175
deploy/flake.lock generated Normal file
View File

@@ -0,0 +1,175 @@
{
"nodes": {
"advisory-db": {
"flake": false,
"locked": {
"lastModified": 1678190193,
"narHash": "sha256-nuiUyTTjzMVfeRZInX81mBrWk26/2AgjZs/cdjX1oIk=",
"owner": "rustsec",
"repo": "advisory-db",
"rev": "292b3a8437125f015adbd32efd6bcdbbd95303f3",
"type": "github"
},
"original": {
"owner": "rustsec",
"repo": "advisory-db",
"type": "github"
}
},
"crane": {
"inputs": {
"flake-compat": "flake-compat",
"flake-utils": "flake-utils",
"nixpkgs": [
"newalan",
"nixpkgs"
],
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1678152261,
"narHash": "sha256-cPRDxwygVMleiSEGELrvAiq9vYAN4c3KK/K4UEO13vU=",
"owner": "ipetkov",
"repo": "crane",
"rev": "5291dd0aa7a52d607fc952763ef60714e4c881d4",
"type": "github"
},
"original": {
"owner": "ipetkov",
"repo": "crane",
"type": "github"
}
},
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1673956053,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-utils": {
"locked": {
"lastModified": 1676283394,
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"locked": {
"lastModified": 1676283394,
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"newalan": {
"inputs": {
"advisory-db": "advisory-db",
"crane": "crane",
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 0,
"narHash": "sha256-adKGCz1gVSev/Kf+Y38UCZJgcddTNeK5yGxn1ZwWhCE=",
"path": "/nix/store/8dvz739k19bsni4zdnyfz0sff6plqbr5-source",
"type": "path"
},
"original": {
"path": "/nix/store/8dvz739k19bsni4zdnyfz0sff6plqbr5-source",
"type": "path"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1678207308,
"narHash": "sha256-WrmS/Inla0koTZIiq094tmjQA0akXjKtvZMcbgqfEP0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0ef02c4792fbde4b78957a46a8cb107b6c7aa3cc",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1678111249,
"narHash": "sha256-ZTIbK7vthZwti5XeLZE+twkb4l44q01q2XoLMmmJe94=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a028e2873d7fcf44e66b784b4ba061824315537f",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"newalan": "newalan",
"nixpkgs": "nixpkgs_2"
}
},
"rust-overlay": {
"inputs": {
"flake-utils": [
"newalan",
"crane",
"flake-utils"
],
"nixpkgs": [
"newalan",
"crane",
"nixpkgs"
]
},
"locked": {
"lastModified": 1677812689,
"narHash": "sha256-EakqhgRnjVeYJv5+BJx/NZ7/eFTMBxc4AhICUNquhUg=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "e53e8853aa7b0688bc270e9e6a681d22e01cf299",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
}
},
"root": "root",
"version": 7
}

28
deploy/flake.nix Normal file
View File

@@ -0,0 +1,28 @@
{
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
inputs.newalan.url = "../";
outputs = { self, nixpkgs, newalan }: let
new_alan_overlay = (final: prev: {
new_alan = newalan.packages."x86_64-linux".default;
});
in {
nixosConfigurations."staging" = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
({ config, pkgs, ... }: {
nixpkgs.overlays = [
new_alan_overlay
];
})
({lib, config, pkgs, ...}: {
system.stateVersion = "22.11";
boot.isContainer = true;
environment.systemPackages = with pkgs; [
new_alan
];
})
];
};
};
}

24
flake.lock generated
View File

@@ -3,11 +3,11 @@
"advisory-db": {
"flake": false,
"locked": {
"lastModified": 1677345087,
"narHash": "sha256-PSkBGJ6KyGbTeLtEgdHSljm76NOeoww9hDgBD/QBffk=",
"lastModified": 1678190193,
"narHash": "sha256-nuiUyTTjzMVfeRZInX81mBrWk26/2AgjZs/cdjX1oIk=",
"owner": "rustsec",
"repo": "advisory-db",
"rev": "9a5b1008028e4b37e91f5951e639ad7848232f8e",
"rev": "292b3a8437125f015adbd32efd6bcdbbd95303f3",
"type": "github"
},
"original": {
@@ -26,11 +26,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1677642623,
"narHash": "sha256-GlRa6/HWg8mIxPM29ZuTP2dP8y9sQ6BdbrjzCO8JgAo=",
"lastModified": 1678152261,
"narHash": "sha256-cPRDxwygVMleiSEGELrvAiq9vYAN4c3KK/K4UEO13vU=",
"owner": "ipetkov",
"repo": "crane",
"rev": "f3f763e4d9f156ec0c37f39b0f77e2d62213b296",
"rev": "5291dd0aa7a52d607fc952763ef60714e4c881d4",
"type": "github"
},
"original": {
@@ -87,11 +87,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1677816901,
"narHash": "sha256-oqe8Q9LlWNGfVfUDkKfpWAk+I9RRDBvMSyYVIOZCfPM=",
"lastModified": 1678207308,
"narHash": "sha256-WrmS/Inla0koTZIiq094tmjQA0akXjKtvZMcbgqfEP0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0749042bfaa2f4efa70ac829c5387133cfc0a337",
"rev": "0ef02c4792fbde4b78957a46a8cb107b6c7aa3cc",
"type": "github"
},
"original": {
@@ -121,11 +121,11 @@
]
},
"locked": {
"lastModified": 1676437770,
"narHash": "sha256-mhJye91Bn0jJIE7NnEywGty/U5qdELfsT8S+FBjTdG4=",
"lastModified": 1677812689,
"narHash": "sha256-EakqhgRnjVeYJv5+BJx/NZ7/eFTMBxc4AhICUNquhUg=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "a619538647bd03e3ee1d7b947f7c11ff289b376e",
"rev": "e53e8853aa7b0688bc270e9e6a681d22e01cf299",
"type": "github"
},
"original": {

15
flake.nix
View File

@@ -106,12 +106,6 @@
partitions = 1;
partitionType = "count";
});
runCommandHook = {
newalan = pkgs.writeScript "New Alan CD" ''
echo HIIIII
echo Wheee
'';
};
} // lib.optionalAttrs (system == "x86_64-linux") {
# NB: cargo-tarpaulin only supports x86_64 systems
# Check code coverage (note: this will not upload coverage anywhere)
@@ -120,6 +114,12 @@
});
};
runCommandHook = {
newalan = pkgs.writeScript "New Alan CD" ''
echo HIIIII $(date) >> ~/TEST_SCRIPT
echo Wheee
'';
};
packages.default = newalan;
apps.default = flake-utils.lib.mkApp {
@@ -137,6 +137,9 @@
cargo
rustc
rust-analyzer
sops
age
];
};
}

30
secrets/deploy.yaml Normal file
View File

@@ -0,0 +1,30 @@
DISCORD_TOKEN: ENC[AES256_GCM,data:IA1ZKRjahzR/hyi9DeZPYJSmCwkWhJ1BQhD/RgADm7mAj4La5Svad7swNFltimMJSuSOX8bz1onPOBiPeqBF4ZfuFS8LKw==,iv:3DYPxVlyDahUCztVjSvBfkXbkLM3J0lp8oZPbOjXI/g=,tag:esTAmPTewAU9zlO1JNn25A==,type:str]
sops:
kms: []
gcp_kms: []
azure_kv: []
hc_vault: []
age:
- recipient: age12qq2fn4nxx9g99vp5knndtn0xa0p6g9ztn48gv9ap8054am39c3qsezz90
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBMREpSMmI4K1J4LzlnNGdH
S0k0dWdZUHo2YkNxeWR2eG5HYXpmQndxRmo0CmFZY2RrRUpIT0NsdkNKQTl3L3N3
d2loNlZBajFyNmRPQzdIWUdMbUFzbEkKLS0tIGVGbEF1cDFneHl2ZUdpaTFjZGNq
dVNwdUNxcnhhd0dxcXhvRlRuR2IwR2cKCDFj6ubhGwcy6EFx0EaCcB/bE3k2PDeA
g8RhyS+k+XLpErkU2cd+Rz2Cwj2w4QORvJddwDhdnm/sqYCCLQlG3g==
-----END AGE ENCRYPTED FILE-----
- recipient: age1apajqje4zvah0n2dzds3kstlsakqr2ntk64xl7xc4erzedsuy9jqqk7cd7
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA5RklkWE9VMFNQbkNIU0Z6
WXBPTWthWG1oVzRsb3JWMUR1dE1zdEhMUkM4Clk0clA0d3A5SFdmem9lblhUVzRo
djJ3SlFDS0p4NEpxSHhoMnlnN2h3OVEKLS0tIGx1eVdaYXVtZER1KzB2ZkZickFs
TDd0dG1RYVFhWkkrWmlPVmt0aVJhclEK991J72XkQy2+1jQpY4rZSFkRFE8v/nqb
Vt3dG7GfnCjpf/F0BZscLsQdo1fcZcwgumlG3omyBTylFXTGnWT4VA==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2023-03-09T04:26:07Z"
mac: ENC[AES256_GCM,data:Hj8QDZZj7NiLqjvA6cuTfvePdtkDt/noqO/g8sSsaUhkVceAbO8asKmRWezB9lhCzBk+EMzA/qZA1PeBqiw2FxU7DUQF2jC9RJTCrn242wUn2Ba9n70aj2QQQFSxjbBG0LwwAV2hqbxa/AhmLizvX2xd6lI/3E7Az7vsf9quFm8=,iv:oDZ7itiQ6lL9YHAlVk9izyjDVeUYtOJygaclSRl+SDg=,tag:hX2V7POGSjuFEqWw26b+IA==,type:str]
pgp: []
unencrypted_suffix: _unencrypted
version: 3.7.3