diff --git a/README.md b/README.md index 689355f..ad4b6b0 100644 --- a/README.md +++ b/README.md @@ -73,14 +73,40 @@ This module: 4. Commit and push changes 5. Update inventory.nix with new commit hash +## Important Notes + +### Avoiding Configuration Conflicts + +External modules should generally **not** override settings that are already defined by the host type modules (like `nix-lxc`). The host type already configures: +- SSH settings +- Basic services +- Networking + +Your external module should focus on: +- Application-specific packages +- Custom services unique to your application +- Application configuration files + +If you need to override host type settings, use `lib.mkForce`: + +```nix +services.openssh.settings.PermitRootLogin = lib.mkForce "no"; +``` + ## Deployment After updating the configuration: ```bash cd /path/to/nixos-systems -# Update the rev in inventory.nix -nix flake lock --update-input usda-dash-config # If using flake input -# Or just update the rev in the fetchGit call +# Update the rev in inventory.nix to the new commit hash +# Nix will automatically fetch the new version +nix flake check # Verify the configuration ./deploy usda-dash ``` + +To force Nix to re-fetch (if you've updated the same commit): +```bash +rm -rf ~/.cache/nix/gitv3/* +nix flake check --refresh +``` diff --git a/default.nix b/default.nix index feea9e2..fc6424a 100644 --- a/default.nix +++ b/default.nix @@ -40,8 +40,8 @@ # services.openssh.settings.PermitRootLogin = lib.mkForce "no"; # Configure users (these will be added via inventory.nix extraUsers) - # ugaif.users.sv22900.enable = true; - # ugaif.users.hdh20267.enable = true; + ugaif.users.sv22900.enable = true; + ugaif.users.hdh20267.enable = true; # Dashboard-specific services could go here # Example: