From cb7b026b369f51501fe733034c43609d3ef61683 Mon Sep 17 00:00:00 2001 From: "info@data-pro.nu" Date: Thu, 19 Mar 2026 07:17:39 +0000 Subject: [PATCH] Working on reshuffling --- Droidnix/README.org | 5 +++-- Droidnix/generated/modules/terminals/zsh.nix | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Droidnix/README.org b/Droidnix/README.org index 09f35740c..84406a75f 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -1316,7 +1316,8 @@ in options.mySystem.terminals.zsh.enable = lib.mkEnableOption "Enable Zsh terminal with Oh-My-Zsh"; - config = lib.mkIf (config.mySystem.terminals.zsh.enable or false) { + # Use `config` only inside a `config = { ... }` block of the module + config = lib.mkIf (lib.getOption config.mySystem.terminals.zsh.enable) { home-manager.users.${username} = { programs.zsh.enable = true; programs.zsh.enableCompletion = true; @@ -1336,7 +1337,7 @@ in }; programs.zsh.initExtra = '' - # Catppuccin Mocha kleuren + # Catppuccin Mocha colors local mocha_base="#1E1E2E" local mocha_surface0="#313244" local mocha_text="#CDD6F4" diff --git a/Droidnix/generated/modules/terminals/zsh.nix b/Droidnix/generated/modules/terminals/zsh.nix index 88f8cb1d3..df533eff9 100644 --- a/Droidnix/generated/modules/terminals/zsh.nix +++ b/Droidnix/generated/modules/terminals/zsh.nix @@ -7,7 +7,8 @@ in options.mySystem.terminals.zsh.enable = lib.mkEnableOption "Enable Zsh terminal with Oh-My-Zsh"; - config = lib.mkIf (config.mySystem.terminals.zsh.enable or false) { + # Use `config` only inside a `config = { ... }` block of the module + config = lib.mkIf (lib.getOption config.mySystem.terminals.zsh.enable) { home-manager.users.${username} = { programs.zsh.enable = true; programs.zsh.enableCompletion = true; @@ -27,7 +28,7 @@ in }; programs.zsh.initExtra = '' - # Catppuccin Mocha kleuren + # Catppuccin Mocha colors local mocha_base="#1E1E2E" local mocha_surface0="#313244" local mocha_text="#CDD6F4"