plumjam/nixos - Change FREUCXPWPGLUZQSHQ7YXBTDFFJ5ORT43FM7V3SZXA64C4HYU6QKQC

{hosts,lib}: Move mkConfig to flake level.

Created by PlumJam on February 3, 2026

FREUCXPWPGLUZQSHQ7YXBTDFFJ5ORT43FM7V3SZXA64C4HYU6QKQC

Dependencies

In channels

main

Change contents

Insertion in modules/lib.nix at line 121 [3.151]

[3.1080]

[4.2954]

  flake.mkConfig =
    inputs: host: platform: type: rest:
    let
      lib = inputs.os.lib;
      inherit (lib) mkMerge;
      inherit (lib.attrsets) optionalAttrs;
    in
    mkMerge [
      {
        network.hostName = host;
        inherit type platform;
        age.secrets = {
          id.rekeyFile = ../secrets/${host}-id.age;
          password.rekeyFile = ../secrets/${host}-password.age;
          s3AccessKey.rekeyFile = ../secrets/s3-access-key.age;
          s3SecretKey.rekeyFile = ../secrets/s3-secret-key.age;
          context7Key = {
            rekeyFile = ../secrets/context7-key.age;
            owner = "jam";
            mode = "400";
          };
          zaiKey = {
            rekeyFile = ../secrets/z-ai-key.age;
            owner = "jam";
            mode = "400";
          };
        };
        unfree.allowedNames = [
          "claude-code"
          "nvidia-x11"
          "nvidia-settings"
          "steam"
          "steam-unwrapped"
        ];
      }
      (optionalAttrs (type == "server" || host == "date") {
        forgejo-action-runner = {
          withDocker = true;
          labels = [
            "self-hosted:host"
            "${host}:host"
            "docpad-infra:host"
            "ubuntu-22.04:docker://docker.gitea.com/runner-images:ubuntu-22.04"
          ];
        };
      })
      rest
    ];

Replacement in modules/hosts.nix at line 3 [6.110]

B:BD[5.385] → [5.385:470]

  inherit (inputs.os.lib) mkMerge;
  inherit (inputs.os.lib.attrsets) optionalAttrs;

[5.385]

[5.470]

  inherit (inputs.self) mkConfig;

Deletion in modules/hosts.nix at line 6 [6.110]

B:BD[5.1289] → [5.1289:1290]

B:BD[5.1492] → [5.1492:1892]

B:BD[5.1964] → [5.1964:2430]

B:BD[5.2430] → [7.1722:1782]

∅:D[7.1782] → [5.2472:2777]

B:BD[5.2472] → [5.2472:2777]


  mkConfig =
    host: platform: type: rest:
    mkMerge [
      {
        network.hostName = host;
        inherit type platform;
        age.secrets = {
          id.rekeyFile = ../secrets/${host}-id.age;
          password.rekeyFile = ../secrets/${host}-password.age;
          s3AccessKey.rekeyFile = ../secrets/s3-access-key.age;
          s3SecretKey.rekeyFile = ../secrets/s3-secret-key.age;
          context7Key = {
            rekeyFile = ../secrets/context7-key.age;
            owner = "jam";
            mode = "400";
          };
          zaiKey = {
            rekeyFile = ../secrets/z-ai-key.age;
            owner = "jam";
            mode = "400";
          };
        };
        unfree.allowedNames = [
          "claude-code"
          "nvidia-x11"
          "nvidia-settings"
          "steam"
          "steam-unwrapped"
        ];
      }
      (optionalAttrs (type == "server" || host == "date") {
        forgejo-action-runner = {
          withDocker = true;
          labels = [
            "self-hosted:host"
            "${host}:host"
            "docpad-infra:host"
            "ubuntu-22.04:docker://docker.gitea.com/runner-images:ubuntu-22.04"
          ];
        };
      })
      rest
    ];

Replacement in modules/hosts.nix at line 40 [6.110]

B:BD[2.1801] → [2.1801:1861]

        config = mkConfig "yuzu" "x86_64-linux" "desktop" {

[2.1801]

[2.1861]

        config = mkConfig inputs "yuzu" "x86_64-linux" "desktop" {

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

B:BD[2.2390] → [2.2390:2450]

        config = mkConfig "date" "x86_64-linux" "desktop" {

[2.2390]

[2.2450]

        config = mkConfig inputs "date" "x86_64-linux" "desktop" {

Replacement in modules/hosts.nix at line 109 [6.110]

B:BD[2.3432] → [2.3432:3488]

        config = mkConfig "pear" "x86_64-linux" "wsl" {

[2.3432]

[2.3488]

        config = mkConfig inputs "pear" "x86_64-linux" "wsl" {

Replacement in modules/hosts.nix at line 144 [6.110]

B:BD[2.4131] → [2.4131:4190]

        config = mkConfig "plum" "x86_64-linux" "server" {

[2.4131]

[2.4190]

        config = mkConfig inputs "plum" "x86_64-linux" "server" {

Replacement in modules/hosts.nix at line 202 [6.110]

B:BD[2.5701] → [2.5701:5760]

        config = mkConfig "kiwi" "x86_64-linux" "server" {

[2.5701]

[2.5760]

        config = mkConfig inputs "kiwi" "x86_64-linux" "server" {

Replacement in modules/hosts.nix at line 240 [6.110]

B:BD[2.6634] → [2.6634:6693]

        config = mkConfig "sloe" "x86_64-linux" "server" {

[2.6634]

[8.6800]

        config = mkConfig inputs "sloe" "x86_64-linux" "server" {

Replacement in modules/hosts.nix at line 271 [6.110]

B:BD[2.7322] → [2.7322:7386]

        config = mkConfig "blackwell" "x86_64-linux" "server" {

[2.7322]

[9.8239]

        config = mkConfig inputs "blackwell" "x86_64-linux" "server" {