Regenerated

This commit is contained in:
2026-03-19 14:38:10 +00:00
parent 04f53b9771
commit c0ab15f573
2 changed files with 60 additions and 50 deletions
+30 -25
View File
@@ -1035,28 +1035,28 @@ in
** =generated/modules/terminals/kitty.nix= ** =generated/modules/terminals/kitty.nix=
This file sets up Kitty terminal This file sets up Kitty terminal
#+BEGIN_SRC nix :tangle generated/modules/terminals/kitty.nix :noweb tangle :mkdirp yes :eval never-html #+BEGIN_SRC nix :tangle generated/modules/terminals/kitty.nix :noweb tangle :mkdirp yes :eval never-html
{ lib, config, pkgs, flakeRoot, ... }: { lib, config, flakeRoot, ... }:
let let
# --- Module metadata --- # --- Module-specific variables ---
moduleName = "kitty"; # Change per module moduleName = "kitty";
assetPath = "${flakeRoot}/assets/system/conf/${moduleName}"; # Path to kitty config username = config.defaultUser or "henrov";
username = config.defaultUser or "henrov"; # Use default user assetPath = "${flakeRoot}/assets/system/conf/${moduleName}";
enableProgram = config.enableKitty or true; # Toggle for this module
# Read asset files # Read all files in the asset directory
assetFiles = builtins.readDir assetPath; programFiles = builtins.readDir assetPath;
files = lib.genAttrs (builtins.attrNames programFiles) (name: {
# Map files → attrset
files = lib.genAttrs (builtins.attrNames assetFiles) (name: {
src = "${assetPath}/${name}"; src = "${assetPath}/${name}";
}); });
# Top-level enable toggle
enableProgram = config.enableKitty or true;
in in
{ {
# --- Top-level toggle option --- # --- Declare the top-level toggle for this module ---
options.enableKitty = lib.mkEnableOption "Enable Kitty terminal integration"; options.enableKitty = lib.mkEnableOption "Enable Kitty terminal integration";
# --- Apply configuration only if enabled --- # --- Actual configuration applied only if enabled ---
config = lib.mkIf enableProgram { config = lib.mkIf enableProgram {
# Dendritic container for this program # Dendritic container for this program
@@ -1066,21 +1066,22 @@ in
assetsDir = assetPath; assetsDir = assetPath;
files = files; files = files;
# Program-specific metadata # Example program-specific metadata
theme = "catppuccin-mocha"; theme = "Catppuccin-Mocha";
}; };
# Deploy config files to XDG config # Deploy config files to user's ~/.config
home-manager.users.${username} = { home-manager.users.${username} = {
programs.kitty.enable = true; programs.kitty.enable = true;
xdg.configFile = lib.mapAttrs' (name: value: { xdg.configFile =
name = "${moduleName}/${name}"; lib.mapAttrs' (name: value: {
value.source = value.src; name = "${moduleName}/${name}";
}) files; value.source = value.src;
}) files;
}; };
# Optional systemd service to sync Kitty config (example) # Optional: systemd service to sync / deploy configuration
systemd.services."${moduleName}-sync" = { systemd.services."${moduleName}-sync" = {
description = "Sync ${moduleName} configuration"; description = "Sync ${moduleName} configuration";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
@@ -1092,19 +1093,23 @@ in
ExecStart = '' ExecStart = ''
set -euo pipefail set -euo pipefail
CONF="${assetPath}" CONF="${assetPath}"
USER_HOME="/home/${username}"
# Sync each file (example logic) # Copy all asset files into user's config directory
for f in ${lib.concatStringsSep " " (builtins.attrNames files)}; do for f in ${lib.concatStringsSep " " (builtins.attrNames files)}; do
cp -u "$CONF/$f" "$USER_HOME/.config/${moduleName}/$f" cp -u "$CONF/$f" "$USER_HOME/.config/${moduleName}/$f"
done done
''; '';
}; };
# Restart service if assets change
restartTriggers = [ assetPath ]; restartTriggers = [ assetPath ];
# Use system-wide binaries without referencing pkgs directly # Minimal PATH for the service
path = [ path = [
"/run/current-system/sw/bin/coreutils" # Use symbolic references if needed, e.g., coreutils binaries
# pkgs.coreutils
# pkgs.gnugrep
]; ];
}; };
}; };
+30 -25
View File
@@ -1,25 +1,25 @@
{ lib, config, pkgs, flakeRoot, ... }: { lib, config, flakeRoot, ... }:
let let
# --- Module metadata --- # --- Module-specific variables ---
moduleName = "kitty"; # Change per module moduleName = "kitty";
assetPath = "${flakeRoot}/assets/system/conf/${moduleName}"; # Path to kitty config username = config.defaultUser or "henrov";
username = config.defaultUser or "henrov"; # Use default user assetPath = "${flakeRoot}/assets/system/conf/${moduleName}";
enableProgram = config.enableKitty or true; # Toggle for this module
# Read asset files # Read all files in the asset directory
assetFiles = builtins.readDir assetPath; programFiles = builtins.readDir assetPath;
files = lib.genAttrs (builtins.attrNames programFiles) (name: {
# Map files → attrset
files = lib.genAttrs (builtins.attrNames assetFiles) (name: {
src = "${assetPath}/${name}"; src = "${assetPath}/${name}";
}); });
# Top-level enable toggle
enableProgram = config.enableKitty or true;
in in
{ {
# --- Top-level toggle option --- # --- Declare the top-level toggle for this module ---
options.enableKitty = lib.mkEnableOption "Enable Kitty terminal integration"; options.enableKitty = lib.mkEnableOption "Enable Kitty terminal integration";
# --- Apply configuration only if enabled --- # --- Actual configuration applied only if enabled ---
config = lib.mkIf enableProgram { config = lib.mkIf enableProgram {
# Dendritic container for this program # Dendritic container for this program
@@ -29,21 +29,22 @@ in
assetsDir = assetPath; assetsDir = assetPath;
files = files; files = files;
# Program-specific metadata # Example program-specific metadata
theme = "catppuccin-mocha"; theme = "Catppuccin-Mocha";
}; };
# Deploy config files to XDG config # Deploy config files to user's ~/.config
home-manager.users.${username} = { home-manager.users.${username} = {
programs.kitty.enable = true; programs.kitty.enable = true;
xdg.configFile = lib.mapAttrs' (name: value: { xdg.configFile =
name = "${moduleName}/${name}"; lib.mapAttrs' (name: value: {
value.source = value.src; name = "${moduleName}/${name}";
}) files; value.source = value.src;
}) files;
}; };
# Optional systemd service to sync Kitty config (example) # Optional: systemd service to sync / deploy configuration
systemd.services."${moduleName}-sync" = { systemd.services."${moduleName}-sync" = {
description = "Sync ${moduleName} configuration"; description = "Sync ${moduleName} configuration";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
@@ -55,19 +56,23 @@ in
ExecStart = '' ExecStart = ''
set -euo pipefail set -euo pipefail
CONF="${assetPath}" CONF="${assetPath}"
USER_HOME="/home/${username}"
# Sync each file (example logic) # Copy all asset files into user's config directory
for f in ${lib.concatStringsSep " " (builtins.attrNames files)}; do for f in ${lib.concatStringsSep " " (builtins.attrNames files)}; do
cp -u "$CONF/$f" "$USER_HOME/.config/${moduleName}/$f" cp -u "$CONF/$f" "$USER_HOME/.config/${moduleName}/$f"
done done
''; '';
}; };
# Restart service if assets change
restartTriggers = [ assetPath ]; restartTriggers = [ assetPath ];
# Use system-wide binaries without referencing pkgs directly # Minimal PATH for the service
path = [ path = [
"/run/current-system/sw/bin/coreutils" # Use symbolic references if needed, e.g., coreutils binaries
# pkgs.coreutils
# pkgs.gnugrep
]; ];
}; };
}; };