ar
/
nibylandia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

common: avoid rebuilding basic tools

main
Robert Gerus 2023-10-09 01:21:05 +02:00
parent 7211f82a5a
commit c10f197b26
2 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
flake.nix
View File

@ -20,7 +20,24 @@
outputs = { self, nixpkgs, nix-formatter-pack, nix-index-database, deploy-rs
, agenix, lanzaboote, ... }:
let forAllSystems = nixpkgs.lib.genAttrs [ "x86_64-linux" "aarch64-linux" ];
let
forAllSystems = nixpkgs.lib.genAttrs [ "x86_64-linux" "aarch64-linux" ];
pkgsForDeploy =
forAllSystems (system: import nixpkgs { inherit system; });
deployPkgs = forAllSystems (system:
let pkgs = pkgsForDeploy.${system};
in import nixpkgs {
inherit system;
overlays = [
deploy-rs.overlay
(self: super: {
deploy-rs = {
inherit (pkgs) deploy-rs;
inherit (super.deploy-rs) lib;
};
})
];
});
in {
formatter = forAllSystems (system:
nix-formatter-pack.lib.mkFormatter {
@ -67,6 +84,11 @@
nibylandia-boot
({ pkgs, ... }: {
environment.systemPackages =
[ agenix.packages.${pkgs.system}.default ];
})
./modules/common.nix
];
@ -122,7 +144,7 @@
profiles.system = {
user = "root";
sshUser = "root";
path = deploy-rs.lib.aarch64-linux.activate.nixos
path = deployPkgs.aarch64-linux.deploy-rs.lib.activate.nixos
self.nixosConfigurations.scylla;
};
};
@ -134,7 +156,7 @@
profiles.system = {
user = "root";
sshUser = "root";
path = deploy-rs.lib.x86_64-linux.activate.nixos
path = deployPkgs.x86_64-linux.deploy-rs.lib.activate.nixos
self.nixosConfigurations.khas;
};
};
@ -146,7 +168,7 @@
profiles.system = {
user = "root";
sshUser = "root";
path = deploy-rs.lib.x86_64-linux.activate.nixos
path = deployPkgs.x86_64-linux.deploy-rs.lib.activate.nixos
self.nixosConfigurations.microlith;
};
};

5
modules/laptop.nix
View File

@ -12,9 +12,4 @@
services.fwupd.enable = true;
services.fwupd.extraRemotes = [ "lvfs-testing" "vendor" "vendor-directory" ];
services.fwupd.daemonSettings.OnlyTrusted = false;
#services.fwupd.package = (pkgs.fwupd.overrideAttrs (oldAttrs: {
# patches = (oldAttrs.patches or []) ++ [
# ./disable-secureboot-checks.patch
# ];
#}));
}