diff --git a/plugins/filetrees/nvim-tree.nix b/plugins/filetrees/nvim-tree.nix
index e6c87314..3f10ac88 100644
--- a/plugins/filetrees/nvim-tree.nix
+++ b/plugins/filetrees/nvim-tree.nix
@@ -243,14 +243,12 @@ in {
           error = helpers.defaultNullOpts.mkStr "" "";
         };
 
-        severity = let
-          severityEnum = ["error" "warn" "info" "hint"];
-        in {
-          min = helpers.defaultNullOpts.mkEnum severityEnum "hint" ''
+        severity = {
+          min = helpers.defaultNullOpts.mkSeverity "hint" ''
             Minimum severity for which the diagnostics will be displayed.
             See `|diagnostic-severity|`.
           '';
-          max = helpers.defaultNullOpts.mkEnum severityEnum "error" ''
+          max = helpers.defaultNullOpts.mkSeverity "error" ''
             Maximum severity for which the diagnostics will be displayed.
             See `|diagnostic-severity|`.
           '';
@@ -899,13 +897,12 @@ in {
           show_on_dirs = showOnDirs;
           show_on_open_dirs = showOnOpenDirs;
           inherit icons;
-          severity =
-            mapAttrs (
-              name: value:
-                ifNonNull' value
-                (helpers.mkRaw "vim.diagnostic.severity.${strings.toUpper value}")
-            )
-            severity;
+          severity = with severity; {
+            inherit
+              min
+              max
+              ;
+          };
         };
         git = with git; {
           inherit enable;
diff --git a/plugins/none-ls/default.nix b/plugins/none-ls/default.nix
index 17727485..2c9d60c1 100644
--- a/plugins/none-ls/default.nix
+++ b/plugins/none-ls/default.nix
@@ -109,14 +109,10 @@ in {
         method, described in [BUILTIN_CONFIG](BUILTIN_CONFIG.md).
       '';
 
-      fallbackSeverity =
-        helpers.defaultNullOpts.mkNullable
-        (with types; either int (enum ["error" "warn" "info" "hint"]))
-        "error"
-        ''
-          Defines the severity used when a diagnostic source does not explicitly define a severity.
-          See `:help diagnostic-severity` for available values.
-        '';
+      fallbackSeverity = helpers.defaultNullOpts.mkSeverity "error" ''
+        Defines the severity used when a diagnostic source does not explicitly define a severity.
+        See `:help diagnostic-severity` for available values.
+      '';
 
       logLevel =
         helpers.defaultNullOpts.mkEnum ["off" "error" "warn" "info" "debug" "trace"] "warn"
@@ -257,10 +253,7 @@ in {
           default_timeout = defaultTimeout;
           diagnostic_config = diagnosticConfig;
           diagnostics_format = diagnosticsFormat;
-          fallback_severity =
-            if isString fallbackSeverity
-            then helpers.mkRaw "vim.diagnostic.severity.${strings.toUpper fallbackSeverity}"
-            else fallbackSeverity;
+          fallback_severity = fallbackSeverity;
           log_level = logLevel;
           notify_format = notifyFormat;
           on_attach = helpers.mkRaw onAttach';