plumjam/nixos - Change O5SNUGP5YLA6TCHW4VS66GKHBK7UZMCU4LVIAAZEDD2YDV6UAUTQC

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

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

Created by PlumJam on February 7, 2026

O5SNUGP5YLA6TCHW4VS66GKHBK7UZMCU4LVIAAZEDD2YDV6UAUTQC

Dependencies

In channels

main

Change contents

File deletion: modules.nix

BF:BFD[8.2] → [9.1574:1609]

BF:BFD[9.1609] → [9.213:213]

B:BD[9.213] → [9.214:342]

∅:D[10.239] → [9.342:422]

B:BD[9.342] → [9.342:422]

B:BD[9.439] → [9.439:659]

B:BD[9.676] → [9.676:710]

∅:D[10.257] → [9.710:1007]

B:BD[9.710] → [9.710:1007]

B:BD[9.1026] → [9.1026:1092]

B:BD[9.1118] → [9.1118:1135]

B:BD[9.1190] → [9.1190:1219]

∅:D[10.267] → [9.1219:1298]

B:BD[9.1219] → [9.1219:1298]

B:BD[9.1352] → [9.1352:1405]

B:BD[9.1459] → [9.1459:1514]

B:BD[9.1571] → [9.1571:1573]

B:BD[9.1219] → [10.258:267]

B:BD[9.710] → [10.240:257]

B:BD[9.342] → [10.213:239]

{ inputs, ... }:
let
  commonModules.imports = with inputs.self.modules.nixos; [
    disable-nano
    disable-nix-documentation
    dynamic-binaries
    hjem
    keys
    lib
    locale
    netrc
    network
    openssh
    packages
    rebuild
    secret-manager
    system
    tailscale
    theme
    unfree
    users
    virtualisation
    yubikey
  ];
  desktopModules.imports = with inputs.self.modules.nixos; [
    audio
    desktop-gui
    desktop-tools
    gammastep
    graphics
    hardware-desktop
    jujutsu-extra
    keyboard
    linux-kernel-zen
    mouse
    packages-extra-desktop
    power-menu
    process-management
    quickshell
    rust-desktop
    scratchpads
    sudo-desktop
    theme-extra-fonts
    theme-extra-scripts
    waybar
  ];
  serverModules.imports = with inputs.self.modules.nixos; [
    linux-kernel
    prometheus-node-exporter
    sudo-server
  ];
in
{
  flake.modules.nixos.commonModules = commonModules;
  flake.modules.nixos.serverModules = serverModules;
  flake.modules.nixos.desktopModules = desktopModules;
}
    rust
    disks-normal
    disks-extra-zram-swap

