Regenerated

This commit is contained in:
2026-03-26 19:34:44 +00:00
parent e3b9fcf360
commit ef56ccc664
2 changed files with 78 additions and 58 deletions
+14 -4
View File
@@ -1111,15 +1111,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 tangle :mkdirp yes :eval never-html #+BEGIN_SRC nix :tangle generated/modules/traveldroid/apps/zsh.nix :noweb tangle :mkdirp yes :eval never-html
{ config, pkgs, lib, ... }: { config, pkgs, lib, flakeRoot, ... }:
let let
generatedZsh = "${config.home.file.".config/zsh/.zshrc".source}"; username = config.users.users.defaultUser or "henrov";
generatedZsh = "${flakeRoot}/generated/.config/zsh/.zshrc";
in in
{ {
#################################
# Home Manager Zsh configuration
#################################
_module.args.hmUsers = {
${username} = {
programs.zsh = { programs.zsh = {
enable = true; enable = true;
enableCompletion = true; enableCompletion = true;
# autocd = true;
ohMyZsh = { ohMyZsh = {
enable = true; enable = true;
@@ -1140,13 +1148,15 @@ in
syntaxHighlighting.enable = true; syntaxHighlighting.enable = true;
}; };
# Set ZDOTDIR globally in the user environment # Use ~/.config/zsh as ZDOTDIR
home.sessionVariables = { home.sessionVariables = {
ZDOTDIR = "${config.home.homeDirectory}/.config/zsh"; ZDOTDIR = "${config.home.homeDirectory}/.config/zsh";
}; };
# Place the generated .zshrc file there # Deploy the generated .zshrc
home.file.".config/zsh/.zshrc".source = generatedZsh; home.file.".config/zsh/.zshrc".source = generatedZsh;
};
};
} }
#+END_SRC #+END_SRC
@@ -1,12 +1,20 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, flakeRoot, ... }:
let let
generatedZsh = "${config.home.file.".config/zsh/.zshrc".source}"; username = config.users.users.defaultUser or "henrov";
generatedZsh = "${flakeRoot}/generated/.config/zsh/.zshrc";
in in
{ {
#################################
# Home Manager Zsh configuration
#################################
_module.args.hmUsers = {
${username} = {
programs.zsh = { programs.zsh = {
enable = true; enable = true;
enableCompletion = true; enableCompletion = true;
# autocd = true;
ohMyZsh = { ohMyZsh = {
enable = true; enable = true;
@@ -27,11 +35,13 @@ in
syntaxHighlighting.enable = true; syntaxHighlighting.enable = true;
}; };
# Set ZDOTDIR globally in the user environment # Use ~/.config/zsh as ZDOTDIR
home.sessionVariables = { home.sessionVariables = {
ZDOTDIR = "${config.home.homeDirectory}/.config/zsh"; ZDOTDIR = "${config.home.homeDirectory}/.config/zsh";
}; };
# Place the generated .zshrc file there # Deploy the generated .zshrc
home.file.".config/zsh/.zshrc".source = generatedZsh; home.file.".config/zsh/.zshrc".source = generatedZsh;
};
};
} }