From 9f9cb0cf9416de5327da4c33b4ff91aa6a834315 Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Tue, 25 Jul 2023 00:34:17 +0200 Subject: [PATCH] =?UTF-8?q?fish=20a=20sa=20place=20=C3=A0=20c=C3=B4t=C3=A9?= =?UTF-8?q?=20de=20bash?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- applications/terminal/default-applications.nix | 1 - configuration/environment.nix | 11 +++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/applications/terminal/default-applications.nix b/applications/terminal/default-applications.nix index 1f377a4..dbcb276 100644 --- a/applications/terminal/default-applications.nix +++ b/applications/terminal/default-applications.nix @@ -37,7 +37,6 @@ mkIf true { delta # visionneur de différences ]; programs = { - fish.enable = true; gnupg.agent.enable = true; git = { enable = true; diff --git a/configuration/environment.nix b/configuration/environment.nix index 8cc100b..3140568 100644 --- a/configuration/environment.nix +++ b/configuration/environment.nix @@ -44,10 +44,13 @@ in byobu-adminsys = "/etc/nixos/base/byobu-adminsys"; }; }; - programs.bash = { - enableCompletion = true; - promptInit = builtins.readFile ./bash-prompt.sh; - interactiveShellInit = builtins.readFile ./bash-interactive-init.sh; + programs = { + fish.enable = true; + bash = { + enableCompletion = true; + promptInit = builtins.readFile ./bash-prompt.sh; + interactiveShellInit = builtins.readFile ./bash-interactive-init.sh; + }; }; # https://wiki.mozilla.org/Security/Guidelines/OpenSSH#Modern