From a18d2d373a79fc1b791821ec3c0c6545db8bdb68 Mon Sep 17 00:00:00 2001 From: Leyla Becker Date: Tue, 2 Apr 2024 20:33:03 -0500 Subject: [PATCH] regenerated age keys to use leylas credentials --- .sops.yaml | 4 ++-- flake.nix | 6 ++++-- pkgs/default.nix | 4 ++++ users/leyla/packages.nix | 7 +++---- 4 files changed, 13 insertions(+), 8 deletions(-) create mode 100644 pkgs/default.nix diff --git a/.sops.yaml b/.sops.yaml index 8b0366e..0ac5664 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -1,7 +1,7 @@ keys: - - &primary age1y98w2zgrc8f8l2sw632g697nqkcudvsknjmm85ajehpnnjtvvv6sx5670e + - &leyla age15ga3jmn2mqtlgwwtdcdh6l5vdx6um9aftrkexxfyue6xvcqapqusle75jh creation_rules: - path_regex: secrets/secrets.yaml$ key_groups: - age: - - *primary \ No newline at end of file + - *leyla diff --git a/flake.nix b/flake.nix index 43f8cd7..a0d15de 100644 --- a/flake.nix +++ b/flake.nix @@ -14,10 +14,12 @@ outputs = { self, nixpkgs, ... }@inputs: let - system = "x86_64-linux"; - pkgs = nixpkgs.legacyPackages.${system}; + forEachSystem = nixpkgs.lib.genAttrs [ "x86_64-linux" ]; + forEachPkgs = lambda: forEachSystem (system: lambda nixpkgs.legacyPackages.${system}); in { + packages = forEachPkgs (pkgs: import ./pkgs { inherit pkgs; }); + nixosConfigurations = { horizon = nixpkgs.lib.nixosSystem { specialArgs = {inherit inputs;}; diff --git a/pkgs/default.nix b/pkgs/default.nix new file mode 100644 index 0000000..b0fd62b --- /dev/null +++ b/pkgs/default.nix @@ -0,0 +1,4 @@ +pkgs: { + # yuzu-clone = pkgs.callPackage ./yuzo { }; + # citra-clone = pkgs.callPackage ./citra { }; +} \ No newline at end of file diff --git a/users/leyla/packages.nix b/users/leyla/packages.nix index c1311a7..3d2429b 100644 --- a/users/leyla/packages.nix +++ b/users/leyla/packages.nix @@ -71,11 +71,10 @@ in (lib.mkIf cfg.hasViaKeyboard via) # gaming - # steam # emulators # nintendo # TODO: replace this with self hosted flake - (lib.mkIf cfg.hasGPU yuzu-mainline) # Switch Emulator + # (lib.mkIf cfg.hasGPU yuzu-mainline) # Switch Emulator # TODO: replace this with self hosted flake # citra-canary # 3DS emulator (lib.mkIf cfg.hasGPU cemu) # Wii-U emulator @@ -86,9 +85,9 @@ in vbam # Game Boy Advanced Emulator fceux # NES Emulator # play station - pcsxr # PS1 Emulator - pcsx2 # PS2 Emulator rpcs3 # PS3 Emulator + pcsx2 # PS2 Emulator + pcsxr # PS1 Emulator # TODO: more play station emulators here when they come out #misc stella # Atari 2600 Emulator