From 1ade5cad8087a8f9002cdda4683bb903c1eba828 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 13 Feb 2019 17:25:03 +0100
Subject: [PATCH] Revert "fish: use global for abbr"

This reverts commit 7d6a6cbbe39ffac09c740652c55718ec618924f1.

The version of fish in Nixpkgs 18.09 is not compatible with this
option. See #581.
---
 modules/programs/fish.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/fish.nix b/modules/programs/fish.nix
index 2328f9b9..0b46c17c 100644
--- a/modules/programs/fish.nix
+++ b/modules/programs/fish.nix
@@ -7,7 +7,7 @@ let
   cfg = config.programs.fish;
 
   abbrsStr = concatStringsSep "\n" (
-    mapAttrsToList (k: v: "abbr --add --global ${k} '${v}'") cfg.shellAbbrs
+    mapAttrsToList (k: v: "abbr --add ${k} '${v}'") cfg.shellAbbrs
   );
 
   aliasesStr = concatStringsSep "\n" (