From aa205e33bc2b1c94ef5fd0a4fd348d153bf5abc3 Mon Sep 17 00:00:00 2001 From: Fuwn Date: Mon, 28 Oct 2024 09:45:16 -0700 Subject: options: rename nix.extend to nix.extendedSupport --- hosts/akashi/configuration.nix | 2 +- hosts/kansai/configuration.nix | 2 +- modules/core/nix/default.nix | 2 +- modules/core/nix/extended-support.nix | 22 ++++++++++++++++++++++ modules/core/nix/extended.nix | 22 ---------------------- modules/options/nix.nix | 2 +- 6 files changed, 26 insertions(+), 26 deletions(-) create mode 100644 modules/core/nix/extended-support.nix delete mode 100644 modules/core/nix/extended.nix diff --git a/hosts/akashi/configuration.nix b/hosts/akashi/configuration.nix index 48f1659..c255c06 100644 --- a/hosts/akashi/configuration.nix +++ b/hosts/akashi/configuration.nix @@ -15,7 +15,7 @@ modules = { primaryUser = "ebisu"; mosh.enable = true; - nix.extend = true; + nix.extendedSupport = true; }; system.stateVersion = "24.05"; diff --git a/hosts/kansai/configuration.nix b/hosts/kansai/configuration.nix index c33068d..9a306c5 100644 --- a/hosts/kansai/configuration.nix +++ b/hosts/kansai/configuration.nix @@ -12,7 +12,7 @@ modules = { primaryUser = "ebisu"; mosh.enable = true; - nix.extend = true; + nix.extendedSupport = true; }; networking.hostName = "kansai"; diff --git a/modules/core/nix/default.nix b/modules/core/nix/default.nix index 2280f97..7f60e31 100644 --- a/modules/core/nix/default.nix +++ b/modules/core/nix/default.nix @@ -7,7 +7,7 @@ { imports = [ ./distributed-builds.nix - ./extended.nix + ./extended-support.nix ./nh.nix ]; diff --git a/modules/core/nix/extended-support.nix b/modules/core/nix/extended-support.nix new file mode 100644 index 0000000..ac85e6a --- /dev/null +++ b/modules/core/nix/extended-support.nix @@ -0,0 +1,22 @@ +{ + config, + lib, + pkgs, + ... +}: +{ + config = lib.mkIf config.modules.nix.extendedSupport { + programs.nix-index-database.comma.enable = true; + boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; + + nix.settings = { + extra-platforms = config.boot.binfmt.emulatedSystems; + + extra-sandbox-paths = [ + config.programs.ccache.cacheDir + "/run/binfmt" + "${pkgs.qemu}" + ]; + }; + }; +} diff --git a/modules/core/nix/extended.nix b/modules/core/nix/extended.nix deleted file mode 100644 index 6ce2695..0000000 --- a/modules/core/nix/extended.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -{ - config = lib.mkIf config.modules.nix.extend { - programs.nix-index-database.comma.enable = true; - boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; - - nix.settings = { - extra-platforms = config.boot.binfmt.emulatedSystems; - - extra-sandbox-paths = [ - config.programs.ccache.cacheDir - "/run/binfmt" - "${pkgs.qemu}" - ]; - }; - }; -} diff --git a/modules/options/nix.nix b/modules/options/nix.nix index 62836ae..4cc54ec 100644 --- a/modules/options/nix.nix +++ b/modules/options/nix.nix @@ -4,7 +4,7 @@ with lib.options; with lib.types; { - extend = mkOption { + extendedSupport = mkOption { default = false; type = types.bool; }; -- cgit v1.2.3