treewide: reformat
This commit is contained in:
parent
8d975c07fa
commit
4eb71e5baf
8 changed files with 63 additions and 73 deletions
13
effects.nix
13
effects.nix
|
@ -54,10 +54,9 @@ in
|
|||
inherit (herculesCI) config;
|
||||
inherit pkgs;
|
||||
};
|
||||
cachixCommands =
|
||||
lib.concatMapStringsSep "\n"
|
||||
({ name, drv }: "cachix pin nrabulinski ${lib.escapeShellArg name} ${lib.escapeShellArg drv}")
|
||||
collected;
|
||||
cachixCommands = lib.concatMapStringsSep "\n" (
|
||||
{ name, drv }: "cachix pin nrabulinski ${lib.escapeShellArg name} ${lib.escapeShellArg drv}"
|
||||
) collected;
|
||||
in
|
||||
hci-effects.runIf (herculesCI.config.repo.branch == "main") (
|
||||
hci-effects.mkEffect {
|
||||
|
@ -93,13 +92,11 @@ in
|
|||
let
|
||||
systems = lib.groupBy ({ drv, ... }: drv.system) legacyPackages.outputsList;
|
||||
in
|
||||
lib.concatMapStringsSep "\n"
|
||||
(
|
||||
lib.concatMapStringsSep "\n" (
|
||||
{ name, value }:
|
||||
''
|
||||
${name}=${builtins.toJSON (map (d: d.name) value)}
|
||||
''
|
||||
)
|
||||
(lib.attrsToList systems);
|
||||
) (lib.attrsToList systems);
|
||||
};
|
||||
}
|
||||
|
|
|
@ -133,7 +133,8 @@
|
|||
};
|
||||
};
|
||||
|
||||
/* TODO: Uncomment once (if ever?) nixConfig makes sense in flakes
|
||||
/*
|
||||
TODO: Uncomment once (if ever?) nixConfig makes sense in flakes
|
||||
nixConfig = {
|
||||
extra-substituters = [
|
||||
"https://hyprland.cachix.org"
|
||||
|
|
|
@ -5,16 +5,13 @@
|
|||
skhdConfig =
|
||||
let
|
||||
spaceCount = 6;
|
||||
spaceBindings =
|
||||
lib.genList
|
||||
(
|
||||
spaceBindings = lib.genList (
|
||||
i:
|
||||
let
|
||||
num = toString (i + 1);
|
||||
in
|
||||
"cmd - ${num} : yabai -m space --focus ${num}"
|
||||
)
|
||||
spaceCount;
|
||||
) spaceCount;
|
||||
in
|
||||
''
|
||||
cmd - return : wezterm
|
||||
|
|
|
@ -41,14 +41,11 @@
|
|||
|
||||
hardware.steam-hardware.enable = true;
|
||||
|
||||
services.logind =
|
||||
lib.genAttrs
|
||||
[
|
||||
services.logind = lib.genAttrs [
|
||||
"lidSwitch"
|
||||
"lidSwitchDocked"
|
||||
"lidSwitchExternalPower"
|
||||
]
|
||||
(_: "ignore");
|
||||
] (_: "ignore");
|
||||
|
||||
services.pipewire = {
|
||||
enable = true;
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
args:
|
||||
/* let
|
||||
/*
|
||||
let
|
||||
bootDevice = args.bootDevice or "/dev/nvme0n1";
|
||||
in
|
||||
*/
|
||||
|
|
|
@ -22,8 +22,7 @@ let
|
|||
services.github-runners = lib.pipe cfg.runners [
|
||||
(lib.mapAttrsToList (
|
||||
name: cfg:
|
||||
lib.genList
|
||||
(
|
||||
lib.genList (
|
||||
i:
|
||||
lib.nameValuePair "${name}-${toString i}" {
|
||||
enable = true;
|
||||
|
@ -36,8 +35,7 @@ let
|
|||
};
|
||||
extraLabels = [ "nix" ];
|
||||
}
|
||||
)
|
||||
cfg.instances
|
||||
) cfg.instances
|
||||
))
|
||||
lib.flatten
|
||||
lib.listToAttrs
|
||||
|
|
|
@ -43,8 +43,7 @@ let
|
|||
let
|
||||
configName' =
|
||||
args.configurationName
|
||||
or (throw "pass configurationName to module arguments or set users.users.${username}.openssh.authorizedKeys yourself"
|
||||
);
|
||||
or (throw "pass configurationName to module arguments or set users.users.${username}.openssh.authorizedKeys yourself");
|
||||
filteredKeys = lib.filterAttrs (name: _: name != configName') cfg.allSshKeys;
|
||||
in
|
||||
lib.mkDefault (lib.attrValues filteredKeys);
|
||||
|
|
|
@ -12,9 +12,9 @@
|
|||
prependFlags =
|
||||
let
|
||||
# Can't rely on pathAdd because fish used as login shell will ignore the variables the wrapper sets up
|
||||
path-add-lines =
|
||||
lib.concatMapStringsSep "\n" (pkg: "fish_add_path --path --prepend '${lib.getExe' pkg ""}'")
|
||||
config.pathAdd;
|
||||
path-add-lines = lib.concatMapStringsSep "\n" (
|
||||
pkg: "fish_add_path --path --prepend '${lib.getExe' pkg ""}'"
|
||||
) config.pathAdd;
|
||||
config-fish = pkgs.writeText "config.fish" ''
|
||||
${path-add-lines}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue