From c5e855e060029697a8b13516b5bd55b87169cf7c Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Wed, 7 Jan 2015 14:11:03 +0100
Subject: [PATCH 1/2] Add basic nixos module for fish shell

---
 nixos/modules/programs/fish/fish.nix | 109 +++++++++++++++++++++++++++
 1 file changed, 109 insertions(+)
 create mode 100644 nixos/modules/programs/fish/fish.nix

diff --git a/nixos/modules/programs/fish/fish.nix b/nixos/modules/programs/fish/fish.nix
new file mode 100644
index 00000000000..1903b431aee
--- /dev/null
+++ b/nixos/modules/programs/fish/fish.nix
@@ -0,0 +1,109 @@
+# This module defines global configuration for the fish.
+
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+cfge = config.environment;
+
+cfg = config.programs.fish;
+
+in
+
+{
+
+  options = {
+
+    programs.fish = {
+
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whenever to configure fish as an interactive shell.
+          '';
+        type = types.bool;
+      };
+
+      shellAliases = mkOption {
+        default = config.environment.shellAliases;
+        description = ''
+          Set of aliases for zsh shell. See <option>environment.shellAliases</option>
+          for an option format description.
+            '';
+        type = types.attrs; # types.attrsOf types.stringOrPath;
+      };
+
+      shellInit = mkOption {
+        default = "";
+        description = ''
+          Shell script code called during fish shell initialisation.
+        '';
+        type = types.lines;
+      };
+
+      loginShellInit = mkOption {
+        default = "";
+        description = ''
+          Shell script code called during fish login shell initialisation.
+        '';
+        type = types.lines;
+      };
+
+      interactiveShellInit = mkOption {
+        default = "";
+        description = ''
+          Shell script code called during interactive fish initialisation.
+        '';
+        type = types.lines;
+      };
+
+      promptInit = mkOption {
+        default = "";
+        description = ''
+          Shell script code used to initialise the fish prompt.
+        '';
+        type = types.lines;
+      };
+
+    };
+
+  };
+
+  config = mkIf cfg.enable {
+
+    programs.fish = {
+
+      shellInit = ''
+        . ${config.system.build.setEnvironment}
+
+        ${cfge.shellInit}
+      '';
+
+      loginShellInit = cfge.loginShellInit;
+
+      interactiveShellInit = ''
+        ${cfge.interactiveShellInit}
+
+        ${cfg.promptInit}
+      '';
+
+    };
+
+    environment.profileRelativeEnvVars = { };
+
+    environment.systemPackages = [ pkgs.fish ];
+
+    #users.defaultUserShell = mkDefault "/run/current-system/sw/bin/fish";
+
+    environment.shells =
+      [ "/run/current-system/sw/bin/fish"
+        "/var/run/current-system/sw/bin/fish"
+        "${pkgs.fish}/bin/fish"
+      ];
+
+  };
+
+}
+

From 5e6068d9136d98b48180c064efb9e779202de68e Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Thu, 8 Jan 2015 14:59:39 +0100
Subject: [PATCH 2/2] Put shell aliases in interactiveShellInit

---
 nixos/modules/programs/fish/fish.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nixos/modules/programs/fish/fish.nix b/nixos/modules/programs/fish/fish.nix
index 1903b431aee..7bbdd280a3b 100644
--- a/nixos/modules/programs/fish/fish.nix
+++ b/nixos/modules/programs/fish/fish.nix
@@ -10,6 +10,10 @@ cfge = config.environment;
 
 cfg = config.programs.fish;
 
+fishAliases = concatStringsSep "\n" (
+  mapAttrsFlatten (k: v: "alias ${k}='${v}'") cfg.shellAliases
+);
+
 in
 
 {
@@ -87,6 +91,8 @@ in
         ${cfge.interactiveShellInit}
 
         ${cfg.promptInit}
+
+        ${fishAliases}
       '';
 
     };