From ef56ccc664bb540eb3dc8aa8fdb1bae685611ff1 Mon Sep 17 00:00:00 2001 From: "info@data-pro.nu" Date: Thu, 26 Mar 2026 19:34:44 +0000 Subject: [PATCH] Regenerated --- Droidnix/README.org | 68 +++++++++++-------- .../modules/traveldroid/apps/zsh.nix | 68 +++++++++++-------- 2 files changed, 78 insertions(+), 58 deletions(-) diff --git a/Droidnix/README.org b/Droidnix/README.org index d43ecb81c..e8aebdb5b 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -1111,42 +1111,52 @@ in ** =generated/modules/traveldroid/apps/zsh.nix= 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 -{ config, pkgs, lib, ... }: +{ config, pkgs, lib, flakeRoot, ... }: let - generatedZsh = "${config.home.file.".config/zsh/.zshrc".source}"; + username = config.users.users.defaultUser or "henrov"; + generatedZsh = "${flakeRoot}/generated/.config/zsh/.zshrc"; in { - programs.zsh = { - enable = true; - enableCompletion = true; + ################################# + # Home Manager Zsh configuration + ################################# - ohMyZsh = { - enable = true; - theme = ""; - plugins = [ - "git" - "sudo" - "extract" - "colored-man-pages" - "command-not-found" - "history" - "docker" - "kubectl" - ]; + _module.args.hmUsers = { + ${username} = { + programs.zsh = { + enable = true; + enableCompletion = true; + # autocd = true; + + ohMyZsh = { + enable = true; + theme = ""; + plugins = [ + "git" + "sudo" + "extract" + "colored-man-pages" + "command-not-found" + "history" + "docker" + "kubectl" + ]; + }; + + autosuggestions.enable = true; + syntaxHighlighting.enable = true; + }; + + # Use ~/.config/zsh as ZDOTDIR + home.sessionVariables = { + ZDOTDIR = "${config.home.homeDirectory}/.config/zsh"; + }; + + # Deploy the generated .zshrc + home.file.".config/zsh/.zshrc".source = generatedZsh; }; - - autosuggestions.enable = true; - syntaxHighlighting.enable = true; }; - - # Set ZDOTDIR globally in the user environment - home.sessionVariables = { - ZDOTDIR = "${config.home.homeDirectory}/.config/zsh"; - }; - - # Place the generated .zshrc file there - home.file.".config/zsh/.zshrc".source = generatedZsh; } #+END_SRC diff --git a/Droidnix/generated/modules/traveldroid/apps/zsh.nix b/Droidnix/generated/modules/traveldroid/apps/zsh.nix index 35f0befec..0312b96d3 100644 --- a/Droidnix/generated/modules/traveldroid/apps/zsh.nix +++ b/Droidnix/generated/modules/traveldroid/apps/zsh.nix @@ -1,37 +1,47 @@ -{ config, pkgs, lib, ... }: +{ config, pkgs, lib, flakeRoot, ... }: let - generatedZsh = "${config.home.file.".config/zsh/.zshrc".source}"; + username = config.users.users.defaultUser or "henrov"; + generatedZsh = "${flakeRoot}/generated/.config/zsh/.zshrc"; in { - programs.zsh = { - enable = true; - enableCompletion = true; + ################################# + # Home Manager Zsh configuration + ################################# - ohMyZsh = { - enable = true; - theme = ""; - plugins = [ - "git" - "sudo" - "extract" - "colored-man-pages" - "command-not-found" - "history" - "docker" - "kubectl" - ]; + _module.args.hmUsers = { + ${username} = { + programs.zsh = { + enable = true; + enableCompletion = true; + # autocd = true; + + ohMyZsh = { + enable = true; + theme = ""; + plugins = [ + "git" + "sudo" + "extract" + "colored-man-pages" + "command-not-found" + "history" + "docker" + "kubectl" + ]; + }; + + autosuggestions.enable = true; + syntaxHighlighting.enable = true; + }; + + # Use ~/.config/zsh as ZDOTDIR + home.sessionVariables = { + ZDOTDIR = "${config.home.homeDirectory}/.config/zsh"; + }; + + # Deploy the generated .zshrc + home.file.".config/zsh/.zshrc".source = generatedZsh; }; - - autosuggestions.enable = true; - syntaxHighlighting.enable = true; }; - - # Set ZDOTDIR globally in the user environment - home.sessionVariables = { - ZDOTDIR = "${config.home.homeDirectory}/.config/zsh"; - }; - - # Place the generated .zshrc file there - home.file.".config/zsh/.zshrc".source = generatedZsh; }