Compare commits
No commits in common. "8e3ce585512efc1c9f9a74d79918fef2c3fc1d5f" and "00eb9d49b3a8d5fc1c89fe4515348f271b9db9a2" have entirely different histories.
8e3ce58551
...
00eb9d49b3
@ -1,35 +0,0 @@
|
||||
{ pkgs, config, lib, ... }:
|
||||
let
|
||||
|
||||
configForSystem = (system:
|
||||
let
|
||||
riscv = [ "riscv32-linux" "riscv64-linux" ];
|
||||
arm = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ];
|
||||
x86 = [ "i686-linux" "x86_64-linux" ];
|
||||
windows = [ "x86_64-windows" "i686-windows" ];
|
||||
systems = {
|
||||
x86_64-linux = riscv ++ arm ++ windows;
|
||||
aarch64-linux = riscv;
|
||||
};
|
||||
in
|
||||
if (systems ? "${system}") then systems."${system}" else []
|
||||
);
|
||||
emulatedSystems = configForSystem "${pkgs.system}";
|
||||
cfg = config.nixfiles.binfmt;
|
||||
in
|
||||
{
|
||||
options.nixfiles.binfmt = {
|
||||
enable = lib.mkOption {
|
||||
description = "Whether to configure default binfmt emulated systems for the current architecture";
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
example = true;
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkMerge [
|
||||
(lib.mkIf (cfg.enable && (builtins.length emulatedSystems) > 0) {
|
||||
boot.binfmt = {inherit emulatedSystems;};
|
||||
})
|
||||
];
|
||||
}
|
@ -5,6 +5,5 @@
|
||||
./nvidia.nix
|
||||
./opengl.nix
|
||||
./sound.nix
|
||||
./binfmt.nix
|
||||
];
|
||||
}
|
||||
|
@ -17,7 +17,6 @@ in
|
||||
# Enable system Nix configuration
|
||||
nix.enable = lib.mkDefault true;
|
||||
};
|
||||
nixfiles.binfmt.enable = true;
|
||||
|
||||
# locale settings
|
||||
i18n = {
|
||||
@ -71,7 +70,6 @@ in
|
||||
htop
|
||||
lshw
|
||||
pciutils
|
||||
compsize
|
||||
|
||||
# nix utilities
|
||||
nix-du
|
||||
@ -81,9 +79,6 @@ in
|
||||
age
|
||||
pass
|
||||
sops
|
||||
|
||||
# etc
|
||||
neofetch
|
||||
];
|
||||
|
||||
programs.neovim.defaultEditor = lib.mkDefault true;
|
||||
|
Loading…
x
Reference in New Issue
Block a user