Deletion in modules/hosts.nix at line 4 [12.110]
∅:D[2.1618] → [11.470:508]
B:BD[11.470] → [11.470:508]
```
  specialArgs = { inherit inputs; };
```
Insertion in modules/hosts.nix at line 25 [12.110]
[13.2198]
[12.130]
```
  # Yuzu | desktop | x86_64-linux | NixOS
```
Replacement in modules/hosts.nix at line 27 [12.110]
B:BD[12.193] → [11.2781:2806]
```
    inherit specialArgs;
```
[12.193]
[12.1089]
```
    specialArgs = { inherit inputs; };
```
Replacement in modules/hosts.nix at line 30 [12.110]
∅:D[9.1667] → [11.2859:2879]
B:BD[11.2859] → [11.2859:2879]
B:BD[11.2879] → [9.1668:1689]
```
      commonModules
      desktopModules
```
[9.1667]
[12.1501]
```
      aspectsBase
```
Insertion in modules/hosts.nix at line 34 [12.110]
[14.252]
[15.228]
```
      audio
```
Replacement in modules/hosts.nix at line 38 [12.110]
B:BD[16.246] → [6.228:247]
```
      disable-nano
```
[16.246]
[16.246]
```
      desktop-tools
```
Insertion in modules/hosts.nix at line 41 [12.110]
[16.282]
[9.1709]
```
      disks-normal
```
Replacement in modules/hosts.nix at line 43 [12.110]
B:BD[9.1732] → [17.1502:1512]
```
      env
```
[9.1732]
[9.1760]
```
      disks-extra-zram-swap
```
Replacement in modules/hosts.nix at line 46 [12.110]
B:BD[14.269] → [4.13508:13518]
∅:D[14.269] → [18.225:237]
∅:D[4.13518] → [18.225:237]
B:BD[17.1525] → [18.225:237]
```
      git
      helix
```
[14.269]
[18.237]
```
      graphics
      hardware-desktop
```
Insertion in modules/hosts.nix at line 50 [12.110]
[19.3049]
[19.3049]
```
      jujutsu-extra
```
Insertion in modules/hosts.nix at line 52 [12.110]
[19.3061]
[19.3061]
```
      linux-kernel-zen
```
Deletion in modules/hosts.nix at line 54 [12.110]
B:BD[19.3074] → [20.2483:2503]
```
      notifications
```
Replacement in modules/hosts.nix at line 55 [12.110]
∅:D[20.2503] → [21.1826:1857]
∅:D[19.3074] → [21.1826:1857]
∅:D[5.19456] → [21.1826:1857]
B:BD[18.255] → [21.1826:1857]
B:BD[21.1857] → [7.2887:2906]
```
      # nix-distributed-builds
      nix-settings
```
[5.19456]
[7.2906]
```
      notifications
```

Replacement in modules/hosts.nix at line 58 [12.110]

B:BD[9.1793] → [21.1858:1872]

∅:D[21.1872] → [17.1526:1540]

B:BD[9.1793] → [17.1526:1540]

      openssh
      jujutsu

[9.1793]

[6.248]

      packages-extra-linux
      packages-extra-gui
      packages-extra-cli
      peripherals
      power-menu
      process-management
      quickshell
      rust-desktop

Replacement in modules/hosts.nix at line 67 [12.110]
∅:D[6.262] → [22.14249:14279]
B:BD[17.1540] → [22.14249:14279]
B:BD[22.14279] → [21.1873:1883]
```
      shell
      shell-tools
      ssh
```
[6.262]
[4.13519]
```
      sudo-extra-desktop
      theme-extra-fonts
      theme-extra-scripts
```
Insertion in modules/hosts.nix at line 91 [12.110]
[23.600]
[23.630]
```
  # Date | laptop/server | x86_64-linux | NixOS
```
Replacement in modules/hosts.nix at line 93 [12.110]
B:BD[23.693] → [11.3293:3318]
```
    inherit specialArgs;
```
[23.693]
[23.1913]
```
    specialArgs = { inherit inputs; };
```
Replacement in modules/hosts.nix at line 96 [12.110]
∅:D[9.2204] → [11.3371:3391]
B:BD[11.3371] → [11.3371:3391]
B:BD[11.3391] → [9.2205:2226]
```
      commonModules
      desktopModules
```
[9.2204]
[24.306]
```
      aspectsBase
```

Insertion in modules/hosts.nix at line 98 [12.110]

[24.307]

[10.327]

      ai
      ai-extra
      app-launcher
      audio

Insertion in modules/hosts.nix at line 103 [12.110]

[10.346]

[9.2274]

      desktop-gui
      desktop-tools
      discord-gui
      discord-tui
      disks-normal
      disks-extra-swap
      disks-extra-zram-swap

Replacement in modules/hosts.nix at line 111 [12.110]

B:BD[9.2302] → [9.2302:2331]

      nix-distributed-builds

[9.2302]

[9.2331]

      games
      gammastep
      graphics
      hardware-desktop
      helix-extra
      hyprlock
      jujutsu-extra
      kitty
      linux-kernel-zen
      mprocs
      niri
      notifications
      nix-settings-extra-desktop

Insertion in modules/hosts.nix at line 125 [12.110]
[9.2361]
[9.2361]
```
      nix-distributed-builds
```

Insertion in modules/hosts.nix at line 127 [12.110]

