henrov/nixos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Working on reshuffling

Browse Source
This commit is contained in:
Henro Veijer
2026-03-19 09:39:12 +00:00
parent f6d994a06f
commit 28e765f431
2 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Droidnix/README.org
+8 -9
View File
@@ -1358,25 +1358,24 @@ let
files = lib.genAttrs (builtins.attrNames zshFiles) (name: { files = lib.genAttrs (builtins.attrNames zshFiles) (name: {
src = "${zshAssets}/${name}"; src = "${zshAssets}/${name}";
}); });
# Enable toggle for this program
enableProgram = true;
in in
{ {
# Top-level toggle for this program # Top-level toggle for this program
options.enableZsh = options.enableZsh =
lib.mkEnableOption "Enable Zsh terminal with Oh-My-Zsh"; lib.mkEnableOption "Enable Zsh terminal with Oh-My-Zsh";
# Configuration applied only if enabled # Wrap everything in config only if enabled
config = lib.mkIf enableProgram { config = lib.mkIf (config.enableZsh or false) (let
# Safe reference to defaultUser inside the mkIf
username = config.defaultUser or "henrov";
in
{
myApps = { myApps = {
zsh = { zsh = {
enable = true; enable = true;
assetsDir = zshAssets; assetsDir = zshAssets;
files = files; files = files;
user = username;
# Reference default user
user = config.defaultUser or "henrov";
# Zsh-specific settings # Zsh-specific settings
ohMyZsh = { ohMyZsh = {
@@ -1423,7 +1422,7 @@ in
''; '';
}; };
}; };
}; ));
} }
#+END_SRC #+END_SRC
Droidnix/generated/modules/terminals/zsh.nix
+8 -9
View File
@@ -8,25 +8,24 @@ let
files = lib.genAttrs (builtins.attrNames zshFiles) (name: { files = lib.genAttrs (builtins.attrNames zshFiles) (name: {
src = "${zshAssets}/${name}"; src = "${zshAssets}/${name}";
}); });
# Enable toggle for this program
enableProgram = true;
in in
{ {
# Top-level toggle for this program # Top-level toggle for this program
options.enableZsh = options.enableZsh =
lib.mkEnableOption "Enable Zsh terminal with Oh-My-Zsh"; lib.mkEnableOption "Enable Zsh terminal with Oh-My-Zsh";
# Configuration applied only if enabled # Wrap everything in config only if enabled
config = lib.mkIf enableProgram { config = lib.mkIf (config.enableZsh or false) (let
# Safe reference to defaultUser inside the mkIf
username = config.defaultUser or "henrov";
in
{
myApps = { myApps = {
zsh = { zsh = {
enable = true; enable = true;
assetsDir = zshAssets; assetsDir = zshAssets;
files = files; files = files;
user = username;
# Reference default user
user = config.defaultUser or "henrov";
# Zsh-specific settings # Zsh-specific settings
ohMyZsh = { ohMyZsh = {
@@ -73,5 +72,5 @@ in
''; '';
}; };
}; };
}; ));
} }