plumjam/nixos - Change LYEDM2AG74FSFHLK5J4ZPYJVT2VTQBKA6BPP2W6LWR3GBQM76PDAC

hosts: Clean up users, groups, and comments.

Created by PlumJam on September 18, 2025

LYEDM2AG74FSFHLK5J4ZPYJVT2VTQBKA6BPP2W6LWR3GBQM76PDAC

Dependencies

In channels

main

Change contents

Replacement in hosts/plum/default.nix at line 1 [8.987]
B:BD[8.987] → [9.2834:2839]
∅:D[9.2839] → [8.994:998]
B:BD[8.994] → [8.994:998]
```
lib:
let
```
[8.987]
[9.2840]
```
lib: let
```

Insertion in hosts/plum/default.nix at line 16 [8.987]

[9.3163]

          (self + /modules/forgejo.nix)
          (self + /modules/site.nix)
          (self + /modules/matrix.nix)
          (self + /modules/cinny.nix)
          (self + /modules/system.nix)
          (self + /modules/nix.nix)

Deletion in hosts/plum/default.nix at line 28 [8.987]

∅:D[3.2795] → [9.3293:3409]

∅:D[10.5336] → [9.3293:3409]

B:BD[9.3293] → [9.3293:3409]

B:BD[9.3409] → [11.1587:1625]

B:BD[9.3501] → [9.3501:3576]

          (self + /modules/forgejo.nix)
          (self + /modules/site.nix)
          (self + /modules/matrix.nix)
          (self + /modules/cinny.nix)
          (self + /modules/system.nix)
          (self + /modules/nix.nix)

Insertion in hosts/plum/default.nix at line 30 [8.987]
[9.3705]
[9.3705]
```
        type                        = "server";
```

Replacement in hosts/plum/default.nix at line 33 [8.987]

B:BD[9.3760] → [12.4409:4434]

