feat: add User module (closes #46) #47

Merged

yorunikakeru merged 14 commits from feature/issue-46-users into main 2026-06-22 21:08:37 +02:00

Conversation 0 Commits 14 Files changed 45 +518 -211

yorunikakeru commented 2026-06-22 18:11:33 +02:00

Owner

Copy link

What

Adds User module so configs can declare system users:

User.user "alice" $ do
    User.isNormalUser True
    User.description "primary user"
    User.extraGroups ["networkmanager", "wheel", "docker"]
    User.packages ["steam", "wine"]

Changes

IR (frogos-ir — pushed to main, flake.lock updated):

• IRDocument gains irUsers :: [UserConfig]; JSON key "users" (omitted when empty)
• Schema version bumped to 7

DSL (this branch):

• User module: UserBuilder, user, isNormalUser, description, extraGroups, packages
• Builder.Config: addUserConfig, csUsers in ConfigState, wired into configuration
• Validate.Types: DuplicateUserName Text constructor in ValidationError
• Validate.Users: duplicateUserError — rejects configs with duplicate usernames
• 9 new tests (143 total, all passing)

Verification

• stan — clean
• cabal test — 143/143 pass
• nix flake check — all checks pass

Closes #46

## What Adds `User` module so configs can declare system users: ```haskell User.user "alice" $ do User.isNormalUser True User.description "primary user" User.extraGroups ["networkmanager", "wheel", "docker"] User.packages ["steam", "wine"] ``` ## Changes **IR** (`frogos-ir` — pushed to main, flake.lock updated): - `IRDocument` gains `irUsers :: [UserConfig]`; JSON key `"users"` (omitted when empty) - Schema version bumped to 7 **DSL** (this branch): - `User` module: `UserBuilder`, `user`, `isNormalUser`, `description`, `extraGroups`, `packages` - `Builder.Config`: `addUserConfig`, `csUsers` in `ConfigState`, wired into `configuration` - `Validate.Types`: `DuplicateUserName Text` constructor in `ValidationError` - `Validate.Users`: `duplicateUserError` — rejects configs with duplicate usernames - 9 new tests (143 total, all passing) ## Verification - `stan` — clean - `cabal test` — 143/143 pass - `nix flake check` — all checks pass Closes #46

yorunikakeru added 5 commits 2026-06-22 18:11:33 +02:00

chore: update IR to v7 (irUsers), fix IRDocument construction sites 1bfe1b24e2

feat: plumb csUsers through ConfigState and expose addUserConfig 0c307b2c91

feat: add User module builder (issue #46) e42224eb1a

feat: validate duplicate usernames 2a6607c94a

docs: update CHANGELOG for User module (closes #46) 9a07322d3a

yorunikakeru added 1 commit 2026-06-22 19:08:40 +02:00

style: formatted 9c8eaf8fa8

yorunikakeru added 2 commits 2026-06-22 19:37:16 +02:00

feat: add Users example to app and fixtures e254ffccfb

refactor(builder): unify policy accumulation via PolicyAccum ... 061c841fef

Each module builder was calling policiesFromPortSpecs per port,
producing duplicate allow_ports policies instead of one merged set.
PolicyAccum collects PortSpecs (for dedup) and raw Policies, then
finalizes both once at build time.

yorunikakeru added 1 commit 2026-06-22 19:39:05 +02:00

style: formetted 17034e4599

yorunikakeru added 1 commit 2026-06-22 19:53:21 +02:00

refactor(builder): drop PolicyAccum, use IR types directly in builders ... d1c5590429

NginxVHostState duplicated NginxVirtualHost — removed in favour of
StateT NginxVirtualHost. Forgejo and PostgreSQL builders already used
their IR configs directly; pattern is now uniform across all modules.

Policy deduplication was dropped: each port call appends its own
allow_ports entry. No runtime exists yet to require merged policies.

yorunikakeru added 1 commit 2026-06-22 20:35:40 +02:00

feat(network): separate allow_ports from module policies, add global irNetwork ... 966ffe5b49

- Network.allowPorts: now ConfigBuilder (), writes to IRDocument.irNetwork
  (global, document-level) instead of profilePolicies
- Network.Policy: remove AllowPorts branch from policiesFromPortSpecs;
  only Fallback policies remain (generated by withFallback in module builders)
- Builder.Types.ConfigState: add csNetwork :: NetworkConfig
- Builder.Config: propagate csNetwork to IRDocument.irNetwork
- flake.lock: update frogos-ir to IR v8 (NetworkConfig, no AllowPorts)
- Tests and golden fixtures updated accordingly

yorunikakeru added 1 commit 2026-06-22 21:02:11 +02:00

feat: state-mutating actions carry priority ... 1d69b35073

RestartModule and SetPowerProfile now carry an Int priority, matching
the EnableModule/DisableModule pattern. Plain DSL forms (restart,
setPowerProfile) default to 100; withPriority variants allow explicit
control.

Conflict detection extended: restart vs disable on the same module is
now an intra- and inter-profile conflict (restart implies running,
disable implies not). Two SetPowerProfile actions in the same profile
or across profiles at equal priority are also validation errors.

IR bumped to version 9; all golden fixtures updated.

yorunikakeru added 1 commit 2026-06-22 21:05:12 +02:00

style: formatted 5292baa702

yorunikakeru added 1 commit 2026-06-22 21:06:37 +02:00

choire: flake update aa72e4cba1

yorunikakeru merged commit 9b089c49c4 into main 2026-06-22 21:08:37 +02:00

yorunikakeru referenced this pull request from a commit 2026-06-22 21:08:38 +02:00

Merge pull request 'feat: add User module (closes #46)' (#47) from feature/issue-46-users into main

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No labels

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

FrogOS/DSL!47

No description provided.