diff --git a/src/modules/containers.nix b/src/modules/containers.nix index 2660d1455..775e05d7c 100644 --- a/src/modules/containers.nix +++ b/src/modules/containers.nix @@ -202,7 +202,7 @@ let type = types.either types.path (types.listOf types.path); description = "Add a path to the container. Defaults to the whole git repo."; default = self; - defaultText = "self"; + defaultText = lib.literalExpression "self"; }; startupCommand = lib.mkOption { diff --git a/src/modules/integrations/android.nix b/src/modules/integrations/android.nix index cb049234b..90262bf6e 100644 --- a/src/modules/integrations/android.nix +++ b/src/modules/integrations/android.nix @@ -217,12 +217,11 @@ in android-studio.package = lib.mkOption { type = lib.types.package; default = pkgs.android-studio; - defaultText = "pkgs.android-studio"; + defaultText = lib.literalExpression "pkgs.android-studio"; description = '' The Android Studio package to use. By default, the Android Studio package from nixpkgs is used. ''; - example = "pkgs.android-studio"; }; flutter.enable = lib.mkOption { @@ -236,12 +235,11 @@ in flutter.package = lib.mkOption { type = lib.types.package; default = pkgs.flutter; - defaultText = "pkgs.flutter"; + defaultText = lib.literalExpression "pkgs.flutter"; description = '' The Flutter package to use. By default, the Flutter package from nixpkgs is used. ''; - example = "pkgs.flutter"; }; reactNative.enable = lib.mkOption { @@ -258,7 +256,9 @@ in androidSdk platformTools androidEmulator - ] ++ (lib.optional cfg.flutter.enable cfg.flutter.package) ++ (lib.optional cfg.android-studio.enable cfg.android-studio.package); + ] + ++ lib.optional cfg.flutter.enable cfg.flutter.package + ++ lib.optional cfg.android-studio.enable cfg.android-studio.package; # Nested conditional for flutter languages = lib.mkMerge [ diff --git a/src/modules/languages/idris.nix b/src/modules/languages/idris.nix index 6f19e2ff5..40671427b 100644 --- a/src/modules/languages/idris.nix +++ b/src/modules/languages/idris.nix @@ -8,16 +8,16 @@ in { package = lib.mkOption { type = lib.types.package; default = pkgs.idris2; - defaultText = "pkgs.idris2"; + defaultText = lib.literalExpression "pkgs.idris2"; description = '' The Idris package to use. ''; - example = "pkgs.idris"; + example = lib.literalExpression "pkgs.idris"; }; }; config = lib.mkIf cfg.enable { - packages = with pkgs; [ + packages = [ cfg.package ]; }; diff --git a/src/modules/languages/java.nix b/src/modules/languages/java.nix index 5becf08e1..19f6f60c3 100644 --- a/src/modules/languages/java.nix +++ b/src/modules/languages/java.nix @@ -28,7 +28,7 @@ in enable = mkEnableOption "maven"; package = mkOption { type = types.package; - defaultText = "pkgs.maven.override { jdk_headless = cfg.jdk.package; }"; + defaultText = literalExpression "pkgs.maven.override { jdk_headless = cfg.jdk.package; }"; description = '' The Maven package to use. The Maven package by default inherits the JDK from `languages.java.jdk.package`. diff --git a/src/modules/languages/lean4.nix b/src/modules/languages/lean4.nix index f8480a8c6..004971475 100644 --- a/src/modules/languages/lean4.nix +++ b/src/modules/languages/lean4.nix @@ -8,7 +8,7 @@ in { package = lib.mkOption { type = lib.types.package; default = pkgs.lean4; - defaultText = "pkgs.lean4"; + defaultText = lib.literalExpression "pkgs.lean4"; description = '' The lean4 package to use. ''; diff --git a/src/modules/languages/scala.nix b/src/modules/languages/scala.nix index 7f384233d..caa818c8e 100644 --- a/src/modules/languages/scala.nix +++ b/src/modules/languages/scala.nix @@ -12,7 +12,7 @@ in package = lib.mkOption { type = lib.types.package; default = pkgs.scala_3; - defaultText = "pkgs.scala_3"; + defaultText = lib.literalExpression "pkgs.scala_3"; description = '' The Scala package to use. ''; diff --git a/src/modules/languages/standardml.nix b/src/modules/languages/standardml.nix index bace532c2..060b2f2ba 100644 --- a/src/modules/languages/standardml.nix +++ b/src/modules/languages/standardml.nix @@ -10,7 +10,7 @@ in package = lib.mkOption { type = lib.types.package; default = pkgs.mlton; - defaultText = "pkgs.mlton"; + defaultText = lib.literalExpression "pkgs.mlton"; description = '' The Standard ML package to use. ''; @@ -18,10 +18,10 @@ in }; config = lib.mkIf cfg.enable { - packages = with pkgs; [ + packages = [ cfg.package - millet - smlfmt + pkgs.millet + pkgs.smlfmt ]; }; } diff --git a/src/modules/languages/swift.nix b/src/modules/languages/swift.nix index bec3fc83e..352d32c0c 100644 --- a/src/modules/languages/swift.nix +++ b/src/modules/languages/swift.nix @@ -10,7 +10,7 @@ in package = lib.mkOption { type = lib.types.package; default = pkgs.swift; - defaultText = "pkgs.swift"; + defaultText = lib.literalExpression "pkgs.swift"; description = '' The Swift package to use. ''; @@ -18,7 +18,7 @@ in }; config = lib.mkIf cfg.enable { - packages = with pkgs; [ + packages = [ cfg.package pkgs.clang ]; diff --git a/src/modules/services/cockroachdb.nix b/src/modules/services/cockroachdb.nix index eb53c18a4..194ea21f3 100644 --- a/src/modules/services/cockroachdb.nix +++ b/src/modules/services/cockroachdb.nix @@ -28,7 +28,7 @@ in package = lib.mkOption { default = pkgs.cockroachdb-bin; - defaultText = "pkgs.cockroachdb-bin"; + defaultText = lib.literalExpression "pkgs.cockroachdb-bin"; description = "The CockroachDB package to use."; }; }; diff --git a/src/modules/services/nginx.nix b/src/modules/services/nginx.nix index 25f877501..8e80907e0 100644 --- a/src/modules/services/nginx.nix +++ b/src/modules/services/nginx.nix @@ -32,7 +32,7 @@ in package = lib.mkOption { type = lib.types.package; default = pkgs.nginx; - defaultText = "pkgs.nginx"; + defaultText = lib.literalExpression "pkgs.nginx"; description = "The nginx package to use."; };