[9.2382]

      packages-extra-linux
      packages-extra-gui
      packages-extra-cli
      peripherals
      power-menu
      process-management
      quickshell
      rust-desktop
      rss-tui
      sudo-extra-desktop
      theme-extra-fonts
      theme-extra-scripts
      waybar
      yazi
      zellij

Insertion in modules/hosts.nix at line 173 [12.110]
[25.2597]
[25.2597]
```
  # Pear | WSL | x86_64-linux | NixOS-WSL
```
Replacement in modules/hosts.nix at line 175 [12.110]
B:BD[25.2660] → [11.3791:3816]
```
    inherit specialArgs;
```
[25.2660]
[25.3479]
```
    specialArgs = { inherit inputs; };
```
Replacement in modules/hosts.nix at line 178 [12.110]
∅:D[9.3244] → [11.3869:3889]
B:BD[11.3869] → [11.3869:3889]
```
      commonModules
```
[9.3244]
[25.3798]
```
      aspectsBase
```
Deletion in modules/hosts.nix at line 183 [12.110]
B:BD[9.3329] → [9.3329:3358]
```
      packages-extra-desktop
```
Replacement in modules/hosts.nix at line 186 [12.110]
∅:D[10.429] → [9.3377:3414]
B:BD[9.3377] → [9.3377:3414]
```
      scratchpads
      sudo-desktop
```
[10.429]
[9.3414]
```
      sudo-extra-desktop
```
Insertion in modules/hosts.nix at line 203 [12.110]
[25.4551]
[26.716]
```
  # Plum | server | x86_64-linux | NixOS
```
Replacement in modules/hosts.nix at line 205 [12.110]
B:BD[26.779] → [11.4375:4400]
```
    inherit specialArgs;
```
[26.779]
[26.1561]
```
    specialArgs = { inherit inputs; };
```
Replacement in modules/hosts.nix at line 208 [12.110]
∅:D[9.3852] → [11.4453:4473]
B:BD[11.4453] → [11.4453:4473]
B:BD[11.4473] → [9.3853:3873]
```
      commonModules
      serverModules
```
[9.3852]
[12.2001]
```
      aspectsBase
```
Insertion in modules/hosts.nix at line 215 [12.110]
[9.3961]
[10.430]
```
      freshrss-server
```
Insertion in modules/hosts.nix at line 218 [12.110]
[9.3979]
[9.3979]
```
      linux-kernel-latest
```

Replacement in modules/hosts.nix at line 224 [12.110]

B:BD[27.237] → [3.1758:1780]

      freshrss-server

[27.237]

[9.4023]

      prometheus-node-exporter
      rust
      sudo-extra-server

Insertion in modules/hosts.nix at line 278 [12.110]
[28.1984]
[28.1984]
```
  # Kiwi | server | x86_64-linux | NixOS
```
Replacement in modules/hosts.nix at line 280 [12.110]
B:BD[28.2047] → [11.5465:5490]
```
    inherit specialArgs;
```
[28.2047]
[29.2110]
```
    specialArgs = { inherit inputs; };
```
Replacement in modules/hosts.nix at line 283 [12.110]
∅:D[9.5531] → [11.5543:5563]
B:BD[11.5543] → [11.5543:5563]
B:BD[11.5563] → [9.5532:5552]
```
      commonModules
      serverModules
```
[9.5531]
[28.3359]
```
      aspectsBase
```
Insertion in modules/hosts.nix at line 289 [12.110]
[10.547]
[9.5626]
```
      linux-kernel-latest
```

Insertion in modules/hosts.nix at line 294 [12.110]

[9.5659]

[9.5670]

      prometheus-node-exporter
      rust
      sudo-extra-server

