Trying shell adaptations

This commit is contained in:
2026-02-25 21:01:48 +01:00
parent 2806236f6f
commit b9ca93531f
2 changed files with 7 additions and 13 deletions
+5 -11
View File
@@ -2205,7 +2205,7 @@ The aliases mentioned in ./assets/conf/dev/terminal/shells.conf will be added to
# shells.nix — Home-Manager module # shells.nix — Home-Manager module
# #
# Reads: # Reads:
# ${flakeRoot}/assets/conf/dev/terminal/enabled_shells.conf # ${flakeRoot}/assets/conf/shells.nixdev/terminal/enabled_shells.conf
# ${flakeRoot}/assets/conf/dev/terminal/aliases.conf # ${flakeRoot}/assets/conf/dev/terminal/aliases.conf
# #
# For each enabled shell in [enabled_shells]: # For each enabled shell in [enabled_shells]:
@@ -2293,7 +2293,6 @@ let
zshSeed = '' zshSeed = ''
# Created once from: ${toString aliasesFile} # Created once from: ${toString aliasesFile}
# Edit freely; Home Manager will not overwrite this file. # Edit freely; Home Manager will not overwrite this file.
#
${secText "bash_zsh"} ${secText "bash_zsh"}
${secText "zsh_specific"} ${secText "zsh_specific"}
''; '';
@@ -2329,10 +2328,8 @@ let
# Created once from: ${toString aliasesFile} # Created once from: ${toString aliasesFile}
# Edit freely; Home Manager will not overwrite this file. # Edit freely; Home Manager will not overwrite this file.
status is-interactive; or exit status is-interactive; or exit
# Translated from [bash_zsh]: # Translated from [bash_zsh]:
${fishTranslated} ${fishTranslated}
# From [fish_specific]: # From [fish_specific]:
${secText "fish_specific"} ${secText "fish_specific"}
''; '';
@@ -2373,7 +2370,6 @@ in
# Create/remove alias files based on enabled shells # Create/remove alias files based on enabled shells
home.activation.shellAliasesFiles = lib.hm.dag.entryAfter [ "writeBoundary" ] '' home.activation.shellAliasesFiles = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
set -euo pipefail set -euo pipefail
# bash ------------------------------------------------------- # bash -------------------------------------------------------
if ${if shellEnabled "bash" then "true" else "false"}; then if ${if shellEnabled "bash" then "true" else "false"}; then
cat > "${bashAliasesPath}" <<'EOF' cat > "${bashAliasesPath}" <<'EOF'
@@ -2382,16 +2378,14 @@ EOF
else else
rm -f "${bashAliasesPath}" rm -f "${bashAliasesPath}"
fi fi
# zsh ------------------------------------------------------- # zsh -------------------------------------------------------
if ${if shellEnabled "zsh" then "true" else "false"}; then if ${if shellEnabled "zsh" then "true" else "false"}; then
cat > "${zshAliasesPath}" <<'EOF' cat > "${zshAliasesPath}" <<'EOF'
${zshSeed} ${zshSeed}
EOF EOF
else else
rm -f "${zshAliasesPath}" rm -f "${zshAliasesPath}"
fi fi
# fish ------------------------------------------------------- # fish -------------------------------------------------------
if ${if shellEnabled "fish" then "true" else "false"}; then if ${if shellEnabled "fish" then "true" else "false"}; then
mkdir -p "$(dirname "${fishAliasesPath}")" mkdir -p "$(dirname "${fishAliasesPath}")"
@@ -2445,8 +2439,8 @@ in
"docker" "docker"
"kubectl" "kubectl"
# IMPORTANT: these should be last # IMPORTANT: these should be last
"zsh-autosuggestions" # "zsh-autosuggestions"
"zsh-syntax-highlighting" # "zsh-syntax-highlighting"
]; ];
}; };
''; '';
@@ -2796,7 +2790,7 @@ Now starts the main emacs configuration.
(use-package nerd-icons (use-package nerd-icons
:custom :custom
;; disable bright icon colors ;; disable bright icon colors
(nerd-icons-color-icons nil)) (nerd-icons-color-icons nil))hells.nix
(use-package doom-modeline (use-package doom-modeline
:custom :custom
+2 -2
View File
@@ -24,8 +24,8 @@ in
"docker" "docker"
"kubectl" "kubectl"
# IMPORTANT: these should be last # IMPORTANT: these should be last
"zsh-autosuggestions" #"zsh-autosuggestions"
"zsh-syntax-highlighting" #"zsh-syntax-highlighting"
]; ];
}; };
''; '';