B:BD[9.3850] → [9.3850:3888]

        type = "server";
        services.openssh = enabled {

[9.3760]

[9.3888]

        age.secrets.id.file = ./id.age;
        services.openssh    = enabled {

Replacement in hosts/plum/default.nix at line 47 [8.987]

B:BD[9.4473] → [9.4473:4519]

B:BD[9.4556] → [9.4556:4557]

B:BD[9.4557] → [13.643:671]

∅:D[13.671] → [14.659:850]

B:BD[14.659] → [14.659:850]

B:BD[14.850] → [13.672:726]

∅:D[13.726] → [14.906:917]

B:BD[14.906] → [14.906:917]

∅:D[14.917] → [9.4638:4668]

B:BD[9.4638] → [9.4638:4668]

B:BD[9.4668] → [13.727:781]

∅:D[13.781] → [9.4724:4809]

B:BD[9.4724] → [9.4724:4809]

        age.secrets.id.file       = ./id.age;
        users.users.jam = {
          isNormalUser       = true;
          shell              = pkgs.nushell;
          hashedPasswordFile = config.age.secrets.password.path;
          extraGroups        = [ "wheel" ];
          openssh.authorizedKeys.keys = [ keys.jam ];
        };
        users.users.root = {
          openssh.authorizedKeys.keys = [ keys.jam ];
          hashedPasswordFile          = config.age.secrets.password.path;
        };

[9.4473]

[9.4809]

        users.users               = {
          root = {
            shell                       = pkgs.nushell;
            openssh.authorizedKeys.keys = keys.admins;
            hashedPasswordFile          = config.age.secrets.password.path;
          };

Replacement in hosts/plum/default.nix at line 54 [8.987]

B:BD[9.4810] → [14.918:951]

        users.groups.build = {};

[9.4810]

[14.951]

          jam = {
            description                 = "Jam";
            isNormalUser                = true;
            shell                       = pkgs.nushell;
            hashedPasswordFile          = config.age.secrets.password.path;
            openssh.authorizedKeys.keys = keys.admins;
            extraGroups                 = [ "wheel" ];
          };

Replacement in hosts/plum/default.nix at line 63 [8.987]

B:BD[14.952] → [14.952:1031]

B:BD[14.1031] → [7.508:558]

∅:D[7.558] → [14.1161:1207]

B:BD[14.1161] → [14.1161:1207]

B:BD[14.1207] → [7.559:655]

        users.users.build = {
          description                 = "Build";
          openssh.authorizedKeys.keys = keys.all;
          isNormalUser                = true;
          createHome                  = false;
          group                       = "build";

[14.952]

[15.186]

          build = {
            description                 = "Build";
            isNormalUser                = true;
            createHome                  = false;
            openssh.authorizedKeys.keys = keys.all;
            extraGroups                 = [ "build" ];
          };

Replacement in hosts/plum/default.nix at line 73 [8.987]
B:BD[15.229] → [13.837:857]
```
          jam = {};
```
[15.229]
[14.1260]
```
          root = {};
          jam  = {};
```

Deletion in hosts/plum/default.nix at line 77 [8.987]

B:BD[14.1272] → [15.328:419]

B:BD[9.4886] → [9.4886:4887]

        home-manager.sharedModules = [{
          home.stateVersion = "24.11";
        }];

Insertion in hosts/plum/default.nix at line 88 [8.987]

[9.5390]

        home-manager.sharedModules = [{
          home.stateVersion = "24.11";
        }];

Replacement in hosts/pear/default.nix at line 1 [8.1239]
B:BD[8.1239] → [9.5455:5460]
∅:D[9.5460] → [8.1246:1250]
B:BD[8.1246] → [8.1246:1250]
```
lib:
let
```
[8.1239]
[9.5461]
```
lib: let
```
Insertion in hosts/pear/default.nix at line 17 [8.1239]
[9.5840]
[9.5840]
```
        type                        = "desktop";
```
Insertion in hosts/pear/default.nix at line 19 [8.1239]
[9.5894]
[9.5938]
```
        isWsl                       = true;
```

Replacement in hosts/pear/default.nix at line 21 [8.1239]

B:BD[9.5939] → [12.4442:4491]

∅:D[12.4491] → [9.5965:5966]

B:BD[9.5965] → [9.5965:5966]

B:BD[9.6057] → [9.6057:6094]

        type  = "desktop";
        isWsl = true;
        services.openssh = enabled {

[9.5939]

[9.6094]

        age.secrets.id.file = ./id.age;
        services.openssh    = enabled {

Deletion in hosts/pear/default.nix at line 34 [8.1239]
B:BD[9.6420] → [6.544:596]
∅:D[6.596] → [9.6471:6511]
B:BD[9.6471] → [9.6471:6511]
```
        age.secrets.password.file = ./password.age;
        age.secrets.id.file = ./id.age;
```

Replacement in hosts/pear/default.nix at line 36 [8.1239]

B:BD[9.6536] → [13.864:895]

          defaultUser = "jam";

[9.6536]

[9.6569]

          defaultUser            = "jam";
          startMenuLaunchers     = false; # Hide from start menu.
          useWindowsDriver       = true; # Use Windows graphics drivers.
          docker-desktop.enable  = true; # Allow docker-desktop to use NixOS-WSL.

Replacement in hosts/pear/default.nix at line 41 [8.1239]

B:BD[9.6570] → [9.6570:6719]

          startMenuLaunchers    = true;
          useWindowsDriver      = true;
          docker-desktop.enable = true;
          # usb passthrough

[9.6570]

[9.6719]

          # Allow USB passthrough.

Replacement in hosts/pear/default.nix at line 43 [8.1239]

B:BD[9.6747] → [9.6747:6840]

            # autoAttach = [ "1-9" ]; # add device IDs like "4-1" to auto-attach USB devices

[9.6747]

[9.6840]

            # autoAttach = [ "1-9" ]; # Add device IDs like "4-1" to auto-attach USB devices.

Replacement in hosts/pear/default.nix at line 46 [8.1239]
B:BD[9.6854] → [9.6854:6876]
```
          # for usbip
```
[9.6854]
[9.6876]
```
          # Necessary for usbip.
```

Replacement in hosts/pear/default.nix at line 58 [8.1239]

B:BD[9.7339] → [6.597:644]

            interop.appendWindowsPath = false;

[9.7339]

[9.7385]

            interop.appendWindowsPath = false; # Do not add Windows executables to WSL path.

Deletion in hosts/pear/default.nix at line 61 [8.1239]

B:BD[9.7444] → [9.7444:7456]

B:BD[9.7456] → [13.896:924]

∅:D[13.924] → [14.1309:1379]

B:BD[14.1309] → [14.1309:1379]

B:BD[14.1379] → [6.645:710]

∅:D[6.710] → [14.1379:1436]

B:BD[14.1379] → [14.1379:1436]

B:BD[14.1436] → [13.925:979]

        };
        users.users.jam = {
          isNormalUser = true;
          shell        = pkgs.nushell;
          hashedPasswordFile = config.age.secrets.password.path;
          extraGroups  = [ "wheel" "docker" "dialout" ];
          openssh.authorizedKeys.keys = [ keys.jam ];

Replacement in hosts/pear/default.nix at line 63 [8.1239]

B:BD[9.7521] → [6.711:870]

        users.users.root = {
          openssh.authorizedKeys.keys = [ keys.jam ];
          hashedPasswordFile = config.age.secrets.password.path;
        };

[9.7521]

[9.7592]

        age.secrets.password.file = ./password.age;
        users.users               = {
          root = {
            shell                       = pkgs.nushell;
            hashedPasswordFile          = config.age.secrets.password.path;
            openssh.authorizedKeys.keys = keys.admins;
          };

Replacement in hosts/pear/default.nix at line 71 [8.1239]

B:BD[9.7593] → [14.1504:1537]

        users.groups.build = {};

[9.7593]

[14.1537]

          jam = {
            description                 = "Jam";
            isNormalUser                = true;
            shell                       = pkgs.nushell;
            hashedPasswordFile          = config.age.secrets.password.path;
            openssh.authorizedKeys.keys = keys.admins;
            extraGroups                 = [ "wheel" "docker" "dialout" ]; # Dialout for serial, Docker for docker-desktop.
          };

Replacement in hosts/pear/default.nix at line 80 [8.1239]

B:BD[14.1538] → [14.1538:1617]

B:BD[14.1617] → [7.663:713]

∅:D[7.713] → [14.1673:1719]

∅:D[13.1104] → [14.1673:1719]

B:BD[14.1673] → [14.1673:1719]

B:BD[14.1719] → [7.714:810]

        users.users.build = {
          description                 = "Build";
          openssh.authorizedKeys.keys = keys.all;
          isNormalUser                = true;
          createHome                  = false;
          group                       = "build";

[14.1538]

[15.427]

          build = {
            description                 = "Build";
            isNormalUser                = true;
            createHome                  = false;
            openssh.authorizedKeys.keys = keys.all;
            extraGroups                 = [ "build" ];
          };

Replacement in hosts/pear/default.nix at line 90 [8.1239]
B:BD[15.470] → [13.1105:1125]
```
          jam = {};
```
[15.470]
[14.1772]
```
          root = {};
          jam  = {};
```

Deletion in hosts/pear/default.nix at line 93 [8.1239]

B:BD[14.1783] → [14.1783:1784]

B:BD[14.1784] → [15.569:660]


        home-manager.sharedModules = [{
          home.stateVersion = "24.11";
        }];

Insertion in hosts/pear/default.nix at line 104 [8.1239]

[9.8132]

        home-manager.sharedModules = [{
          home.stateVersion = "24.11";
        }];

Replacement in hosts/lime/default.nix at line 2 [8.1603]
∅:D[4.881] → [8.1611:1631]
∅:D[9.8232] → [8.1611:1631]
B:BD[8.1611] → [8.1611:1631]
```
  class = "darwin";
```
[4.881]
[8.1631]
```
  class  = "darwin";
```
Insertion in hosts/lime/default.nix at line 11 [8.1603]
[9.8446]
[12.4494]
```
        type                        = "desktop";
```

Replacement in hosts/lime/default.nix at line 14 [8.1603]

B:BD[12.4550] → [5.103:147]

        nixpkgs.config.allowUnfree  = true;

[12.4550]

[9.8656]

        nixpkgs.config.allowUnfree  = true; # Only blanket allow is possible on nix-darwin.

Replacement in hosts/lime/default.nix at line 16 [8.1603]
B:BD[9.8657] → [13.1128:1164]
∅:D[13.1164] → [9.8695:8735]
B:BD[9.8695] → [9.8695:8735]
```
        system.primaryUser = "jam";
        type               = "desktop";
```
[9.8657]
[9.8735]
```
        system = {
          primaryUser = "jam";
```

Replacement in hosts/lime/default.nix at line 19 [8.1603]

B:BD[9.8736] → [9.8736:8788]

B:BD[9.8883] → [9.8883:9175]

        # thanks github/rgbcube for the stuff below
        system.defaults.CustomSystemPreferences."com.apple.AdLib" = {
          allowApplePersonalizedAdvertising = false;
          allowIdentifierForAdvertising     = false;
          forceLimitAdTracking              = true;
          personalizedAdsMigrated           = false;
        };

[9.8736]

[9.9175]

          # Thanks github/rgbcube for the stuff below.
          defaults.CustomSystemPreferences."com.apple.AdLib" = {
            allowApplePersonalizedAdvertising = false;
            allowIdentifierForAdvertising     = false;
            forceLimitAdTracking              = true;
            personalizedAdsMigrated           = false;
          };

Replacement in hosts/lime/default.nix at line 27 [8.1603]

B:BD[9.9176] → [9.9176:9256]

        system.defaults.SoftwareUpdate.AutomaticallyInstallMacOSUpdates = true;

[9.9176]

[9.9256]

          defaults.SoftwareUpdate.AutomaticallyInstallMacOSUpdates = true;

Replacement in hosts/lime/default.nix at line 29 [8.1603]

B:BD[9.9257] → [9.9257:9387]

        system.defaults.loginwindow = {
          DisableConsoleAccess = true;
          GuestEnabled         = false;
        };

[9.9257]

[9.9387]

          defaults.loginwindow = {
            DisableConsoleAccess = true;
            GuestEnabled         = false;
          };

Replacement in hosts/lime/default.nix at line 34 [8.1603]

B:BD[9.9388] → [9.9388:9529]

        system.defaults.trackpad = {
          Clicking = false; # no touch-to-click
          Dragging = false; # no tap-to-drag
        };

[9.9388]

[9.9529]

          defaults.trackpad = {
            Clicking = false; # No touch-to-click.
            Dragging = false; # No tap-to-drag.
          };

Replacement in hosts/lime/default.nix at line 39 [8.1603]

B:BD[9.9530] → [9.9530:9635]

        system.defaults.dock = {
          autohide   = true;
          showhidden = true; # translucent

[9.9530]

[9.9635]

          defaults.dock = {
            autohide   = true;
            showhidden = true; # Translucent.

Replacement in hosts/lime/default.nix at line 43 [8.1603]

B:BD[9.9636] → [9.9636:9678]

          mouse-over-hilite-stack = true;

[9.9636]

[9.9678]

            mouse-over-hilite-stack = true;

Replacement in hosts/lime/default.nix at line 45 [8.1603]

B:BD[9.9679] → [9.9679:9743]

          show-recents = false;
          mru-spaces   = false;

[9.9679]

[9.9743]

            show-recents = false;
            mru-spaces   = false;

Replacement in hosts/lime/default.nix at line 48 [8.1603]

B:BD[9.9744] → [9.9744:9807]

          tilesize      = 48;
          magnification = false;

[9.9744]

[9.9807]

            tilesize      = 48;
            magnification = false;

Replacement in hosts/lime/default.nix at line 51 [8.1603]

B:BD[9.9808] → [9.9808:9866]

          enable-spring-load-actions-on-all-items = true;

[9.9808]

[9.9866]

            enable-spring-load-actions-on-all-items = true;

Replacement in hosts/lime/default.nix at line 53 [8.1603]

B:BD[9.9867] → [9.9867:9897]

B:BD[9.9897] → [13.1165:1411]

∅:D[13.1411] → [9.10149:10173]

B:BD[9.10149] → [9.10149:10173]

          persistent-apps = [
            { app = "/Users/jam/Applications/Home Manager Apps/Alacritty.app"; }
            { app = "/Users/jam/Applications/Home Manager Apps/Arc.app"; }
            { app = "/Users/jam/Applications/Home Manager Apps/Karabiner-Elements.app"; }
          ];
        };

[9.9867]

[9.10173]

            persistent-apps = [
              { app = "/Users/jam/Applications/Home Manager Apps/Alacritty.app"; }
              { app = "/Users/jam/Applications/Home Manager Apps/Arc.app"; }
              { app = "/Users/jam/Applications/Home Manager Apps/Karabiner-Elements.app"; }
            ];
          };

Replacement in hosts/lime/default.nix at line 60 [8.1603]

B:BD[9.10174] → [9.10174:10501]

        system.defaults.CustomSystemPreferences."com.apple.dock" = {
          autohide-time-modifier    = 0.0;
          autohide-delay            = 0.0;
          expose-animation-duration = 0.0;
          springboard-show-duration = 0.0;
          springboard-hide-duration = 0.0;
          springboard-page-duration = 0.0;

[9.10174]

[9.10501]

          defaults.CustomSystemPreferences."com.apple.dock" = {
            autohide-time-modifier    = 0.0;
            autohide-delay            = 0.0;
            expose-animation-duration = 0.0;
            springboard-show-duration = 0.0;
            springboard-hide-duration = 0.0;
            springboard-page-duration = 0.0;

Replacement in hosts/lime/default.nix at line 68 [8.1603]

B:BD[9.10502] → [9.10502:10659]

          # Disable hot corners.
          wvous-tl-corner = 0;
          wvous-tr-corner = 0;
          wvous-bl-corner = 0;
          wvous-br-corner = 0;

[9.10502]

[9.10659]

            # Disable hot corners.
            wvous-tl-corner = 0;
            wvous-tr-corner = 0;
            wvous-bl-corner = 0;
            wvous-br-corner = 0;

Replacement in hosts/lime/default.nix at line 74 [8.1603]
B:BD[9.10660] → [9.10660:10686]
```
          launchanim = 0;
```
[9.10660]
[9.10686]
```
            launchanim = 0;
          };
```
Deletion in hosts/lime/default.nix at line 77 [8.1603]
B:BD[9.10697] → [9.10697:10698]
Replacement in hosts/kiwi/default.nix at line 1 [8.1791]
B:BD[8.1791] → [9.10753:10758]
∅:D[9.10758] → [8.1798:1802]
B:BD[8.1798] → [8.1798:1802]
```
lib:
let
```
[8.1791]
[9.10759]
```
lib: let
```

Deletion in hosts/kiwi/default.nix at line 16 [8.1791]

B:BD[9.11082] → [9.11082:11149]

          ./github2forgejo/github2forgejo.nix
          ./disk.nix

Insertion in hosts/kiwi/default.nix at line 19 [8.1791]

[9.11317]

[9.11356]

          ./github2forgejo/github2forgejo.nix
          ./disk.nix

Insertion in hosts/kiwi/default.nix at line 23 [8.1791]
[9.11446]
[9.11446]
```
        type                        = "server";
```
Deletion in hosts/kiwi/default.nix at line 25 [8.1791]
∅:D[16.6494] → [9.11500:11501]
B:BD[9.11500] → [9.11500:11501]
B:BD[9.11501] → [12.4604:4629]
```
        type = "server";
```

Replacement in hosts/kiwi/default.nix at line 26 [8.1791]

B:BD[9.11592] → [9.11592:11629]

        services.openssh = enabled {

[9.11592]

[9.11629]

        age.secrets.id.file = ./id.age;
        services.openssh    = enabled {

Replacement in hosts/kiwi/default.nix at line 40 [8.1791]

B:BD[9.12214] → [9.12214:12260]

        age.secrets.id.file       = ./id.age;

[9.12214]

[9.12297]

        users.users               = {
          root = {
            shell                       = pkgs.nushell;
            hashedPasswordFile          = config.age.secrets.password.path;
            openssh.authorizedKeys.keys = keys.admins;
          };

Replacement in hosts/kiwi/default.nix at line 47 [8.1791]

B:BD[9.12298] → [13.1421:1449]

∅:D[13.1449] → [14.1826:2017]

B:BD[14.1826] → [14.1826:2017]

B:BD[14.2017] → [13.1450:1504]

∅:D[13.1504] → [14.2073:2084]

B:BD[14.2073] → [14.2073:2084]

        users.users.jam = {
          isNormalUser       = true;
          shell              = pkgs.nushell;
          hashedPasswordFile = config.age.secrets.password.path;
          extraGroups        = [ "wheel" ];
          openssh.authorizedKeys.keys = [ keys.jam ];
        };

[9.12298]

[9.12379]

          jam = {
            description                 = "Jam";
            isNormalUser                = true;
            shell                       = pkgs.nushell;
            hashedPasswordFile          = config.age.secrets.password.path;
            openssh.authorizedKeys.keys = keys.admins;
            extraGroups                 = [ "wheel" ];
          };

Replacement in hosts/kiwi/default.nix at line 56 [8.1791]

B:BD[9.12380] → [9.12380:12409]

B:BD[9.12409] → [13.1505:1559]

∅:D[13.1559] → [9.12465:12551]

B:BD[9.12465] → [9.12465:12551]

B:BD[9.12551] → [14.2085:2118]

        users.users.root = {
          openssh.authorizedKeys.keys = [ keys.jam ];
          hashedPasswordFile          = config.age.secrets.password.path;
        };
        users.groups.build = {};

[9.12380]

[14.2118]

          build = {
            description                 = "Build";
            isNormalUser                = true;
            createHome                  = false;
            openssh.authorizedKeys.keys = keys.all;
            extraGroups                 = [ "build" ];
          };

Replacement in hosts/kiwi/default.nix at line 64 [8.1791]

B:BD[14.2119] → [14.2119:2198]

B:BD[14.2198] → [7.822:872]

∅:D[7.872] → [14.2328:2374]

B:BD[14.2328] → [14.2328:2374]

B:BD[14.2374] → [7.873:920]

∅:D[7.920] → [14.2374:2427]

B:BD[14.2374] → [14.2374:2427]

B:BD[14.2427] → [15.673:685]

B:BD[15.685] → [2.121:227]

        users.users.build = {
          description                 = "Build";
          openssh.authorizedKeys.keys = keys.all;
          isNormalUser                = true;
          createHome                  = false;
          extraGroups                 = [ "build" ];
        };
        users.users.github2forgejo = {
          isSystemUser = true;
          group = "github2forgejo";

[14.2119]

[2.227]

          # I think the service should create it automatically but doesn't appear to.
          # So we create it manually here, as well as the group.
          github2forgejo = {
            isSystemUser                = true;
            createHome                  = false;
            group                       = "github2forgejo";
          };

Replacement in hosts/kiwi/default.nix at line 76 [8.1791]
B:BD[15.716] → [13.1615:1635]
```
          jam = {};
```
[15.716]
[14.2427]
```
          root = {};
          jam  = {};
```

Deletion in hosts/kiwi/default.nix at line 80 [8.1791]

B:BD[14.2439] → [15.815:906]

B:BD[9.12627] → [9.12627:12628]

        home-manager.sharedModules = [{
          home.stateVersion = "24.11";
        }];

Insertion in hosts/kiwi/default.nix at line 91 [8.1791]

[9.13134]

        home-manager.sharedModules = [{
          home.stateVersion = "24.11";
        }];