diff --git a/config/bash/bashrc b/config/bash/bashrc index 70f7b66..d30c8a3 100644 --- a/config/bash/bashrc +++ b/config/bash/bashrc @@ -15,6 +15,11 @@ export THEME="${THEME:-midnight}" export FZF_COMPLETION_TRIGGER=';' export FZF_TMUX=1 +eval "$(fzf --bash)" +eval "$(zoxide init bash)" +eval "$(direnv hook bash)" +eval "$(starship init bash)" + fzf-config-widget() { local file file="$(FZF_CTRL_T_COMMAND="fd --type file --hidden . \"$XDG_CONFIG_HOME\"/nix | sed \"s|$HOME|~|g\"" fzf --reverse)" || return diff --git a/home/modules/shell.nix b/home/modules/shell.nix index 312ac67..776d82f 100644 --- a/home/modules/shell.nix +++ b/home/modules/shell.nix @@ -192,7 +192,7 @@ in } ''; - programs.bash = { + programs.bash = lib.mkIf (!hostConfig.isNixOS) { enable = true; shellAliases = { ls = "eza"; @@ -211,7 +211,7 @@ in programs.starship = { enable = true; - enableBashIntegration = true; + enableBashIntegration = false; settings = { format = lib.concatStrings [ "$directory" @@ -257,7 +257,7 @@ in programs.fzf = { enable = true; - enableBashIntegration = true; + enableBashIntegration = false; defaultCommand = "rg --files --hidden"; defaultOptions = [ "--bind=ctrl-a:select-all" @@ -273,18 +273,18 @@ in programs.eza = { enable = true; - enableBashIntegration = true; + enableBashIntegration = false; git = true; }; programs.zoxide = { enable = true; - enableBashIntegration = true; + enableBashIntegration = false; }; programs.direnv = { enable = true; - enableBashIntegration = true; + enableBashIntegration = false; nix-direnv.enable = true; config.global = { hide_env_diff = true; diff --git a/hosts/xps15/configuration.nix b/hosts/xps15/configuration.nix index c123915..f978db5 100644 --- a/hosts/xps15/configuration.nix +++ b/hosts/xps15/configuration.nix @@ -84,7 +84,24 @@ in shell = pkgs.bash; }; - programs.bash.enable = true; + programs.bash = { + enable = true; + shellAliases = { + ls = "eza"; + l = "ls --color=auto --group-directories-first"; + ll = "l -alF"; + la = "ll -R"; + g = "git"; + nv = "nvim"; + }; + shellInit = '' + export INPUTRC="$HOME/.config/nix/config/bash/inputrc" + export THEME="midnight" + ''; + interactiveShellInit = '' + [ -f "$HOME/.config/nix/config/bash/bashrc" ] && . "$HOME/.config/nix/config/bash/bashrc" + ''; + }; programs.hyprland = { enable = true; portalPackage = pkgs.xdg-desktop-portal-hyprland;