Insertion in modules/hosts.nix at line 324 [12.110]
[30.6381]
[30.6381]
```
  # Sloe | server | x86_64-linux | NixOS
```
Replacement in modules/hosts.nix at line 326 [12.110]
B:BD[30.6444] → [30.6444:6469]
```
    inherit specialArgs;
```
[30.6444]
[30.6469]
```
    specialArgs = { inherit inputs; };
```
Replacement in modules/hosts.nix at line 329 [12.110]
∅:D[9.6510] → [30.6522:6542]
B:BD[30.6522] → [30.6522:6542]
B:BD[30.6542] → [9.6511:6531]
```
      commonModules
      serverModules
```
[9.6510]
[30.6751]
```
      aspectsBase
```
Insertion in modules/hosts.nix at line 334 [12.110]
[10.636]
[10.636]
```
      linux-kernel-latest
```

Insertion in modules/hosts.nix at line 338 [12.110]

[9.6615]

[9.6626]

      prometheus-node-exporter
      rust
      sudo-extra-server

Insertion in modules/hosts.nix at line 360 [12.110]
[31.6773]
[31.6773]
```
  # Blackwell | server | x86_64-linux | NixOS
```
Replacement in modules/hosts.nix at line 362 [12.110]
B:BD[31.6841] → [11.6513:6538]
```
    inherit specialArgs;
```
[31.6841]
[28.4325]
```
    specialArgs = { inherit inputs; };
```
Replacement in modules/hosts.nix at line 365 [12.110]
∅:D[9.7198] → [11.6591:6611]
B:BD[11.6591] → [11.6591:6611]
B:BD[11.6611] → [9.7199:7219]
```
      commonModules
      serverModules
```
[9.7198]
[31.8106]
```
      aspectsBase
```
Insertion in modules/hosts.nix at line 370 [12.110]
[10.724]
[10.724]
```
      linux-kernel-latest
```

Insertion in modules/hosts.nix at line 374 [12.110]

[9.7303]

[9.7314]

      prometheus-node-exporter
      rust
      sudo-extra-server

Insertion in modules/hosts.nix at line 394 [12.110]
[31.9144]
[12.2102]
```
  # Lime | Macbook | x86_64-linux | nix-darwin
```
Replacement in modules/hosts.nix at line 396 [12.110]
B:BD[12.2174] → [11.7244:7269]
```
    inherit specialArgs;
```
[12.2174]
[12.2244]
```
    specialArgs = { inherit inputs; };
```
Insertion in modules/hosts.nix at line 399 [12.110]
[12.2294]
[12.2294]
```
      aspectsBase
```
Deletion in modules/hosts.nix at line 402 [12.110]
B:BD[12.2313] → [32.326:358]
∅:D[32.358] → [12.2313:2335]
B:BD[12.2313] → [12.2313:2335]
B:BD[12.2335] → [33.6708:6718]
∅:D[33.6718] → [12.2335:2363]
B:BD[12.2335] → [12.2335:2363]
∅:D[34.11614] → [12.2363:2378]
B:BD[12.2363] → [12.2363:2378]
```
      disable-nix-documentation
      hjem
      keys
      lib
      network
      openssh
      packages
```
Deletion in modules/hosts.nix at line 403 [12.110]
B:BD[12.2397] → [12.2397:2429]
B:BD[12.2429] → [29.2295:2308]
∅:D[29.2308] → [12.2448:2464]
B:BD[12.2448] → [12.2448:2464]
B:BD[12.2464] → [33.6719:6731]
∅:D[33.6731] → [12.2464:2489]
B:BD[12.2464] → [12.2464:2489]
```
      secret-manager
      sudo
      system
      tailscale
      theme
      unfree
      users
```

File addition: aspects.nix (----------)

[8.2]

{ inputs, ... }:
let
  modulesBaseLinux.imports = with inputs.self.modules.nixos; [
    disable-nano
    disable-nix-documentation
    disks-extra-zram-swap
    dynamic-binaries
    git
    env
    helix
    hjem
    jujutsu
    keys
    lib
    locale
    netrc
    network
    nix-settings
    openssh
    packages
    rebuild
    secret-manager
    shell
    shell-tools
    sudo
    ssh
    system
    tailscale
    theme
    unfree
    users
    virtualisation
    yubikey
  ];
  modulesBaseDarwin.imports = with inputs.self.modules.darwin; [
    disable-nix-documentation
    git
    env
    helix
    hjem
    jujutsu
    keys
    lib
    network
    nix-settings
    openssh
    packages
    secret-manager
    shell
    shell-tools
    sudo
    ssh
    system
    tailscale
    theme
    unfree
    users
  ];
in
{
  flake.modules.nixos.modulesBase = modulesBaseLinux;
  flake.modules.darwin.modulesBase = modulesBaseDarwin;
}

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

Dependencies

In channels

Change contents

File deletion: modules.nix

Deletion in modules/hosts.nix at line 4 [12.110]

Insertion in modules/hosts.nix at line 25 [12.110]

Replacement in modules/hosts.nix at line 27 [12.110]

Replacement in modules/hosts.nix at line 30 [12.110]

Insertion in modules/hosts.nix at line 34 [12.110]

Replacement in modules/hosts.nix at line 38 [12.110]

Insertion in modules/hosts.nix at line 41 [12.110]

Replacement in modules/hosts.nix at line 43 [12.110]

Replacement in modules/hosts.nix at line 46 [12.110]

Insertion in modules/hosts.nix at line 50 [12.110]

Insertion in modules/hosts.nix at line 52 [12.110]

Deletion in modules/hosts.nix at line 54 [12.110]

Replacement in modules/hosts.nix at line 55 [12.110]

Replacement in modules/hosts.nix at line 58 [12.110]

Replacement in modules/hosts.nix at line 67 [12.110]

Insertion in modules/hosts.nix at line 91 [12.110]

Replacement in modules/hosts.nix at line 93 [12.110]

Replacement in modules/hosts.nix at line 96 [12.110]

Insertion in modules/hosts.nix at line 98 [12.110]

Insertion in modules/hosts.nix at line 103 [12.110]

Replacement in modules/hosts.nix at line 111 [12.110]

Insertion in modules/hosts.nix at line 125 [12.110]

Insertion in modules/hosts.nix at line 127 [12.110]

Insertion in modules/hosts.nix at line 173 [12.110]

Replacement in modules/hosts.nix at line 175 [12.110]

Replacement in modules/hosts.nix at line 178 [12.110]

Deletion in modules/hosts.nix at line 183 [12.110]

Replacement in modules/hosts.nix at line 186 [12.110]

Insertion in modules/hosts.nix at line 203 [12.110]

Replacement in modules/hosts.nix at line 205 [12.110]

Replacement in modules/hosts.nix at line 208 [12.110]

Insertion in modules/hosts.nix at line 215 [12.110]

Insertion in modules/hosts.nix at line 218 [12.110]

Replacement in modules/hosts.nix at line 224 [12.110]

Insertion in modules/hosts.nix at line 278 [12.110]

Replacement in modules/hosts.nix at line 280 [12.110]

Replacement in modules/hosts.nix at line 283 [12.110]

Insertion in modules/hosts.nix at line 289 [12.110]

Insertion in modules/hosts.nix at line 294 [12.110]

Insertion in modules/hosts.nix at line 324 [12.110]

Replacement in modules/hosts.nix at line 326 [12.110]

Replacement in modules/hosts.nix at line 329 [12.110]

Insertion in modules/hosts.nix at line 334 [12.110]

Insertion in modules/hosts.nix at line 338 [12.110]

Insertion in modules/hosts.nix at line 360 [12.110]

Replacement in modules/hosts.nix at line 362 [12.110]

Replacement in modules/hosts.nix at line 365 [12.110]

Insertion in modules/hosts.nix at line 370 [12.110]

Insertion in modules/hosts.nix at line 374 [12.110]

Insertion in modules/hosts.nix at line 394 [12.110]

Replacement in modules/hosts.nix at line 396 [12.110]

Insertion in modules/hosts.nix at line 399 [12.110]

Deletion in modules/hosts.nix at line 402 [12.110]

Deletion in modules/hosts.nix at line 403 [12.110]

File addition: aspects.nix (----------)