fix
This commit is contained in:
parent
9c1fc433e4
commit
1100b92625
3 changed files with 29 additions and 7 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue