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:43:16 +00:00
parent 28e765f431
commit b42074314b
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Droidnix/README.org
+9 -9
View File
@@ -1351,12 +1351,12 @@ This sets up the zsh in the terminal
{ lib, ... }: { lib, ... }:
let let
# --- Program-specific values --- # --- Program-specific paths/assets ---
programName = "zsh"; programName = "zsh";
zshAssets = ../../../assets/system/conf/${programName}; programAssets = ../../../assets/system/conf/${programName};
zshFiles = builtins.readDir zshAssets; programFiles = builtins.readDir programAssets;
files = lib.genAttrs (builtins.attrNames zshFiles) (name: { files = lib.genAttrs (builtins.attrNames programFiles) (name: {
src = "${zshAssets}/${name}"; src = "${programAssets}/${name}";
}); });
in in
{ {
@@ -1364,16 +1364,16 @@ in
options.enableZsh = options.enableZsh =
lib.mkEnableOption "Enable Zsh terminal with Oh-My-Zsh"; lib.mkEnableOption "Enable Zsh terminal with Oh-My-Zsh";
# Wrap everything in config only if enabled # Wrap everything in config if enabled
config = lib.mkIf (config.enableZsh or false) (let config = lib.mkIf (config.enableZsh or false) (let
# Safe reference to defaultUser inside the mkIf # Safe reference to defaultUser inside mkIf
username = config.defaultUser or "henrov"; username = config.defaultUser or "henrov";
in in
{ {
myApps = { myApps = {
zsh = { zsh = {
enable = true; enable = true;
assetsDir = zshAssets; assetsDir = programAssets;
files = files; files = files;
user = username; user = username;
@@ -1422,7 +1422,7 @@ in
''; '';
}; };
}; };
)); });
} }
#+END_SRC #+END_SRC
Droidnix/generated/modules/terminals/zsh.nix
+9 -9
View File
@@ -1,12 +1,12 @@
{ lib, ... }: { lib, ... }:
let let
# --- Program-specific values --- # --- Program-specific paths/assets ---
programName = "zsh"; programName = "zsh";
zshAssets = ../../../assets/system/conf/${programName}; programAssets = ../../../assets/system/conf/${programName};
zshFiles = builtins.readDir zshAssets; programFiles = builtins.readDir programAssets;
files = lib.genAttrs (builtins.attrNames zshFiles) (name: { files = lib.genAttrs (builtins.attrNames programFiles) (name: {
src = "${zshAssets}/${name}"; src = "${programAssets}/${name}";
}); });
in in
{ {
@@ -14,16 +14,16 @@ in
options.enableZsh = options.enableZsh =
lib.mkEnableOption "Enable Zsh terminal with Oh-My-Zsh"; lib.mkEnableOption "Enable Zsh terminal with Oh-My-Zsh";
# Wrap everything in config only if enabled # Wrap everything in config if enabled
config = lib.mkIf (config.enableZsh or false) (let config = lib.mkIf (config.enableZsh or false) (let
# Safe reference to defaultUser inside the mkIf # Safe reference to defaultUser inside mkIf
username = config.defaultUser or "henrov"; username = config.defaultUser or "henrov";
in in
{ {
myApps = { myApps = {
zsh = { zsh = {
enable = true; enable = true;
assetsDir = zshAssets; assetsDir = programAssets;
files = files; files = files;
user = username; user = username;
@@ -72,5 +72,5 @@ in
''; '';
}; };
}; };
)); });
} }