diff options
| -rw-r--r-- | flake.nix | 18 | ||||
| -rw-r--r-- | modules/nixos/archetypes/server.nix | 1 | ||||
| -rw-r--r-- | modules/shared/base/nix.nix | 4 |
3 files changed, 11 insertions, 12 deletions
@@ -123,13 +123,15 @@ system: let pkgs = nixpkgsFor.${system}; - nixos-rebuild = pkgs.nixos-rebuild.override { nix = pkgs.lix; }; - inherit (inputs.nix-darwin.packages.${system}) darwin-rebuild; in { default = pkgs.mkShellNoCC { packages = [ + # We want to make sure we have the same + # Nix behavior across machines + pkgs.nix + # For CI pkgs.actionlint @@ -140,14 +142,14 @@ pkgs.just ] - ++ lib.optional pkgs.stdenv.isDarwin darwin-rebuild # See next comment - ++ lib.optionals pkgs.stdenv.isLinux [ - # We want to make sure we have the same - # Nix behavior across machines - pkgs.lix + ++ lib.optionals pkgs.stdenv.hostPlatform.isDarwin [ + # See above comment about Nix + inputs.nix-darwin.packages.${system}.darwin-rebuild + ] + ++ lib.optionals pkgs.stdenv.hostPlatform.isLinux [ # Ditto - nixos-rebuild + pkgs.nixos-rebuild inputs.agenix.packages.${system}.agenix ]; diff --git a/modules/nixos/archetypes/server.nix b/modules/nixos/archetypes/server.nix index 4dfbf9e..780e1b4 100644 --- a/modules/nixos/archetypes/server.nix +++ b/modules/nixos/archetypes/server.nix @@ -11,7 +11,6 @@ in base = { enable = true; defaultPrograms.enable = false; - nixSettings.lix.enable = false; }; server = { diff --git a/modules/shared/base/nix.nix b/modules/shared/base/nix.nix index 82eba7e..ebae4dc 100644 --- a/modules/shared/base/nix.nix +++ b/modules/shared/base/nix.nix @@ -22,9 +22,7 @@ in defaultText = lib.literalExpression "config.base.enable"; }; - lix.enable = lib.mkEnableOption "the use of Lix over Nix" // { - default = isLinux; - }; + lix.enable = lib.mkEnableOption "the use of Lix over Nix"; }; config = lib.mkIf cfg.enable ( |