summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorLuca Bruno <lethalman88@gmail.com>2015-02-11 18:31:11 +0100
committerLuca Bruno <lethalman88@gmail.com>2015-02-11 18:31:11 +0100
commite088fd0314967855f14f01bd33c99e63ed5dfe51 (patch)
tree792233f6243156cc2cc37e07b8fe496183025f3e /nixos
parentc427b48ba699217b635e4f7ec961526d0a4a48ad (diff)
downloadnixpkgs-e088fd0314967855f14f01bd33c99e63ed5dfe51.tar
nixpkgs-e088fd0314967855f14f01bd33c99e63ed5dfe51.tar.gz
nixpkgs-e088fd0314967855f14f01bd33c99e63ed5dfe51.tar.bz2
nixpkgs-e088fd0314967855f14f01bd33c99e63ed5dfe51.tar.lz
nixpkgs-e088fd0314967855f14f01bd33c99e63ed5dfe51.tar.xz
nixpkgs-e088fd0314967855f14f01bd33c99e63ed5dfe51.tar.zst
nixpkgs-e088fd0314967855f14f01bd33c99e63ed5dfe51.zip
Revert "Merge pull request #5626 from matthiasbeyer/add-fish_shell_module"
This reverts commit 157d199b33bee85aeeb256e84abf55523539eaa0, reversing
changes made to 4c7adddcb7ae435cdecceeb627dca22ae581ca09.
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/programs/fish/fish.nix115
1 files changed, 0 insertions, 115 deletions
diff --git a/nixos/modules/programs/fish/fish.nix b/nixos/modules/programs/fish/fish.nix
deleted file mode 100644
index 7bbdd280a3b..00000000000
--- a/nixos/modules/programs/fish/fish.nix
+++ /dev/null
@@ -1,115 +0,0 @@
-# This module defines global configuration for the fish.
-
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
-cfge = config.environment;
-
-cfg = config.programs.fish;
-
-fishAliases = concatStringsSep "\n" (
-  mapAttrsFlatten (k: v: "alias ${k}='${v}'") cfg.shellAliases
-);
-
-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}
-
-        ${fishAliases}
-      '';
-
-    };
-
-    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"
-      ];
-
-  };
-
-}
-