fix: resolve nix build warnings
This commit is contained in:
@@ -17,7 +17,7 @@ in
|
||||
inputs.colmena.lib.makeHive {
|
||||
meta = {
|
||||
nixpkgs = import inputs.nixpkgs {
|
||||
system = "x86_64-linux";
|
||||
localSystem = "x86_64-linux";
|
||||
};
|
||||
|
||||
nodeNixpkgs = builtins.mapAttrs (_: v: v.pkgs) self.nixosConfigurations;
|
||||
|
||||
34
flake.nix
34
flake.nix
@@ -77,8 +77,10 @@
|
||||
(lib.genAttrs hostDirNames (
|
||||
host:
|
||||
nixpkgs.lib.nixosSystem {
|
||||
system = import ./hosts/${host}/system.nix;
|
||||
modules = [ ./hosts/${host} ];
|
||||
modules = [
|
||||
./hosts/${host}
|
||||
{ nixpkgs.hostPlatform = import ./hosts/${host}/system.nix; }
|
||||
];
|
||||
specialArgs = {
|
||||
inherit inputs outputs dotsPath;
|
||||
};
|
||||
@@ -86,14 +88,12 @@
|
||||
))
|
||||
// {
|
||||
sd-image-orange-pi-aarch64 = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
modules = [
|
||||
"${nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix"
|
||||
./images/sd-image-orange-pi-aarch64.nix
|
||||
{
|
||||
nixpkgs.crossSystem = {
|
||||
system = "aarch64-linux";
|
||||
};
|
||||
nixpkgs.buildPlatform = "x86_64-linux";
|
||||
nixpkgs.hostPlatform = "aarch64-linux";
|
||||
}
|
||||
];
|
||||
specialArgs = {
|
||||
@@ -101,14 +101,12 @@
|
||||
};
|
||||
};
|
||||
sd-image-raspberry-pi-aarch64 = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
modules = [
|
||||
"${nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix"
|
||||
./images/sd-image-raspberry-pi-aarch64.nix
|
||||
{
|
||||
nixpkgs.crossSystem = {
|
||||
system = "aarch64-linux";
|
||||
};
|
||||
nixpkgs.buildPlatform = "x86_64-linux";
|
||||
nixpkgs.hostPlatform = "aarch64-linux";
|
||||
}
|
||||
];
|
||||
specialArgs = {
|
||||
@@ -130,8 +128,10 @@
|
||||
};
|
||||
};
|
||||
|
||||
apps.${system}.colmena = inputs.colmena.apps.${system}.default;
|
||||
colmenaHive = import ./deploy/colmena.nix {
|
||||
apps.${system}.colmena = inputs.colmena.apps.${system}.default // {
|
||||
meta.description = "Colmena deployment tool";
|
||||
};
|
||||
colmena = import ./deploy/colmena.nix {
|
||||
inherit
|
||||
self
|
||||
inputs
|
||||
@@ -142,9 +142,11 @@
|
||||
formatter.${system} = gitHooks.formatter;
|
||||
devShells.${system} = gitHooks.devShells;
|
||||
|
||||
images.sd-image-orange-pi-aarch64 =
|
||||
self.nixosConfigurations.sd-image-orange-pi-aarch64.config.system.build.sdImage;
|
||||
images.sd-image-raspberry-pi-aarch64 =
|
||||
self.nixosConfigurations.sd-image-raspberry-pi-aarch64.config.system.build.sdImage;
|
||||
legacyPackages.${system} = {
|
||||
sd-image-orange-pi-aarch64 =
|
||||
self.nixosConfigurations.sd-image-orange-pi-aarch64.config.system.build.sdImage;
|
||||
sd-image-raspberry-pi-aarch64 =
|
||||
self.nixosConfigurations.sd-image-raspberry-pi-aarch64.config.system.build.sdImage;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -10,7 +10,10 @@ let
|
||||
pre-commit-check = git-hooks.lib.${system}.run {
|
||||
inherit src;
|
||||
hooks = {
|
||||
nixfmt.enable = true;
|
||||
nixfmt = {
|
||||
enable = true;
|
||||
package = pkgs.nixfmt;
|
||||
};
|
||||
statix.enable = true;
|
||||
deadnix.enable = true;
|
||||
};
|
||||
|
||||
@@ -8,7 +8,6 @@ with pkgs;
|
||||
fzf
|
||||
htop
|
||||
jq
|
||||
nixfmt-rfc-style
|
||||
nmap
|
||||
nodejs_24
|
||||
nvimpager
|
||||
|
||||
@@ -26,7 +26,7 @@ in
|
||||
};
|
||||
extensions = {
|
||||
force = true;
|
||||
packages = with inputs.firefox-addons.packages.${pkgs.system}; [
|
||||
packages = with inputs.firefox-addons.packages.${pkgs.stdenv.hostPlatform.system}; [
|
||||
duckduckgo-privacy-essentials
|
||||
firefox-color
|
||||
istilldontcareaboutcookies
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
{
|
||||
config = {
|
||||
home.packages = [
|
||||
inputs.nvim.packages.${pkgs.system}.nvim
|
||||
inputs.nvim.packages.${pkgs.stdenv.hostPlatform.system}.nvim
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -86,7 +86,7 @@ in
|
||||
boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
|
||||
|
||||
environment.systemPackages = [
|
||||
inputs.colmena.packages.${pkgs.system}.colmena
|
||||
inputs.colmena.packages.${pkgs.stdenv.hostPlatform.system}.colmena
|
||||
];
|
||||
|
||||
services = {
|
||||
|
||||
@@ -80,7 +80,7 @@ in
|
||||
};
|
||||
|
||||
environment.systemPackages = [
|
||||
inputs.colmena.packages.${pkgs.system}.colmena
|
||||
inputs.colmena.packages.${pkgs.stdenv.hostPlatform.system}.colmena
|
||||
(pkgs.writeShellApplication {
|
||||
name = "wol-andromache";
|
||||
runtimeInputs = [ pkgs.wakeonlan ];
|
||||
|
||||
@@ -31,7 +31,7 @@ in
|
||||
|
||||
hardware.enableRedistributableFirmware = true;
|
||||
|
||||
hardware.pulseaudio.enable = true;
|
||||
services.pulseaudio.enable = true;
|
||||
|
||||
networking.wireless.enable = true;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user