From ac7e9231048e76012961fbabf5a03adcb7c36470 Mon Sep 17 00:00:00 2001 From: Jakob Gillich Date: Fri, 25 Dec 2015 01:17:42 +0100 Subject: fish: add module to support it as default shell * Patched fish to load /etc/fish/config.fish if it exists (by default, it only loads config relative to itself) * Added fish-foreign-env package to parse the system environment closes #5331 --- nixos/modules/module-list.nix | 1 + nixos/modules/programs/fish.nix | 114 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 115 insertions(+) create mode 100644 nixos/modules/programs/fish.nix (limited to 'nixos/modules') diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 5c1cde98d3dc..c53485f6f65b 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -64,6 +64,7 @@ ./programs/dconf.nix ./programs/environment.nix ./programs/freetds.nix + ./programs/fish.nix ./programs/ibus.nix ./programs/kbdlight.nix ./programs/light.nix diff --git a/nixos/modules/programs/fish.nix b/nixos/modules/programs/fish.nix new file mode 100644 index 000000000000..b4259f7ec87d --- /dev/null +++ b/nixos/modules/programs/fish.nix @@ -0,0 +1,114 @@ +{ 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 = '' + Whether to configure fish as an interactive shell. + ''; + type = types.bool; + }; + + shellAliases = mkOption { + default = config.environment.shellAliases; + description = '' + Set of aliases for fish shell. See + for an option format description. + ''; + type = types.attrs; + }; + + 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 shell initialisation. + ''; + type = types.lines; + }; + + promptInit = mkOption { + default = ""; + description = '' + Shell script code used to initialise fish prompt. + ''; + type = types.lines; + }; + + }; + + }; + + config = mkIf cfg.enable { + + environment.etc."fish/foreign-env/shellInit".text = cfge.shellInit; + environment.etc."fish/foreign-env/loginShellInit".text = cfge.loginShellInit; + environment.etc."fish/foreign-env/interactiveShellInit".text = cfge.interactiveShellInit; + + environment.etc."fish/config.fish".text = '' + # /etc/fish/config.fish: DO NOT EDIT -- this file has been generated automatically. + + set fish_function_path $fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions + + fenv source ${config.system.build.setEnvironment} 1> /dev/null + fenv source /etc/fish/foreign-env/shellInit 1> /dev/null + + ${cfg.shellInit} + + if builtin status --is-login + fenv source /etc/fish/foreign-env/loginShellInit 1> /dev/null + ${cfg.loginShellInit} + end + + if builtin status --is-interactive + ${fishAliases} + fenv source /etc/fish/foreign-env/interactiveShellInit 1> /dev/null + ${cfg.interactiveShellInit} + end + ''; + + environment.systemPackages = [ pkgs.fish ]; + + environment.shells = [ + "/run/current-system/sw/bin/fish" + "/var/run/current-system/sw/bin/fish" + "${pkgs.fish}/bin/fish" + ]; + + }; + +} -- cgit 1.4.1