Remove hjem class #3

Merged

PlumJam merged 29 commits from remove-hjem-class into master 2026-02-07 22:53:59 +01:00

Conversation 0 Commits 29 Files changed 40 +2951 -2775

PlumJam commented 2026-02-07 22:50:28 +01:00

Owner

Copy link

Move instances flake.modules.hjem to flake.modules.{nixos,darwin} = { hjem.extraModules = ... }.

Removes to need for specialArgs and makes things a lot cleaner/easier to manage because there's one less class and less conditionals.

Move instances `flake.modules.hjem` to `flake.modules.{nixos,darwin} = { hjem.extraModules = ... }`. Removes to need for `specialArgs` and makes things a lot cleaner/easier to manage because there's one less class and less conditionals.

PlumJam added 29 commits 2026-02-07 22:50:28 +01:00

{jujutsu,env}: Begin moving modules away from hjem class. ... 6d4f98877c

Instead we can use `hjem.extraModules` inside the nixos/darwin classes.

It's much cleaner and allows us to remove a lot of conditional configs
because usually all hjem configs are given to all hosts.

rss: Add tui configs and move to nixos/darwin classes. f21d972bfd

{ghostty,kitty,rio}: Move to nixos/darwin classes. febc00e919

editor: Move to nixos/darwin classes. fb6dbe3ef1

shell: Move to nixos/darwin classes. 1f7f386edb

ssh: Move to nixos/darwin classes. dae0c2ccac

secrets: Add missing rss secret. 17ab3af2a5

{hyprlock,mprocs,yazi}: Move to nixos/darwin classes. 7dd07ba869

notifications: Move to nixos/darwin classes. fe69537513

app-launcher: Move to nixos/darwin classes. 238a05ba4c

{desktop-gui,discord}: Move to nixos/darwin classes. b3cac9753a

{ai,gammastep}: Move to nixos/darwin classes. 2aadb85b04

{git,status-bar}: Move to nixos/darwin classes. 2f97419e83

{zellij,window-manager}: Move to nixos/darwin classes. b2d6d51c8c

wsl-backup: Move to nixos/darwin classes. 6702df7294

home: Remove specialArgs and collected modules. ... 077f98a644

Finally I don't need specialArgs...

Still need to update all existing hosts to use the new system.

hosts.yuzu: Add previously missed modules. 7dd2a2c5c8

nix-settings: Split modules for system types. c156924c1a

theme: Better module organisation. 03b7aaf4e8

home: Rename file to hjem. 178d678a67

rss: Fix newsboat config and secret permissions. 0502c33265

peripherals: Clean up and configure properly per-class. b1c5435e16

sudo: Clean up and configure properly per-class. f19c4d8e99

desktop-tools: Move scratchpads to desktop-tools module. 4ab372a8ee

packages: Clean up and use packages via hjem. 908ceb8c87

linux-kernel: Rename aspect for clarity. de96f143e9

{hosts,aspects}: Clean up and adjust how aspects are used. ... f375b32cc5

Also renamed the modules.nix file to aspects.nix to better reflect its
purpose.

docs: Update README. d03db6d880

aspects: Fix broken aspect names after renaming from modules. c965cf76dc

PlumJam self-assigned this 2026-02-07 22:50:45 +01:00

PlumJam changed title from Remove Hjem class to Remove hjem class 2026-02-07 22:53:50 +01:00

PlumJam merged commit 456ceb65e5 into master 2026-02-07 22:53:59 +01:00

PlumJam deleted branch remove-hjem-class 2026-02-07 22:53:59 +01:00

PlumJam referenced this pull request from a commit 2026-02-07 22:54:00 +01:00

Merge pull request 'Remove hjem class' (#3) from remove-hjem-class into master

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

PlumJam

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

PlumJam/nixos!3

No description provided.