diff --git a/abbreviations/bat/bat-abbreviations.nu b/abbreviations/bat/bat-abbreviations.nu index d3482d67..1a22f68d 100644 --- a/abbreviations/bat/bat-abbreviations.nu +++ b/abbreviations/bat/bat-abbreviations.nu @@ -8,8 +8,5 @@ const bat_abbreviations = { } export-env { - $env.config.abbreviations = { - ...$bat_abbreviations - ...$env.config.abbreviations - } + $env.config.abbreviations = ($bat_abbreviations | merge $env.config.abbreviations) } diff --git a/abbreviations/chezmoi/chezmoi-abbreviations.nu b/abbreviations/chezmoi/chezmoi-abbreviations.nu index a9b21dc5..87ff4414 100644 --- a/abbreviations/chezmoi/chezmoi-abbreviations.nu +++ b/abbreviations/chezmoi/chezmoi-abbreviations.nu @@ -8,8 +8,5 @@ const chezmoi_abbreviations = { } export-env { - $env.config.abbreviations = { - ...$chezmoi_abbreviations - ...$env.config.abbreviations - } + $env.config.abbreviations = ($chezmoi_abbreviations | merge $env.config.abbreviations) } diff --git a/abbreviations/docker/docker-abbreviations.nu b/abbreviations/docker/docker-abbreviations.nu index 5415ad8a..54bd305d 100644 --- a/abbreviations/docker/docker-abbreviations.nu +++ b/abbreviations/docker/docker-abbreviations.nu @@ -35,8 +35,5 @@ const docker_abbreviations = { } export-env { - $env.config.abbreviations = { - ...$docker_abbreviations - ...$env.config.abbreviations - } + $env.config.abbreviations = ($docker_abbreviations | merge $env.config.abbreviations) } diff --git a/abbreviations/exa/exa-abbreviations.nu b/abbreviations/exa/exa-abbreviations.nu index a4f9a0fd..8fe239f8 100644 --- a/abbreviations/exa/exa-abbreviations.nu +++ b/abbreviations/exa/exa-abbreviations.nu @@ -8,8 +8,5 @@ const exa_abbreviations = { } export-env { - $env.config.abbreviations = { - ...$exa_abbreviations - ...$env.config.abbreviations - } + $env.config.abbreviations = ($exa_abbreviations | merge $env.config.abbreviations) } diff --git a/abbreviations/eza/eza-abbreviations.nu b/abbreviations/eza/eza-abbreviations.nu index e7458fc1..98b38e17 100644 --- a/abbreviations/eza/eza-abbreviations.nu +++ b/abbreviations/eza/eza-abbreviations.nu @@ -8,8 +8,5 @@ const eza_abbreviations = { } export-env { - $env.config.abbreviations = { - ...$eza_abbreviations - ...$env.config.abbreviations - } + $env.config.abbreviations = ($eza_abbreviations | merge $env.config.abbreviations) } diff --git a/abbreviations/git/git-abbreviations.nu b/abbreviations/git/git-abbreviations.nu index 7fe48d3f..8ef93e2d 100644 --- a/abbreviations/git/git-abbreviations.nu +++ b/abbreviations/git/git-abbreviations.nu @@ -187,8 +187,5 @@ const git_abbreviations = { } export-env { - $env.config.abbreviations = { - ...$git_abbreviations - ...$env.config.abbreviations - } + $env.config.abbreviations = ($git_abbreviations | merge $env.config.abbreviations) }