nrabulinski/settei
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

fix effects and formatting

Browse source
This commit is contained in:
Nikodem Rabuliński 2024-01-20 12:38:38 +01:00
parent f83db45db4
commit 635a6c39af
No known key found for this signature in database
GPG key ID: FF629AA9E08138DB
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
effects.nix
View file

@ -46,7 +46,7 @@
}: "cachix pin nrabulinski ${lib.escapeShellArg name} ${lib.escapeShellArg drv}") }: "cachix pin nrabulinski ${lib.escapeShellArg name} ${lib.escapeShellArg drv}")
collected; collected;
in in
hci-effects.runIf (herculesCI?branch && herculesCI.branch == "main") (hci-effects.mkEffect { hci-effects.runIf (herculesCI.config.branch == "main") (hci-effects.mkEffect {
secretsMap."cachix-token" = "cachix-token"; secretsMap."cachix-token" = "cachix-token";
inputs = [pkgs.cachix]; inputs = [pkgs.cachix];
userSetupScript = '' userSetupScript = ''

8
hosts/kogata/default.nix
View file

@ -1,5 +1,9 @@
{ {
configurations.darwin.kogata = {pkgs, lib, ...}: { configurations.darwin.kogata = {
pkgs,
lib,
...
}: {
nixpkgs.system = "aarch64-darwin"; nixpkgs.system = "aarch64-darwin";
settei.user.config = { settei.user.config = {
@ -8,7 +12,7 @@
# TODO: Make it a settei module so it's easy to concatenate which pkgs are allowed # TODO: Make it a settei module so it's easy to concatenate which pkgs are allowed
nixpkgs.config.allowUnfreePredicate = pkg: nixpkgs.config.allowUnfreePredicate = pkg:
builtins.elem (lib.getName pkg) [ "teams" ]; builtins.elem (lib.getName pkg) ["teams"];
environment.systemPackages = with pkgs; [teams]; environment.systemPackages = with pkgs; [teams];
common.hercules.enable = true; common.hercules.enable = true;