From a8c727b880d1802cad8b41c7fbb77d89ac0a1116 Mon Sep 17 00:00:00 2001 From: Zynh Ludwig Date: Wed, 29 May 2024 16:03:39 -0700 Subject: [PATCH] relocate bash config --- configuration.nix | 9 --------- home/modules/fish.nix | 12 +++++++++++- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/configuration.nix b/configuration.nix index f3f0f0d..602b895 100644 --- a/configuration.nix +++ b/configuration.nix @@ -138,15 +138,6 @@ # Allow unfree packages nixpkgs.config.allowUnfree = true; - programs.bash = { - interactiveShellInit = '' - if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]] - then - shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION="" - exec ${pkgs.fish}/bin/fish $LOGIN_OPTION - fi - ''; - }; # programs.hyprland.enable = true; # environment.sessionVariables.NIXOS_OZONE_WL = "1"; diff --git a/home/modules/fish.nix b/home/modules/fish.nix index 89d22f3..3b45935 100644 --- a/home/modules/fish.nix +++ b/home/modules/fish.nix @@ -1,5 +1,15 @@ -{ inputs, ... }: +{ inputs, pkgs, ... }: { + programs.bash = { + interactiveShellInit = '' + if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]] + then + shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION="" + exec ${pkgs.fish}/bin/fish $LOGIN_OPTION + fi + ''; + }; + programs.fish = { enable = true; interactiveShellInit =