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

treewide: reformat

Browse source
This commit is contained in:
Nikodem Rabuliński 2024-03-07 23:10:03 +01:00
parent 8d975c07fa
commit 4eb71e5baf
8 changed files with 63 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

21
effects.nix
View file

@ -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"
(
{ name, value }:
''
${name}=${builtins.toJSON (map (d: d.name) value)}
''
)
(lib.attrsToList systems);
lib.concatMapStringsSep "\n" (
{ name, value }:
''
${name}=${builtins.toJSON (map (d: d.name) value)}
''
) (lib.attrsToList systems);
};
}

39
flake.nix
View file

@ -133,24 +133,25 @@
};
};
/* TODO: Uncomment once (if ever?) nixConfig makes sense in flakes
nixConfig = {
extra-substituters = [
"https://hyprland.cachix.org"
"https://cache.garnix.io"
"https://nix-community.cachix.org"
"https://hercules-ci.cachix.org"
"https://nrabulinski.cachix.org"
"https://cache.nrab.lol"
];
extra-trusted-public-keys = [
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
"cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"hercules-ci.cachix.org-1:ZZeDl9Va+xe9j+KqdzoBZMFJHVQ42Uu/c/1/KMC5Lw0="
"nrabulinski.cachix.org-1:Q5FD7+1c68uH74CQK66UWNzxhanZW8xcg1LFXxGK8ic="
"cache.nrab.lol-1:CJl1TouOyuJ1Xh4tZSXLwm3Upt06HzUNZmeyuEB9EZg="
];
};
/*
TODO: Uncomment once (if ever?) nixConfig makes sense in flakes
nixConfig = {
extra-substituters = [
"https://hyprland.cachix.org"
"https://cache.garnix.io"
"https://nix-community.cachix.org"
"https://hercules-ci.cachix.org"
"https://nrabulinski.cachix.org"
"https://cache.nrab.lol"
];
extra-trusted-public-keys = [
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
"cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"hercules-ci.cachix.org-1:ZZeDl9Va+xe9j+KqdzoBZMFJHVQ42Uu/c/1/KMC5Lw0="
"nrabulinski.cachix.org-1:Q5FD7+1c68uH74CQK66UWNzxhanZW8xcg1LFXxGK8ic="
"cache.nrab.lol-1:CJl1TouOyuJ1Xh4tZSXLwm3Upt06HzUNZmeyuEB9EZg="
];
};
*/
}

17
hosts/hijiri/skhd.nix
View file

@ -5,16 +5,13 @@
skhdConfig =
let
spaceCount = 6;
spaceBindings =
lib.genList
(
i:
let
num = toString (i + 1);
in
"cmd - ${num} : yabai -m space --focus ${num}"
)
spaceCount;
spaceBindings = lib.genList (
i:
let
num = toString (i + 1);
in
"cmd - ${num} : yabai -m space --focus ${num}"
) spaceCount;
in
''
cmd - return : wezterm

13
hosts/legion/desktop.nix
View file

@ -41,14 +41,11 @@
hardware.steam-hardware.enable = true;
services.logind =
lib.genAttrs
[
"lidSwitch"
"lidSwitchDocked"
"lidSwitchExternalPower"
]
(_: "ignore");
services.logind = lib.genAttrs [
"lidSwitch"
"lidSwitchDocked"
"lidSwitchExternalPower"
] (_: "ignore");
services.pipewire = {
enable = true;

7
hosts/legion/disks.nix
View file

@ -1,7 +1,8 @@
args:
/* let
bootDevice = args.bootDevice or "/dev/nvme0n1";
in
/*
let
bootDevice = args.bootDevice or "/dev/nvme0n1";
in
*/
{
assertions = [

30
modules/system/common/github-runner.nix
View file

@ -22,22 +22,20 @@ let
services.github-runners = lib.pipe cfg.runners [
(lib.mapAttrsToList (
name: cfg:
lib.genList
(
i:
lib.nameValuePair "${name}-${toString i}" {
enable = true;
tokenFile = config.age.secrets.github-token.path;
inherit (cfg) url;
name = "${cfg.name}-${toString i}";
user = github-runner-user;
serviceOverrides = {
DynamicUser = false;
};
extraLabels = [ "nix" ];
}
)
cfg.instances
lib.genList (
i:
lib.nameValuePair "${name}-${toString i}" {
enable = true;
tokenFile = config.age.secrets.github-token.path;
inherit (cfg) url;
name = "${cfg.name}-${toString i}";
user = github-runner-user;
serviceOverrides = {
DynamicUser = false;
};
extraLabels = [ "nix" ];
}
) cfg.instances
))
lib.flatten
lib.listToAttrs

3
modules/system/settei/sane-defaults.nix
View file

@ -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);

6
wrappers/fish/default.nix
View file

@ -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}