chayleaf/dotfiles
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

flake.nix: get rid of default x86_64 system

Browse source
This commit is contained in:
chayleaf 2023-10-08 08:28:13 +07:00
parent b7137a836f
commit 5edb14e665
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
flake.nix
View file

@ -122,7 +122,7 @@
crossConfig = config: crossConfig' ({ crossConfig = config: crossConfig' ({
x86_64-linux = "aarch64-linux"; x86_64-linux = "aarch64-linux";
aarch64-linux = "x86_64-linux"; aarch64-linux = "x86_64-linux";
}.${config.system or "x86_64-linux"}) config; }.${config.system}) config;
in rec { in rec {
router-emmc = mkBpiR3 "emmc" routerConfig; router-emmc = mkBpiR3 "emmc" routerConfig;
router-sd = mkBpiR3 "sd" routerConfig; router-sd = mkBpiR3 "sd" routerConfig;
@ -159,7 +159,7 @@
}; };
# this is the system config processing part # this is the system config processing part
nixosConfigurations = builtins.mapAttrs (hostname: args @ { system ? "x86_64-linux", modules, specialArgs ? {}, nixpkgs ? {}, home ? {}, ... }: nixosConfigurations = builtins.mapAttrs (hostname: args @ { system, modules, specialArgs ? {}, nixpkgs ? {}, home ? {}, ... }:
lib.nixosSystem ({ lib.nixosSystem ({
inherit system; inherit system;
# allow modules to access nixpkgs directly, use customized lib, # allow modules to access nixpkgs directly, use customized lib,
@ -243,7 +243,7 @@
(lib.mapAttrsToList (lib.mapAttrsToList
(hostname: sysConfig: (hostname: sysConfig:
let let
system = if sysConfig?system then sysConfig.system else "x86_64-linux"; inherit (sysConfig) system;
common' = builtins.removeAttrs (sysConfig.home.common or { }) [ "nix" "nixpkgs" "enableNixosModule" ]; common' = builtins.removeAttrs (sysConfig.home.common or { }) [ "nix" "nixpkgs" "enableNixosModule" ];
pkgs = mkPkgs ({ inherit system; } // ((sysConfig.home.common or { }).nixpkgs or {})); pkgs = mkPkgs ({ inherit system; } // ((sysConfig.home.common or { }).nixpkgs or {}));
common = common' // { inherit pkgs; }; common = common' // { inherit pkgs; };
@ -295,10 +295,10 @@
}; };
}; };
in { in {
server.${config.nixserver.system or "x86_64-linux"} = addMeta nixosConfigurations.nixserver.config.system.build.toplevel; server.${config.nixserver.system} = addMeta nixosConfigurations.nixserver.config.system.build.toplevel;
workstation.${config.nixmsi.system or "x86_64-linux"} = addMeta nixosConfigurations.nixmsi.config.system.build.toplevel; workstation.${config.nixmsi.system} = addMeta nixosConfigurations.nixmsi.config.system.build.toplevel;
router.${config.router-emmc.system or "x86_64-linux"} = addMeta nixosConfigurations.router-emmc-cross.config.system.build.toplevel; router.${config.router-emmc.system} = addMeta nixosConfigurations.router-emmc-cross.config.system.build.toplevel;
workstation-home.${config.nixmsi.system or "x86_64-linux"} = addMeta homeConfigurations."user@nixmsi".activation-script; workstation-home.${config.nixmsi.system} = addMeta homeConfigurations."user@nixmsi".activation-script;
}; };
}; };
} }