Regenerated

This commit is contained in:
2026-03-30 13:51:15 +00:00
parent fc58ff9d89
commit 103782c27a
3 changed files with 348 additions and 297 deletions
+308 -291
View File
File diff suppressed because it is too large Load Diff
+20 -3
View File
@@ -1141,19 +1141,23 @@ in
** =generated/modules/traveldroid/apps/zsh.nix= ** =generated/modules/traveldroid/apps/zsh.nix=
This sets up the zsh in the terminal This sets up the zsh in the terminal
#+BEGIN_SRC nix :tangle generated/modules/traveldroid/apps/zsh.nix :noweb yes :mkdirp yes :eval never #+BEGIN_SRC nix :tangle generated/modules/traveldroid/apps/zsh.nix :noweb yes :mkdirp yes :eval never
{ lib, pkgs, flakeRoot, ... }: { lib, config, pkgs, flakeRoot, ... }:
let let
# Path to generated zshrc (optional per-user tweaks) # Default username fallback
username = config.defaultUser or "henrov";
# Path to optional per-user generated zshrc
generatedZsh = "${flakeRoot}/generated/.config/zsh/.zshrc"; generatedZsh = "${flakeRoot}/generated/.config/zsh/.zshrc";
in in
{ {
################################# #################################
# Install Zsh and Oh My Zsh system-wide # Install Zsh, Oh My Zsh, and Starship system-wide
################################# #################################
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
zsh zsh
oh-my-zsh oh-my-zsh
starship
]; ];
################################# #################################
@@ -1178,6 +1182,19 @@ in
# Initialize Starship prompt # Initialize Starship prompt
eval "$(starship init zsh)" eval "$(starship init zsh)"
''; '';
#################################
# Set Zsh as default login shell for the user via Home Manager
#################################
home-manager.users = {
${username} = {
programs.zsh.enable = true;
programs.zsh.loginShell = true;
# Optional: include the generated zshrc if you want
home.file.".config/zsh/.zshrc".source = generatedZsh;
};
};
} }
#+END_SRC #+END_SRC
@@ -1,16 +1,20 @@
{ lib, pkgs, flakeRoot, ... }: { lib, config, pkgs, flakeRoot, ... }:
let let
# Path to generated zshrc (optional per-user tweaks) # Default username fallback
username = config.defaultUser or "henrov";
# Path to optional per-user generated zshrc
generatedZsh = "${flakeRoot}/generated/.config/zsh/.zshrc"; generatedZsh = "${flakeRoot}/generated/.config/zsh/.zshrc";
in in
{ {
################################# #################################
# Install Zsh and Oh My Zsh system-wide # Install Zsh, Oh My Zsh, and Starship system-wide
################################# #################################
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
zsh zsh
oh-my-zsh oh-my-zsh
starship
]; ];
################################# #################################
@@ -35,4 +39,17 @@ in
# Initialize Starship prompt # Initialize Starship prompt
eval "$(starship init zsh)" eval "$(starship init zsh)"
''; '';
#################################
# Set Zsh as default login shell for the user via Home Manager
#################################
home-manager.users = {
${username} = {
programs.zsh.enable = true;
programs.zsh.loginShell = true;
# Optional: include the generated zshrc if you want
home.file.".config/zsh/.zshrc".source = generatedZsh;
};
};
} }