mirror of
https://github.com/kittywitch/nixfiles.git
synced 2026-02-09 04:19:19 -08:00
style: alejandra, deadnix, statix
This commit is contained in:
parent
2e7ee0e4ca
commit
17c69c99de
78 changed files with 1051 additions and 878 deletions
|
|
@ -1,5 +1,4 @@
|
|||
{
|
||||
lib,
|
||||
channels,
|
||||
config,
|
||||
...
|
||||
|
|
@ -18,10 +17,12 @@
|
|||
};
|
||||
};
|
||||
|
||||
/*nix.config = {
|
||||
/*
|
||||
nix.config = {
|
||||
extra-platforms = ["aarch64-linux" "armv6l-linux" "armv7l-linux"];
|
||||
#extra-sandbox-paths = with channels.cipkgs; map (package: builtins.unsafeDiscardStringContext "${package}?") [bash qemu "/run/binfmt"];
|
||||
};*/
|
||||
};
|
||||
*/
|
||||
|
||||
channels = {
|
||||
nixfiles.path = ../.;
|
||||
|
|
@ -39,8 +40,8 @@
|
|||
signingKey = null;
|
||||
};
|
||||
kittywitch = {
|
||||
enable = true;
|
||||
publicKey = "kittywitch.cachix.org-1:KIzX/G5cuPw5WgrXad6UnrRZ8UDr7jhXzRTK/lmqyK0=";
|
||||
enable = true;
|
||||
publicKey = "kittywitch.cachix.org-1:KIzX/G5cuPw5WgrXad6UnrRZ8UDr7jhXzRTK/lmqyK0=";
|
||||
signingKey = "mewp";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,20 +1,17 @@
|
|||
{
|
||||
lib,
|
||||
channels,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
pkgs = channels.nixpkgs;
|
||||
in {
|
||||
imports = [ ./common.nix ];
|
||||
with lib; {
|
||||
imports = [./common.nix];
|
||||
config = {
|
||||
name = "flake-update";
|
||||
|
||||
gh-actions = {
|
||||
env = {
|
||||
CACHIX_SIGNING_KEY = "\${{ secrets.CACHIX_SIGNING_KEY }}";
|
||||
DISCORD_WEBHOOK_LINK = "\${{ secrets.DISCORD_WEBHOOK_LINK }}";
|
||||
CACHIX_SIGNING_KEY = "\${{ secrets.CACHIX_SIGNING_KEY }}";
|
||||
DISCORD_WEBHOOK_LINK = "\${{ secrets.DISCORD_WEBHOOK_LINK }}";
|
||||
};
|
||||
on = let
|
||||
paths = [
|
||||
|
|
@ -53,8 +50,8 @@ in {
|
|||
};
|
||||
|
||||
jobs = {
|
||||
flake-update = { ... }: {
|
||||
imports = [ ./packages.nix ];
|
||||
flake-update = {...}: {
|
||||
imports = [./packages.nix];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
89
ci/nodes.nix
89
ci/nodes.nix
|
|
@ -5,18 +5,17 @@
|
|||
...
|
||||
}:
|
||||
with lib; let
|
||||
pkgs = channels.nixpkgs;
|
||||
enabledNixosSystems = filterAttrs (_: system: system.config.ci.enable && system.config.type == "NixOS") channels.nixfiles.systems;
|
||||
enabledHomeSystems = filterAttrs (_: system: system.config.ci.enable && system.config.type == "Home") channels.nixfiles.systems;
|
||||
enabledNixosSystems = filterAttrs (_: system: system.config.ci.enable && system.config.type == "NixOS") channels.nixfiles.systems;
|
||||
enabledHomeSystems = filterAttrs (_: system: system.config.ci.enable && system.config.type == "Home") channels.nixfiles.systems;
|
||||
in {
|
||||
imports = [ ./common.nix ];
|
||||
imports = [./common.nix];
|
||||
config = {
|
||||
name = "nodes";
|
||||
|
||||
gh-actions = {
|
||||
env = {
|
||||
CACHIX_SIGNING_KEY = "\${{ secrets.CACHIX_SIGNING_KEY }}";
|
||||
DISCORD_WEBHOOK_LINK = "\${{ secrets.DISCORD_WEBHOOK_LINK }}";
|
||||
CACHIX_SIGNING_KEY = "\${{ secrets.CACHIX_SIGNING_KEY }}";
|
||||
DISCORD_WEBHOOK_LINK = "\${{ secrets.DISCORD_WEBHOOK_LINK }}";
|
||||
};
|
||||
on = let
|
||||
paths = [
|
||||
|
|
@ -34,47 +33,53 @@ in {
|
|||
workflow_dispatch = {};
|
||||
};
|
||||
jobs = let
|
||||
genericNixosBuildJob = name: system: nameValuePair "nixos-${name}" {
|
||||
genericNixosBuildJob = name: _system:
|
||||
nameValuePair "nixos-${name}" {
|
||||
step.${name} = {
|
||||
name = "build system closure for ${name}";
|
||||
order = 500;
|
||||
run = "nix run .#nf-build-system -- nixosConfigurations.${name}.config.system.build.toplevel ${name} NixOS";
|
||||
env = {
|
||||
CACHIX_SIGNING_KEY = "\${{ secrets.CACHIX_SIGNING_KEY }}";
|
||||
DISCORD_WEBHOOK_LINK = "\${{ secrets.DISCORD_WEBHOOK_LINK }}";
|
||||
NF_UPDATE_CACHIX_PUSH = "1";
|
||||
NF_CONFIG_ROOT = "\${{ github.workspace }}";
|
||||
};
|
||||
};
|
||||
};
|
||||
genericHomeBuildJob = name: system: nameValuePair "home-${name}" {
|
||||
name = "build system closure for ${name}";
|
||||
order = 500;
|
||||
run = "nix run .#nf-build-system -- nixosConfigurations.${name}.config.system.build.toplevel ${name} NixOS";
|
||||
env = {
|
||||
CACHIX_SIGNING_KEY = "\${{ secrets.CACHIX_SIGNING_KEY }}";
|
||||
DISCORD_WEBHOOK_LINK = "\${{ secrets.DISCORD_WEBHOOK_LINK }}";
|
||||
NF_UPDATE_CACHIX_PUSH = "1";
|
||||
NF_CONFIG_ROOT = "\${{ github.workspace }}";
|
||||
};
|
||||
};
|
||||
};
|
||||
genericHomeBuildJob = name: _system:
|
||||
nameValuePair "home-${name}" {
|
||||
step.${name} = {
|
||||
name = "build home closure for ${name}";
|
||||
order = 500;
|
||||
run = "nix run .#nf-build-system -- homeConfigurations.${name}.activationPackage ${name} Home";
|
||||
env = {
|
||||
CACHIX_SIGNING_KEY = "\${{ secrets.CACHIX_SIGNING_KEY }}";
|
||||
DISCORD_WEBHOOK_LINK = "\${{ secrets.DISCORD_WEBHOOK_LINK }}";
|
||||
NF_UPDATE_CACHIX_PUSH = "1";
|
||||
NF_CONFIG_ROOT = "\${{ github.workspace }}";
|
||||
};
|
||||
};
|
||||
};
|
||||
nixosBuildJobs = mapAttrs' genericNixosBuildJob enabledNixosSystems;
|
||||
homeBuildJobs = mapAttrs' genericHomeBuildJob enabledHomeSystems;
|
||||
in nixosBuildJobs // homeBuildJobs;
|
||||
name = "build home closure for ${name}";
|
||||
order = 500;
|
||||
run = "nix run .#nf-build-system -- homeConfigurations.${name}.activationPackage ${name} Home";
|
||||
env = {
|
||||
CACHIX_SIGNING_KEY = "\${{ secrets.CACHIX_SIGNING_KEY }}";
|
||||
DISCORD_WEBHOOK_LINK = "\${{ secrets.DISCORD_WEBHOOK_LINK }}";
|
||||
NF_UPDATE_CACHIX_PUSH = "1";
|
||||
NF_CONFIG_ROOT = "\${{ github.workspace }}";
|
||||
};
|
||||
};
|
||||
};
|
||||
nixosBuildJobs = mapAttrs' genericNixosBuildJob enabledNixosSystems;
|
||||
homeBuildJobs = mapAttrs' genericHomeBuildJob enabledHomeSystems;
|
||||
in
|
||||
nixosBuildJobs // homeBuildJobs;
|
||||
};
|
||||
|
||||
jobs = let
|
||||
genericNixosBuildJob = name: system: nameValuePair "nixos-${name}" ({ ... }: {
|
||||
#imports = [ ./packages.nix ];
|
||||
});
|
||||
genericHomeBuildJob = name: system: nameValuePair "home-${name}" ({ ... }: {
|
||||
#imports = [ ./packages.nix ];
|
||||
});
|
||||
nixosBuildJobs = mapAttrs' genericNixosBuildJob enabledNixosSystems;
|
||||
homeBuildJobs = mapAttrs' genericHomeBuildJob enabledHomeSystems;
|
||||
in nixosBuildJobs // homeBuildJobs;
|
||||
genericNixosBuildJob = name: _system:
|
||||
nameValuePair "nixos-${name}" (_: {
|
||||
#imports = [ ./packages.nix ];
|
||||
});
|
||||
genericHomeBuildJob = name: _system:
|
||||
nameValuePair "home-${name}" (_: {
|
||||
#imports = [ ./packages.nix ];
|
||||
});
|
||||
nixosBuildJobs = mapAttrs' genericNixosBuildJob enabledNixosSystems;
|
||||
homeBuildJobs = mapAttrs' genericHomeBuildJob enabledHomeSystems;
|
||||
in
|
||||
nixosBuildJobs // homeBuildJobs;
|
||||
|
||||
ci.gh-actions.checkoutOptions = {
|
||||
fetch-depth = 0;
|
||||
|
|
|
|||
|
|
@ -1,16 +1,14 @@
|
|||
{
|
||||
lib,
|
||||
config,
|
||||
channels,
|
||||
...
|
||||
}: let
|
||||
{channels, ...}: let
|
||||
inherit (channels.nixfiles) legacyPackages;
|
||||
in {
|
||||
tasks = {
|
||||
devShell.inputs = with legacyPackages.x86_64-linux; [
|
||||
deploy-rs
|
||||
terraform tflint
|
||||
alejandra deadnix statix
|
||||
terraform
|
||||
tflint
|
||||
alejandra
|
||||
deadnix
|
||||
statix
|
||||
ssh-to-age
|
||||
];
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue