mirror of
https://github.com/genebean/dots.git
synced 2026-03-27 09:27:44 -04:00
Add linting, formatting, and CI with fixes for all warnings
Infrastructure: - Add deadnix, nixfmt, and statix to flake inputs - Add formatter output to flake for nix fmt support - Add deadnix, nixfmt, statix to Home Manager packages - Add GitHub Actions workflow for CI validation - Add .pre-commit-config.yaml with hooks for nixfmt, deadnix, and statix - Support x86_64-darwin in formatter Statix fixes (W10/W20 warnings): - Remove unused lambda argument from nixpkgs-settings.nix - Merge repeated keys in hardware-configuration.nix files (boot.initrd, boot, fileSystems) - Merge repeated keys in nixnuc/default.nix (services, virtualisation) - Merge repeated keys in rainbow-planet/default.nix (desktopManager) - Merge repeated keys in home/general/default.nix (home) Deadnix fixes (unused declarations): - Remove unused pkgs/lib/username/http_port arguments from various files - Fix unused final parameter in overlay functions (final -> _final) CI/pre-commit fixes: - Fix pre-commit statix config: add pass_filenames: false - Fix CI workflow: use nix run nixpkgs# prefix and --ci flag for nixfmt
This commit is contained in:
parent
5047d93b86
commit
9b3c078319
78 changed files with 1662 additions and 955 deletions
193
flake.nix
193
flake.nix
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
compose2nix = {
|
||||
url = "github:aksiksi/compose2nix";
|
||||
inputs.nixpkgs.follows ="nixpkgs";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
# Format disks with nix-config
|
||||
|
|
@ -79,100 +79,115 @@
|
|||
# Secrets managemnt
|
||||
sops-nix = {
|
||||
url = "github:mic92/sops-nix";
|
||||
inputs.nixpkgs.follows ="nixpkgs";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
# Linting and formatting
|
||||
deadnix.url = "github:astro/deadnix";
|
||||
statix.url = "github:astro/statix";
|
||||
|
||||
}; # end inputs
|
||||
outputs = inputs@{ self, ... }: let
|
||||
# Functions that setup systems
|
||||
localLib = import ./lib { inherit inputs; };
|
||||
outputs =
|
||||
inputs@{ self, nixpkgs, ... }:
|
||||
let
|
||||
# Functions that setup systems
|
||||
localLib = import ./lib { inherit inputs; };
|
||||
forAllSystems = nixpkgs.lib.genAttrs [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
"x86_64-darwin"
|
||||
"aarch64-darwin"
|
||||
];
|
||||
in
|
||||
{
|
||||
formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.nixfmt-tree);
|
||||
|
||||
in {
|
||||
# Darwin (macOS) hosts
|
||||
darwinConfigurations = {
|
||||
AirPuppet = localLib.mkDarwinHost {
|
||||
system = "x86_64-darwin";
|
||||
hostname = "AirPuppet";
|
||||
};
|
||||
Blue-Rock = localLib.mkDarwinHost {
|
||||
system = "x86_64-darwin";
|
||||
hostname = "Blue-Rock";
|
||||
username = "gene.liverman";
|
||||
};
|
||||
mightymac = localLib.mkDarwinHost {
|
||||
hostname = "mightymac";
|
||||
username = "gene.liverman";
|
||||
};
|
||||
}; # end darwinConfigurations
|
||||
# Darwin (macOS) hosts
|
||||
darwinConfigurations = {
|
||||
AirPuppet = localLib.mkDarwinHost {
|
||||
system = "x86_64-darwin";
|
||||
hostname = "AirPuppet";
|
||||
};
|
||||
Blue-Rock = localLib.mkDarwinHost {
|
||||
system = "x86_64-darwin";
|
||||
hostname = "Blue-Rock";
|
||||
username = "gene.liverman";
|
||||
};
|
||||
mightymac = localLib.mkDarwinHost {
|
||||
hostname = "mightymac";
|
||||
username = "gene.liverman";
|
||||
};
|
||||
}; # end darwinConfigurations
|
||||
|
||||
# NixOS hosts
|
||||
nixosConfigurations = {
|
||||
bigboy = localLib.mkNixosHost {
|
||||
hostname = "bigboy";
|
||||
additionalModules = [
|
||||
inputs.nixos-hardware.nixosModules.lenovo-thinkpad-p52
|
||||
];
|
||||
};
|
||||
hetznix01 = localLib.mkNixosHost {
|
||||
hostname = "hetznix01";
|
||||
additionalModules = [
|
||||
inputs.private-flake.nixosModules.private.hetznix01
|
||||
];
|
||||
};
|
||||
hetznix02 = localLib.mkNixosHost {
|
||||
system = "aarch64-linux";
|
||||
hostname = "hetznix02";
|
||||
additionalModules = [
|
||||
# inputs.simple-nixos-mailserver.nixosModule
|
||||
];
|
||||
};
|
||||
kiosk-entryway = localLib.mkNixosHost {
|
||||
# Lenovo IdeaCentre Q190
|
||||
hostname = "kiosk-entryway";
|
||||
};
|
||||
kiosk-gene-desk = localLib.mkNixosHost {
|
||||
system = "aarch64-linux";
|
||||
hostname = "kiosk-gene-desk";
|
||||
additionalModules = [
|
||||
inputs.nixos-hardware.nixosModules.raspberry-pi-4
|
||||
];
|
||||
};
|
||||
nixnas1 = localLib.mkNixosHost {
|
||||
hostname = "nixnas1";
|
||||
additionalModules = [
|
||||
inputs.simple-nixos-mailserver.nixosModule
|
||||
];
|
||||
};
|
||||
nixnuc = localLib.mkNixosHost {
|
||||
hostname = "nixnuc";
|
||||
additionalModules = [
|
||||
inputs.simple-nixos-mailserver.nixosModule
|
||||
];
|
||||
};
|
||||
rainbow-planet = localLib.mkNixosHost {
|
||||
hostname = "rainbow-planet";
|
||||
additionalModules = [
|
||||
inputs.nixos-cosmic.nixosModules.default
|
||||
inputs.nixos-hardware.nixosModules.dell-xps-13-9360
|
||||
];
|
||||
};
|
||||
}; # end nixosConfigurations
|
||||
# NixOS hosts
|
||||
nixosConfigurations = {
|
||||
bigboy = localLib.mkNixosHost {
|
||||
hostname = "bigboy";
|
||||
additionalModules = [
|
||||
inputs.nixos-hardware.nixosModules.lenovo-thinkpad-p52
|
||||
];
|
||||
};
|
||||
hetznix01 = localLib.mkNixosHost {
|
||||
hostname = "hetznix01";
|
||||
additionalModules = [
|
||||
inputs.private-flake.nixosModules.private.hetznix01
|
||||
];
|
||||
};
|
||||
hetznix02 = localLib.mkNixosHost {
|
||||
system = "aarch64-linux";
|
||||
hostname = "hetznix02";
|
||||
additionalModules = [
|
||||
# inputs.simple-nixos-mailserver.nixosModule
|
||||
];
|
||||
};
|
||||
kiosk-entryway = localLib.mkNixosHost {
|
||||
# Lenovo IdeaCentre Q190
|
||||
hostname = "kiosk-entryway";
|
||||
};
|
||||
kiosk-gene-desk = localLib.mkNixosHost {
|
||||
system = "aarch64-linux";
|
||||
hostname = "kiosk-gene-desk";
|
||||
additionalModules = [
|
||||
inputs.nixos-hardware.nixosModules.raspberry-pi-4
|
||||
];
|
||||
};
|
||||
nixnas1 = localLib.mkNixosHost {
|
||||
hostname = "nixnas1";
|
||||
additionalModules = [
|
||||
inputs.simple-nixos-mailserver.nixosModule
|
||||
];
|
||||
};
|
||||
nixnuc = localLib.mkNixosHost {
|
||||
hostname = "nixnuc";
|
||||
additionalModules = [
|
||||
inputs.simple-nixos-mailserver.nixosModule
|
||||
];
|
||||
};
|
||||
rainbow-planet = localLib.mkNixosHost {
|
||||
hostname = "rainbow-planet";
|
||||
additionalModules = [
|
||||
inputs.nixos-cosmic.nixosModules.default
|
||||
inputs.nixos-hardware.nixosModules.dell-xps-13-9360
|
||||
];
|
||||
};
|
||||
}; # end nixosConfigurations
|
||||
|
||||
# Home Manager (only) users
|
||||
homeConfigurations = {
|
||||
gene-x86_64-linux = localLib.mkHomeConfig {
|
||||
homeDirectory = "/home/gene";
|
||||
username = "gene";
|
||||
system = "x86_64-linux";
|
||||
};
|
||||
# Home Manager (only) users
|
||||
homeConfigurations = {
|
||||
gene-x86_64-linux = localLib.mkHomeConfig {
|
||||
homeDirectory = "/home/gene";
|
||||
username = "gene";
|
||||
system = "x86_64-linux";
|
||||
};
|
||||
|
||||
gene-aarch64-linux = localLib.mkHomeConfig {
|
||||
homeDirectory = "/home/gene";
|
||||
username = "gene";
|
||||
system = "aarch64-linux";
|
||||
};
|
||||
}; # end homeConfigurations
|
||||
gene-aarch64-linux = localLib.mkHomeConfig {
|
||||
homeDirectory = "/home/gene";
|
||||
username = "gene";
|
||||
system = "aarch64-linux";
|
||||
};
|
||||
}; # end homeConfigurations
|
||||
|
||||
packages.aarch64-linux.kiosk-gene-desk-sdImage = self.nixosConfigurations.kiosk-gene-desk.config.system.build.sdImage;
|
||||
};
|
||||
packages.aarch64-linux.kiosk-gene-desk-sdImage =
|
||||
self.nixosConfigurations.kiosk-gene-desk.config.system.build.sdImage;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue