hektor/nix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: resolve nix build warnings

Browse Source
This commit is contained in:
Hektor Misplon
2026-02-22 16:40:20 +01:00
parent b895e85953
commit 7b13880be2
9 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
deploy/colmena.nix
View File

@@ -17,7 +17,7 @@ in
inputs.colmena.lib.makeHive { inputs.colmena.lib.makeHive {
meta = { meta = {
nixpkgs = import inputs.nixpkgs { nixpkgs = import inputs.nixpkgs {
system = "x86_64-linux"; localSystem = "x86_64-linux";
}; };
nodeNixpkgs = builtins.mapAttrs (_: v: v.pkgs) self.nixosConfigurations; nodeNixpkgs = builtins.mapAttrs (_: v: v.pkgs) self.nixosConfigurations;

34
flake.nix
View File

@@ -77,8 +77,10 @@
(lib.genAttrs hostDirNames ( (lib.genAttrs hostDirNames (
host: host:
nixpkgs.lib.nixosSystem { nixpkgs.lib.nixosSystem {
system = import ./hosts/${host}/system.nix; modules = [
modules = [ ./hosts/${host} ]; ./hosts/${host}
{ nixpkgs.hostPlatform = import ./hosts/${host}/system.nix; }
];
specialArgs = { specialArgs = {
inherit inputs outputs dotsPath; inherit inputs outputs dotsPath;
}; };
@@ -86,14 +88,12 @@
)) ))
// { // {
sd-image-orange-pi-aarch64 = nixpkgs.lib.nixosSystem { sd-image-orange-pi-aarch64 = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [ modules = [
"${nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix" "${nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix"
./images/sd-image-orange-pi-aarch64.nix ./images/sd-image-orange-pi-aarch64.nix
{ {
nixpkgs.crossSystem = { nixpkgs.buildPlatform = "x86_64-linux";
system = "aarch64-linux"; nixpkgs.hostPlatform = "aarch64-linux";
};
} }
]; ];
specialArgs = { specialArgs = {
@@ -101,14 +101,12 @@
}; };
}; };
sd-image-raspberry-pi-aarch64 = nixpkgs.lib.nixosSystem { sd-image-raspberry-pi-aarch64 = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [ modules = [
"${nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix" "${nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix"
./images/sd-image-raspberry-pi-aarch64.nix ./images/sd-image-raspberry-pi-aarch64.nix
{ {
nixpkgs.crossSystem = { nixpkgs.buildPlatform = "x86_64-linux";
system = "aarch64-linux"; nixpkgs.hostPlatform = "aarch64-linux";
};
} }
]; ];
specialArgs = { specialArgs = {
@@ -130,8 +128,10 @@
}; };
}; };
apps.${system}.colmena = inputs.colmena.apps.${system}.default; apps.${system}.colmena = inputs.colmena.apps.${system}.default // {
colmenaHive = import ./deploy/colmena.nix { meta.description = "Colmena deployment tool";
};
colmena = import ./deploy/colmena.nix {
inherit inherit
self self
inputs inputs
@@ -142,9 +142,11 @@
formatter.${system} = gitHooks.formatter; formatter.${system} = gitHooks.formatter;
devShells.${system} = gitHooks.devShells; devShells.${system} = gitHooks.devShells;
images.sd-image-orange-pi-aarch64 = legacyPackages.${system} = {
self.nixosConfigurations.sd-image-orange-pi-aarch64.config.system.build.sdImage; sd-image-orange-pi-aarch64 =
images.sd-image-raspberry-pi-aarch64 = self.nixosConfigurations.sd-image-orange-pi-aarch64.config.system.build.sdImage;
self.nixosConfigurations.sd-image-raspberry-pi-aarch64.config.system.build.sdImage; sd-image-raspberry-pi-aarch64 =
self.nixosConfigurations.sd-image-raspberry-pi-aarch64.config.system.build.sdImage;
};
}; };
} }

5
git-hooks.nix
View File

@@ -10,7 +10,10 @@ let
pre-commit-check = git-hooks.lib.${system}.run { pre-commit-check = git-hooks.lib.${system}.run {
inherit src; inherit src;
hooks = { hooks = {
nixfmt.enable = true; nixfmt = {
enable = true;
package = pkgs.nixfmt;
};
statix.enable = true; statix.enable = true;
deadnix.enable = true; deadnix.enable = true;
}; };

1
home/hosts/packages.nix
View File

@@ -8,7 +8,6 @@ with pkgs;
fzf fzf
htop htop
jq jq
nixfmt-rfc-style
nmap nmap
nodejs_24 nodejs_24
nvimpager nvimpager

2
home/modules/browser/firefox-base.nix
View File

@@ -26,7 +26,7 @@ in
}; };
extensions = { extensions = {
force = true; force = true;
packages = with inputs.firefox-addons.packages.${pkgs.system}; [ packages = with inputs.firefox-addons.packages.${pkgs.stdenv.hostPlatform.system}; [
duckduckgo-privacy-essentials duckduckgo-privacy-essentials
firefox-color firefox-color
istilldontcareaboutcookies istilldontcareaboutcookies

2
home/modules/nvim.nix
View File

@@ -3,7 +3,7 @@
{ {
config = { config = {
home.packages = [ home.packages = [
inputs.nvim.packages.${pkgs.system}.nvim inputs.nvim.packages.${pkgs.stdenv.hostPlatform.system}.nvim
]; ];
}; };
} }

2
hosts/andromache/default.nix
View File

@@ -86,7 +86,7 @@ in
boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
environment.systemPackages = [ environment.systemPackages = [
inputs.colmena.packages.${pkgs.system}.colmena inputs.colmena.packages.${pkgs.stdenv.hostPlatform.system}.colmena
]; ];
services = { services = {

2
hosts/astyanax/default.nix
View File

@@ -80,7 +80,7 @@ in
}; };
environment.systemPackages = [ environment.systemPackages = [
inputs.colmena.packages.${pkgs.system}.colmena inputs.colmena.packages.${pkgs.stdenv.hostPlatform.system}.colmena
(pkgs.writeShellApplication { (pkgs.writeShellApplication {
name = "wol-andromache"; name = "wol-andromache";
runtimeInputs = [ pkgs.wakeonlan ]; runtimeInputs = [ pkgs.wakeonlan ];

2
images/sd-image-raspberry-pi-aarch64.nix
View File

@@ -31,7 +31,7 @@ in
hardware.enableRedistributableFirmware = true; hardware.enableRedistributableFirmware = true;
hardware.pulseaudio.enable = true; services.pulseaudio.enable = true;
networking.wireless.enable = true; networking.wireless.enable = true;