barrett/nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix

Browse source
This commit is contained in:
Barrett Ruth 2026-02-18 12:43:32 -05:00
parent 9c1fc433e4
commit 1100b92625
Signed by: barrett
GPG key ID: A6C96C9349D2FC81
3 changed files with 29 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
config/bash/bashrc
View file

@ -15,6 +15,11 @@ export THEME="${THEME:-midnight}"
export FZF_COMPLETION_TRIGGER=';' export FZF_COMPLETION_TRIGGER=';'
export FZF_TMUX=1 export FZF_TMUX=1
eval "$(fzf --bash)"
eval "$(zoxide init bash)"
eval "$(direnv hook bash)"
eval "$(starship init bash)"
fzf-config-widget() { fzf-config-widget() {
local file local file
file="$(FZF_CTRL_T_COMMAND="fd --type file --hidden . \"$XDG_CONFIG_HOME\"/nix | sed \"s|$HOME|~|g\"" fzf --reverse)" || return file="$(FZF_CTRL_T_COMMAND="fd --type file --hidden . \"$XDG_CONFIG_HOME\"/nix | sed \"s|$HOME|~|g\"" fzf --reverse)" || return

12
home/modules/shell.nix
View file

@ -192,7 +192,7 @@ in
} }
''; '';
programs.bash = { programs.bash = lib.mkIf (!hostConfig.isNixOS) {
enable = true; enable = true;
shellAliases = { shellAliases = {
ls = "eza"; ls = "eza";
@ -211,7 +211,7 @@ in
programs.starship = { programs.starship = {
enable = true; enable = true;
enableBashIntegration = true; enableBashIntegration = false;
settings = { settings = {
format = lib.concatStrings [ format = lib.concatStrings [
"$directory" "$directory"
@ -257,7 +257,7 @@ in
programs.fzf = { programs.fzf = {
enable = true; enable = true;
enableBashIntegration = true; enableBashIntegration = false;
defaultCommand = "rg --files --hidden"; defaultCommand = "rg --files --hidden";
defaultOptions = [ defaultOptions = [
"--bind=ctrl-a:select-all" "--bind=ctrl-a:select-all"
@ -273,18 +273,18 @@ in
programs.eza = { programs.eza = {
enable = true; enable = true;
enableBashIntegration = true; enableBashIntegration = false;
git = true; git = true;
}; };
programs.zoxide = { programs.zoxide = {
enable = true; enable = true;
enableBashIntegration = true; enableBashIntegration = false;
}; };
programs.direnv = { programs.direnv = {
enable = true; enable = true;
enableBashIntegration = true; enableBashIntegration = false;
nix-direnv.enable = true; nix-direnv.enable = true;
config.global = { config.global = {
hide_env_diff = true; hide_env_diff = true;

19
hosts/xps15/configuration.nix
View file

@ -84,7 +84,24 @@ in
shell = pkgs.bash; 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 = { programs.hyprland = {
enable = true; enable = true;
portalPackage = pkgs.xdg-desktop-portal-hyprland; portalPackage = pkgs.xdg-desktop-portal-hyprland;