Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 9765afe2bd | |||
| f3476c7b47 |
+18
-18
@@ -551,7 +551,7 @@ in
|
|||||||
config = lib.mkIf enableProgram {
|
config = lib.mkIf enableProgram {
|
||||||
|
|
||||||
# --- Dendritic app definition ---
|
# --- Dendritic app definition ---
|
||||||
myApps.${programName} = {
|
mySystem.${programName} = {
|
||||||
enable = true;
|
enable = true;
|
||||||
assetsDir = programAssets;
|
assetsDir = programAssets;
|
||||||
files = files;
|
files = files;
|
||||||
@@ -565,7 +565,7 @@ in
|
|||||||
stylix = stylixCfg;
|
stylix = stylixCfg;
|
||||||
|
|
||||||
# --- Optional: wallpaper helper (kept dendritic) ---
|
# --- Optional: wallpaper helper (kept dendritic) ---
|
||||||
myApps.wallpaper = {
|
mySystem.wallpaper = {
|
||||||
enable = true;
|
enable = true;
|
||||||
packages = [ "feh" "st" ];
|
packages = [ "feh" "st" ];
|
||||||
};
|
};
|
||||||
@@ -685,7 +685,7 @@ in
|
|||||||
config = lib.mkIf enableProgram {
|
config = lib.mkIf enableProgram {
|
||||||
|
|
||||||
# --- Dendritic app definition ---
|
# --- Dendritic app definition ---
|
||||||
myApps.${programName} = {
|
mySystem.${programName} = {
|
||||||
enable = true;
|
enable = true;
|
||||||
assetsDir = programAssets;
|
assetsDir = programAssets;
|
||||||
files = files;
|
files = files;
|
||||||
@@ -755,8 +755,8 @@ in {
|
|||||||
|
|
||||||
# Wrap all configuration in mkIf(enable)
|
# Wrap all configuration in mkIf(enable)
|
||||||
config = lib.mkIf enableProgram {
|
config = lib.mkIf enableProgram {
|
||||||
# myApps container
|
# mySystem container
|
||||||
myApps = {
|
mySystem = {
|
||||||
${programName} = {
|
${programName} = {
|
||||||
enable = true;
|
enable = true;
|
||||||
assetsDir = programAssets;
|
assetsDir = programAssets;
|
||||||
@@ -794,8 +794,8 @@ in {
|
|||||||
|
|
||||||
config = lib.mkIf enableProgram {
|
config = lib.mkIf enableProgram {
|
||||||
|
|
||||||
# Place Flatpaks under myApps (do not declare nested options)
|
# Place Flatpaks under mySystem (do not declare nested options)
|
||||||
myApps = {
|
mySystem = {
|
||||||
flatpaks = {
|
flatpaks = {
|
||||||
enable = true;
|
enable = true;
|
||||||
user = username;
|
user = username;
|
||||||
@@ -933,8 +933,8 @@ in {
|
|||||||
|
|
||||||
# Wrap all actual configuration in mkIf(enableProgram)
|
# Wrap all actual configuration in mkIf(enableProgram)
|
||||||
config = lib.mkIf enableProgram {
|
config = lib.mkIf enableProgram {
|
||||||
# myApps container for dendritic structure
|
# mySystem container for dendritic structure
|
||||||
myApps = {
|
mySystem = {
|
||||||
${programName} = {
|
${programName} = {
|
||||||
enable = true;
|
enable = true;
|
||||||
user = config.defaultUser or defaultUser;
|
user = config.defaultUser or defaultUser;
|
||||||
@@ -999,7 +999,7 @@ in
|
|||||||
config = lib.mkIf enableProgram {
|
config = lib.mkIf enableProgram {
|
||||||
|
|
||||||
# --- Dendritic app definition ---
|
# --- Dendritic app definition ---
|
||||||
myApps.${programName} = {
|
mySystem.${programName} = {
|
||||||
enable = true;
|
enable = true;
|
||||||
assetsDir = programAssets;
|
assetsDir = programAssets;
|
||||||
files = files;
|
files = files;
|
||||||
@@ -1045,7 +1045,7 @@ let
|
|||||||
defaultUser = "henrov";
|
defaultUser = "henrov";
|
||||||
|
|
||||||
# Toggle variable pointing to the option
|
# Toggle variable pointing to the option
|
||||||
enableProgram = config.myApps.${programName}.enable or false;
|
enableProgram = config.mySystem.${programName}.enable or false;
|
||||||
|
|
||||||
# Package list for Thunar and plugins
|
# Package list for Thunar and plugins
|
||||||
thunarPkgs = with pkgs; [
|
thunarPkgs = with pkgs; [
|
||||||
@@ -1061,14 +1061,14 @@ let
|
|||||||
|
|
||||||
in {
|
in {
|
||||||
# Top-level toggle option
|
# Top-level toggle option
|
||||||
options.myApps.${programName}.enable =
|
options.mySystem.${programName}.enable =
|
||||||
lib.mkEnableOption "Enable Thunar file manager";
|
lib.mkEnableOption "Enable Thunar file manager";
|
||||||
|
|
||||||
# Wrap everything in mkIf(enable)
|
# Wrap everything in mkIf(enable)
|
||||||
config = lib.mkIf enableProgram {
|
config = lib.mkIf enableProgram {
|
||||||
|
|
||||||
# myApps container
|
# mySystem container
|
||||||
myApps = {
|
mySystem = {
|
||||||
${programName} = {
|
${programName} = {
|
||||||
enable = true;
|
enable = true;
|
||||||
packages = thunarPkgs;
|
packages = thunarPkgs;
|
||||||
@@ -1130,7 +1130,7 @@ in
|
|||||||
# --- Config ---
|
# --- Config ---
|
||||||
config = lib.mkIf enableProgram {
|
config = lib.mkIf enableProgram {
|
||||||
|
|
||||||
myApps.${programName} = {
|
mySystem.${programName} = {
|
||||||
enable = true;
|
enable = true;
|
||||||
assetsDir = programAssets;
|
assetsDir = programAssets;
|
||||||
files = files;
|
files = files;
|
||||||
@@ -1220,7 +1220,7 @@ in
|
|||||||
# Safe reference to defaultUser inside mkIf
|
# Safe reference to defaultUser inside mkIf
|
||||||
username = config.defaultUser or "henrov";
|
username = config.defaultUser or "henrov";
|
||||||
in lib.mkIf enableProgram {
|
in lib.mkIf enableProgram {
|
||||||
myApps = {
|
mySystem = {
|
||||||
zsh = {
|
zsh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
assetsDir = programAssets;
|
assetsDir = programAssets;
|
||||||
@@ -1898,8 +1898,8 @@ in
|
|||||||
|
|
||||||
# Everything in config is wrapped safely with mkIf
|
# Everything in config is wrapped safely with mkIf
|
||||||
config = lib.mkIf enableWofi {
|
config = lib.mkIf enableWofi {
|
||||||
# Use myApps as a container for all your programs
|
# Use mySystem as a container for all your programs
|
||||||
myApps = {
|
mySystem = {
|
||||||
wofi = {
|
wofi = {
|
||||||
enable = true;
|
enable = true;
|
||||||
assetsDir = wofiAssets;
|
assetsDir = wofiAssets;
|
||||||
|
|||||||
@@ -18,8 +18,8 @@ in {
|
|||||||
|
|
||||||
config = lib.mkIf enableProgram {
|
config = lib.mkIf enableProgram {
|
||||||
|
|
||||||
# Place Flatpaks under myApps (do not declare nested options)
|
# Place Flatpaks under mySystem (do not declare nested options)
|
||||||
myApps = {
|
mySystem = {
|
||||||
flatpaks = {
|
flatpaks = {
|
||||||
enable = true;
|
enable = true;
|
||||||
user = username;
|
user = username;
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ let
|
|||||||
defaultUser = "henrov";
|
defaultUser = "henrov";
|
||||||
|
|
||||||
# Toggle variable pointing to the option
|
# Toggle variable pointing to the option
|
||||||
enableProgram = config.myApps.${programName}.enable or false;
|
enableProgram = config.mySystem.${programName}.enable or false;
|
||||||
|
|
||||||
# Package list for Thunar and plugins
|
# Package list for Thunar and plugins
|
||||||
thunarPkgs = with pkgs; [
|
thunarPkgs = with pkgs; [
|
||||||
@@ -23,14 +23,14 @@ let
|
|||||||
|
|
||||||
in {
|
in {
|
||||||
# Top-level toggle option
|
# Top-level toggle option
|
||||||
options.myApps.${programName}.enable =
|
options.mySystem.${programName}.enable =
|
||||||
lib.mkEnableOption "Enable Thunar file manager";
|
lib.mkEnableOption "Enable Thunar file manager";
|
||||||
|
|
||||||
# Wrap everything in mkIf(enable)
|
# Wrap everything in mkIf(enable)
|
||||||
config = lib.mkIf enableProgram {
|
config = lib.mkIf enableProgram {
|
||||||
|
|
||||||
# myApps container
|
# mySystem container
|
||||||
myApps = {
|
mySystem = {
|
||||||
${programName} = {
|
${programName} = {
|
||||||
enable = true;
|
enable = true;
|
||||||
packages = thunarPkgs;
|
packages = thunarPkgs;
|
||||||
|
|||||||
@@ -21,8 +21,8 @@ in
|
|||||||
|
|
||||||
# Everything in config is wrapped safely with mkIf
|
# Everything in config is wrapped safely with mkIf
|
||||||
config = lib.mkIf enableWofi {
|
config = lib.mkIf enableWofi {
|
||||||
# Use myApps as a container for all your programs
|
# Use mySystem as a container for all your programs
|
||||||
myApps = {
|
mySystem = {
|
||||||
wofi = {
|
wofi = {
|
||||||
enable = true;
|
enable = true;
|
||||||
assetsDir = wofiAssets;
|
assetsDir = wofiAssets;
|
||||||
|
|||||||
@@ -19,8 +19,8 @@ in {
|
|||||||
|
|
||||||
# Wrap all configuration in mkIf(enable)
|
# Wrap all configuration in mkIf(enable)
|
||||||
config = lib.mkIf enableProgram {
|
config = lib.mkIf enableProgram {
|
||||||
# myApps container
|
# mySystem container
|
||||||
myApps = {
|
mySystem = {
|
||||||
${programName} = {
|
${programName} = {
|
||||||
enable = true;
|
enable = true;
|
||||||
assetsDir = programAssets;
|
assetsDir = programAssets;
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ in
|
|||||||
config = lib.mkIf enableProgram {
|
config = lib.mkIf enableProgram {
|
||||||
|
|
||||||
# --- Dendritic app definition ---
|
# --- Dendritic app definition ---
|
||||||
myApps.${programName} = {
|
mySystem.${programName} = {
|
||||||
enable = true;
|
enable = true;
|
||||||
assetsDir = programAssets;
|
assetsDir = programAssets;
|
||||||
files = files;
|
files = files;
|
||||||
|
|||||||
@@ -66,7 +66,7 @@ in
|
|||||||
config = lib.mkIf enableProgram {
|
config = lib.mkIf enableProgram {
|
||||||
|
|
||||||
# --- Dendritic app definition ---
|
# --- Dendritic app definition ---
|
||||||
myApps.${programName} = {
|
mySystem.${programName} = {
|
||||||
enable = true;
|
enable = true;
|
||||||
assetsDir = programAssets;
|
assetsDir = programAssets;
|
||||||
files = files;
|
files = files;
|
||||||
@@ -80,7 +80,7 @@ in
|
|||||||
stylix = stylixCfg;
|
stylix = stylixCfg;
|
||||||
|
|
||||||
# --- Optional: wallpaper helper (kept dendritic) ---
|
# --- Optional: wallpaper helper (kept dendritic) ---
|
||||||
myApps.wallpaper = {
|
mySystem.wallpaper = {
|
||||||
enable = true;
|
enable = true;
|
||||||
packages = [ "feh" "st" ];
|
packages = [ "feh" "st" ];
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -22,8 +22,8 @@ in {
|
|||||||
|
|
||||||
# Wrap all actual configuration in mkIf(enableProgram)
|
# Wrap all actual configuration in mkIf(enableProgram)
|
||||||
config = lib.mkIf enableProgram {
|
config = lib.mkIf enableProgram {
|
||||||
# myApps container for dendritic structure
|
# mySystem container for dendritic structure
|
||||||
myApps = {
|
mySystem = {
|
||||||
${programName} = {
|
${programName} = {
|
||||||
enable = true;
|
enable = true;
|
||||||
user = config.defaultUser or defaultUser;
|
user = config.defaultUser or defaultUser;
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ in
|
|||||||
config = lib.mkIf enableProgram {
|
config = lib.mkIf enableProgram {
|
||||||
|
|
||||||
# --- Dendritic app definition ---
|
# --- Dendritic app definition ---
|
||||||
myApps.${programName} = {
|
mySystem.${programName} = {
|
||||||
enable = true;
|
enable = true;
|
||||||
assetsDir = programAssets;
|
assetsDir = programAssets;
|
||||||
files = files;
|
files = files;
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ in
|
|||||||
# --- Config ---
|
# --- Config ---
|
||||||
config = lib.mkIf enableProgram {
|
config = lib.mkIf enableProgram {
|
||||||
|
|
||||||
myApps.${programName} = {
|
mySystem.${programName} = {
|
||||||
enable = true;
|
enable = true;
|
||||||
assetsDir = programAssets;
|
assetsDir = programAssets;
|
||||||
files = files;
|
files = files;
|
||||||
|
|||||||
Reference in New Issue
Block a user