Compare commits

..

No commits in common. "8edd189f075f3b5525cb2647351242477b16f4bb" and "a6da14d4cfeee9fff096e5b532008d1d32b36966" have entirely different histories.

4 changed files with 5 additions and 41 deletions

View file

@ -43,7 +43,6 @@ Secrets are managed by the [sops-nix](https://github.com/Mic92/sops-nix) nixos/h
- General secrets are stored within the `secrets` directory. - General secrets are stored within the `secrets` directory.
- System specific secrets are stored within their respective `systems/<system_type>/<system_name>/secrets` directory. - System specific secrets are stored within their respective `systems/<system_type>/<system_name>/secrets` directory.
- User secrets are stored within their respective `homes/<system_type>/<user_name>/secrets` directory.
The following command may be used to convert the SSH host key of a new machine to an age key: The following command may be used to convert the SSH host key of a new machine to an age key:
@ -67,7 +66,7 @@ You may also encrypt arbitrary binary formats, like .cfg, using the following co
nix-shell -p sops --run "sops -e original_file.cfg > secrets/encrypted_file.cfg" nix-shell -p sops --run "sops -e original_file.cfg > secrets/encrypted_file.cfg"
``` ```
Finally, when adding new systems, make sure to update any required secret files with the following command: Lastly, when adding new systems, make sure to update any required secret files with the following command:
```sh ```sh
nix-shell -p sops --run "sops updatekeys secrets/example.yaml" nix-shell -p sops --run "sops updatekeys secrets/example.yaml"
@ -118,7 +117,7 @@ Some of my future goals for this flake are:
- Further refining my usage of the Nix language, through language best-practices and CLI dev tools. - Further refining my usage of the Nix language, through language best-practices and CLI dev tools.
## 🏗️ Structure ## 🏗️ Structure
This flake follows an opinionated directory structure, described below. The structure this flake aims to build on is relatively simple to grasp.
``` ```
flake.nix --> The flake. flake.nix --> The flake.

View file

@ -1,9 +0,0 @@
{
...
}:
{
puzzlevision.apps.packettracer = {
enable = true;
binaryPath = ./Packet_Tracer822_amd64_signed.deb;
};
}

View file

@ -8,7 +8,6 @@
./apps/discord ./apps/discord
./apps/firefox ./apps/firefox
./apps/vicinae ./apps/vicinae
./apps/packettracer
]; ];
puzzlevision = { puzzlevision = {
@ -29,6 +28,9 @@
}; };
}; };
# Notify on systembus events
services.systembus-notify.enable = true;
sops.secrets.wakatime-cfg = { sops.secrets.wakatime-cfg = {
format = "binary"; format = "binary";
sopsFile = ./secrets/wakatime.cfg; sopsFile = ./secrets/wakatime.cfg;

View file

@ -1,28 +0,0 @@
{
config,
self,
pkgs,
lib,
...
}:
let
inherit (self) namespace;
inherit (self.lib) mkOpt;
inherit (lib) mkEnableOption types mkIf;
cfg = config.${namespace}.apps.packettracer;
in
{
options.${namespace}.apps.packettracer = {
enable = mkEnableOption "the Cisco Packettracer application, a network emulator.";
binaryPath =
mkOpt types.path null
"The path of the Packettracer binary. Has to be downloaded from Cisco Netacad";
};
config = mkIf cfg.enable {
home.packages = with pkgs; [
(ciscoPacketTracer8.override { packetTracerSource = cfg.binaryPath; })
];
};
}