Port to 20.03

fish.nix

@@ -1,18 +1,18 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 {
   programs.fish = {
     enable = true;
-  #  plugins = [
-  #    {
-  #      name = "fzf";
-  #      src = pkgs.fetchFromGithub {
-  #        owner = "jethrokuan";
-  #        repo = "fzf";
-  #        rev = "7f4c0b6d9545126a1bdf30279e6b1ab6ffedc299";
-  #        sha256 = "0c5i7sdrsp0q3vbziqzdyqn4fmp235ax4mn4zslrswvn8g3fvdyh";
-  #      };
-  #    }
-  #  ];
+    plugins = with pkgs; [
+      {
+        name = "fzf";
+        src = pkgs.fetchFromGitHub {
+          owner = "jethrokuan";
+          repo = "fzf";
+          rev = "c3defd4a922e97120503b45e26efa775bc672b50";
+          sha256 = "1k5b0nva0mbqc9830qhbcwxsi8d9b2p4ws1fq0bw9nkf2ripyp4p";
+        };
+      }
+    ];
     interactiveShellInit = ''
       # fish git prompt
       set __fish_git_prompt_show_informative_status 'yes'
@@ -30,12 +30,12 @@
       set -U FZF_LEGACY_KEYBINDINGS 0
       #set -x TERM xterm-256color
 
-      if status is-interactive
-      and not status is-login
-      and not set -q TMUX
-      and string match -qr "^xterm-.*" "$TERM"
-        exec tmux
-      end
+      #if status is-interactive
+      #and not status is-login
+      #and not set -q TMUX
+      #and string match -qr "^xterm-.*" "$TERM"
+      #  exec tmux
+      #end
     '';
     promptInit = ''
       function fish_prompt