From 3b7ed586c61591ddef6148ec424e9ff09b1f5655 Mon Sep 17 00:00:00 2001 From: kenji Date: Tue, 23 Dec 2025 19:12:09 +0000 Subject: [PATCH] added zoxide --- apps/zoxide/home.nix | 8 ++++++++ hosts/hakase/configuration.nix | 12 +++++++++++- modules/home/terminal.nix | 1 + 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 apps/zoxide/home.nix diff --git a/apps/zoxide/home.nix b/apps/zoxide/home.nix new file mode 100644 index 0000000..1187df4 --- /dev/null +++ b/apps/zoxide/home.nix @@ -0,0 +1,8 @@ +{ + programs.zoxide = { + enable = true; + enableFishIntegration = true; + enableZshIntegration = true; + enableBashIntegration = true; + }; +} diff --git a/hosts/hakase/configuration.nix b/hosts/hakase/configuration.nix index 0f9df47..a7ace97 100644 --- a/hosts/hakase/configuration.nix +++ b/hosts/hakase/configuration.nix @@ -8,5 +8,15 @@ ../../modules/system/default.nix ]; - programs.ssh.extraConfig = myConfig.ssh.extraConfig; + programs = { + ssh.extraConfig = myConfig.ssh.extraConfig; + 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 + ''; + zsh.enable = true; + fish.enable = true; + }; } diff --git a/modules/home/terminal.nix b/modules/home/terminal.nix index bbf7487..741acc7 100644 --- a/modules/home/terminal.nix +++ b/modules/home/terminal.nix @@ -2,5 +2,6 @@ imports = [ ../../apps/neovim/neovim.nix ../../apps/git/home.nix + ../../apps/zoxide/home.nix ]; }