plumjam/nixos - Change AHAA7UNL2RRXP7KERGVCC42GB564WS5BYSSFEOXW3EKVMB2UVEOAC

refactor: better module scoping and flatten structure

additional flags for system scopes
smaller server builds
better separation per host type
reduce nesting by moving common/programs/* up 1 level

Created by James Plummer on September 15, 2025

AHAA7UNL2RRXP7KERGVCC42GB564WS5BYSSFEOXW3EKVMB2UVEOAC

Dependencies

In channels

main

Change contents

Insertion in modules/system.nix at line 9 [6.3]
[6.277]
[6.277]
```
    isWsl    = mkValue false;
```

Replacement in modules/system.nix at line 13 [6.3]

B:BD[6.308] → [6.308:413]

    isDesktop = mkConst <| config.type == "desktop";
    isServer  = mkConst <| config.type == "server";

[6.308]

[6.413]

    isDesktop       = mkConst <| config.type == "desktop";
    isServer        = mkConst <| config.type == "server";
    isDesktopNotWsl = mkConst <| config.isDesktop && !config.isWsl;

File addition: tmp.nix (----------)
[7.77]
```
{
  boot.tmp.cleanOnBoot = true;
}
```
Replacement in modules/linux/node-exporter.nix at line 3 [7.96]
B:BD[7.159] → [7.159:183]
```
in merge <| mkIf true {
```
[7.159]
[7.183]
```
in merge <| mkIf config.isServer {
```
File addition: darwin (d--x------)
[8.2]

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

[0.335]

{ config, lib, pkgs, ... }: lib.mkIf config.isDarwin {
  environment.systemPackages = [
    pkgs.karabiner-elements
    pkgs.raycast
  ];
}

File addition: arc-browser.nix (----------)

[0.335]

{ config, lib, pkgs, ... }: lib.mkIf config.isDarwin {
  environment.systemPackages = [ pkgs.arc-browser ];
  
  nixpkgs.config.permittedInsecurePackages = [
    "arc-browser-1.106.0-66192"
  ];
}

File deletion: programs
BF:BFD[9.9] → [9.788:807]
BF:BFD[9.807] → [9.787:787]
File move: zellij.nix → zellij.nix
BF:BFD[9.787] → [9.809:843]
BF:BF[9.843] → [10.18874:18874]
[9.9]
[10.18874]
Replacement in modules/common/zellij.nix at line 3 [10.18874]
B:BD[11.893] → [11.893:917]
```
	inherit (lib) enabled;
```
[11.893]
[11.917]
```
	inherit (lib) enabled mkIf;
```
Replacement in modules/common/zellij.nix at line 7 [10.18874]
B:BD[12.2258] → [12.2258:2290]
∅:D[11.951] → [13.815:849]
∅:D[12.2290] → [13.815:849]
B:BD[13.815] → [13.815:849]
```
    programs.zellij = enabled {
    enableBashIntegration = true;
```
[12.2258]
[13.849]
```
    programs.zellij = mkIf config.isDesktop (enabled {
      enableBashIntegration = true;
```

Replacement in modules/common/zellij.nix at line 10 [10.18874]

B:BD[13.873] → [13.873:907]

B:BD[13.907] → [11.952:987]

    attachExistingSession = true;
    exitShellOnExit       = false;

[13.850]

[13.936]

      attachExistingSession = true;
      exitShellOnExit       = false;

Replacement in modules/common/zellij.nix at line 13 [10.18874]
∅:D[13.937] → [10.18986:19003]
B:BD[10.18986] → [10.18986:19003]
```
    settings = {
```
[13.937]
[14.3005]
```
      settings = {
```
Replacement in modules/common/zellij.nix at line 476 [10.18874]
B:BD[13.14195] → [12.2291:2298]
∅:D[12.2298] → [10.19288:19295]
∅:D[13.14195] → [10.19288:19295]
B:BD[10.19288] → [10.19288:19295]
```
    };
    };
```
[13.14195]
[12.2299]
```
      };
    });
```
File move: yazi.nix → yazi.nix
BF:BFD[9.787] → [15.69:101]
BF:BF[15.101] → [15.32:32]
[9.9]
[15.32]

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

[9.9]

{ lib, ... }: let
  inherit (lib) enabled;
in {
  home-manager.sharedModules = [{
    programs.vivid = enabled;
  }];
}

Replacement in modules/common/theme.nix at line 6 [14.13]
B:BD[14.138] → [12.14:32]
```
  is_dark = true;
```
[14.138]
[11.51]
```
  is_dark = false;
```
File move: ssh.nix → ssh.nix
BF:BFD[9.787] → [9.845:876]
BF:BF[9.876] → [16.116:116]
[9.9]
[16.116]

File addition: starship-jj.nix (----------)

[9.83]

{ pkgs, ... }: {
  environment.systemPackages = [
    # starship-jj from crates.io
    (pkgs.rustPlatform.buildRustPackage rec {
      pname = "starship-jj";
      version = "0.5.1";
      src = pkgs.fetchCrate {
        inherit pname version;
        hash = "sha256-tQEEsjKXhWt52ZiickDA/CYL+1lDtosLYyUcpSQ+wMo=";
      };
      cargoHash = "sha256-+rLejMMWJyzoKcjO7hcZEDHz5IzKeAGk1NinyJon4PY=";
      meta = {
        description = "Starship module for Jujutsu VCS";
        homepage = "https://crates.io/crates/starship-jj";
      };
    })
  ];
}

Replacement in modules/common/shell/direnv.nix at line 1 [10.15015]
B:BD[10.15015] → [11.321:335]
```
{ lib, ... }:
```
[10.15015]
[11.335]
```
{ lib, config, ... }:
```
Replacement in modules/common/shell/direnv.nix at line 3 [10.15015]
B:BD[11.339] → [11.339:363]
```
	inherit (lib) enabled;
```
[11.339]
[11.363]
```
	inherit (lib) enabled mkIf;
```
Replacement in modules/common/shell/direnv.nix at line 7 [10.15015]
B:BD[12.574] → [12.574:606]
∅:D[11.397] → [10.15093:15130]
∅:D[12.606] → [10.15093:15130]
B:BD[10.15093] → [10.15093:15130]
```
    programs.direnv = enabled {
    enableNushellIntegration = true;
```
[12.574]
[11.398]
```
    programs.direnv = mkIf config.isDesktop (enabled {
      enableNushellIntegration = true;
```
Replacement in modules/common/shell/direnv.nix at line 10 [10.15015]
B:BD[11.399] → [11.399:425]
B:BD[11.425] → [12.607:614]
```
    nix-direnv = enabled;
    };
```
[11.399]
[12.614]
```
      nix-direnv = enabled;
    });
```
Replacement in modules/common/rust.nix at line 1 [10.21787]
B:BD[10.21787] → [12.1934:1966]
∅:D[11.864] → [10.21810:21811]
∅:D[12.1966] → [10.21810:21811]
∅:D[17.28179] → [10.21810:21811]
B:BD[10.21810] → [10.21810:21811]
```
{ pkgs, fenix, bacon-ls, ... }:
```
[10.21787]
[10.21811]
```
{ config, lib, pkgs, fenix, bacon-ls, ... }: let
  inherit (lib) mkIf;
in
```
Replacement in modules/common/rust.nix at line 5 [10.21787]
B:BD[10.21813] → [12.1967:2000]
```
  environment.systemPackages = [
```
[10.21813]
[18.21]
```
  environment.systemPackages = mkIf config.isDesktop [
```
File move: ripgrep.nix → ripgrep.nix
BF:BFD[9.787] → [9.878:913]
BF:BF[9.913] → [19.2244:2244]
[9.9]
[19.2244]

Insertion in modules/common/packages.nix at line 7 [19.4113]

[12.5606]

[19.4222]

    pkgs.comma
    pkgs.tree
    pkgs.hyperfine
    pkgs.curl
    pkgs.tokei
		pkgs.ast-grep
  ]
  ++ lib.optionals config.isDesktop [

Insertion in modules/common/packages.nix at line 20 [19.4113]
[19.4286]
[19.4305]
```
    pkgs.gemini-cli
```

Deletion in modules/common/packages.nix at line 25 [19.4113]

B:BD[19.4350] → [19.4350:4351]

B:BD[19.4372] → [19.4372:4456]

B:BD[19.4456] → [20.35:50]

B:BD[21.67] → [22.58:74]

∅:D[21.67] → [23.202:203]

∅:D[22.74] → [23.202:203]

∅:D[24.292] → [23.202:203]

B:BD[20.50] → [23.202:203]

B:BD[25.36] → [26.613:1107]

∅:D[26.1107] → [25.36:51]

B:BD[25.36] → [25.36:51]

B:BD[25.96] → [25.96:119]


    pkgs.gemini-cli
    pkgs.comma
    pkgs.tree
    pkgs.hyperfine
    pkgs.curl
    pkgs.tokei
		pkgs.ast-grep
    # starship-jj from crates.io
    (pkgs.rustPlatform.buildRustPackage rec {
      pname = "starship-jj";
      version = "0.5.1";
      src = pkgs.fetchCrate {
        inherit pname version;
        hash = "sha256-tQEEsjKXhWt52ZiickDA/CYL+1lDtosLYyUcpSQ+wMo=";
      };
      cargoHash = "sha256-+rLejMMWJyzoKcjO7hcZEDHz5IzKeAGk1NinyJon4PY=";
      meta = {
        description = "Starship module for Jujutsu VCS";
        homepage = "https://crates.io/crates/starship-jj";
      };
    })
    # carapace
    pkgs.inshellisense

Replacement in modules/common/packages.nix at line 32 [19.4113]
B:BD[27.4161] → [5.296:333]
∅:D[5.333] → [27.4203:4271]
B:BD[27.4203] → [27.4203:4271]
B:BD[27.4271] → [2.37:54]
∅:D[2.54] → [19.4470:4475]
∅:D[27.4271] → [19.4470:4475]
B:BD[19.4470] → [19.4470:4475]
```
  ++ lib.optionals config.isDarwin [
    pkgs.arc-browser
    pkgs.alacritty
    pkgs.karabiner-elements
    pkgs.raycast
  ];
```
[27.4161]
[12.5622]
```
;
```

Deletion in modules/common/packages.nix at line 34 [19.4113]

B:BD[12.5623] → [12.5623:5943]

  home-manager.sharedModules = [{
    programs.nix-index = enabled;
    programs.bun = enabled;
    programs.claude-code = enabled;
    programs.jq = enabled;
    programs.vivid = enabled;
    
    # Carapace stuff
    programs.carapace = enabled;
    programs.fish     = enabled;
    programs.zsh      = enabled;
  }];

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

[9.9]

{ lib, ... }: let
  inherit (lib) enabled;
in {
  home-manager.sharedModules = [{
    programs.nix-index = enabled;
  }];
}

File move: jujutsu.nix → jujutsu.nix
BF:BFD[9.787] → [9.915:950]
BF:BF[9.950] → [28.54:54]
[9.9]
[28.54]

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

[9.9]

{ lib, ... }: let
  inherit (lib) enabled;
in {
  home-manager.sharedModules = [{
    programs.jq = enabled;
  }];
}

File move: gpg.nix → gpg.nix
BF:BFD[9.787] → [9.952:983]
BF:BF[9.983] → [10.19493:19493]
[9.9]
[10.19493]
File move: git.nix → git.nix
BF:BFD[9.787] → [9.985:1016]
BF:BF[9.1016] → [10.19673:19673]
[9.9]
[10.19673]
File move: fzf.nix → fzf.nix
BF:BFD[9.787] → [9.1018:1049]
BF:BF[9.1049] → [19.3637:3637]
[9.9]
[19.3637]
Replacement in modules/common/fonts.nix at line 1 [29.36]
B:BD[29.36] → [11.9979:9999]
```
{ pkgs, lib, ... }:
```
[29.36]
[29.63]
```
{ config, pkgs, lib, ... }: let
  inherit (lib) mkIf;
in
```

Replacement in modules/common/fonts.nix at line 5 [29.36]

B:BD[29.65] → [12.5945:5998]

  fonts.packages = [ pkgs.nerd-fonts.iosevka-term ];

[29.65]

[29.190]

  fonts.packages = mkIf config.isDesktop [ pkgs.nerd-fonts.iosevka-term ];

Insertion in modules/common/fonts.nix at line 7 [29.36]
[29.192]
File move: fd.nix → fd.nix
BF:BFD[9.787] → [9.1051:1081]
BF:BF[9.1081] → [19.3706:3706]
[9.9]
[19.3706]
Replacement in modules/common/editor/helix.nix at line 3 [30.72]
B:BD[30.91] → [31.101:141]
```
  inherit (lib) enabled const genAttrs;
```
[30.91]
[30.116]
```
  inherit (lib) enabled const genAttrs mkIf;
```
Replacement in modules/common/editor/helix.nix at line 6 [30.72]
B:BD[30.121] → [12.6001:6034]
```
  environment.systemPackages = [
```
[30.121]
[31.162]
```
  environment.systemPackages = mkIf config.isDesktop [
```
Replacement in modules/common/editor/helix.nix at line 81 [30.72]
B:BD[31.1050] → [31.1050:1084]
```
    languages.language-server = {
```
[31.1050]
[31.1084]
```
    languages.language-server = mkIf config.isDesktop {
```
File move: default.nix → default.nix
BF:BFD[9.787] → [9.1083:1118]
BF:BF[9.1118] → [10.21286:21286]
[9.9]
[10.21286]
Replacement in modules/common/common.nix at line 1 [10.23325]
B:BD[10.23325] → [10.23326:23341]
```
{ pkgs, ... }:
```
[10.23325]
[10.23341]
```
{ config, lib, pkgs, ... }:
```
Deletion in modules/common/common.nix at line 6 [10.23325]
B:BD[11.10396] → [11.10396:10444]
```
    BROWSER  = "wslview"; # use wslview for WSL
```

Insertion in modules/common/common.nix at line 7 [10.23325]

[10.23503]

  } // lib.optionalAttrs config.isWsl {
    BROWSER = "wslview"; # use wslview for WSL

File addition: claude-code.nix (----------)

[9.9]

{ lib, config, ... }: let
  inherit (lib) enabled mkIf;
in {
  home-manager.sharedModules = [{
    programs.claude-code = mkIf config.isDesktop enabled;
  }];
}

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

[9.9]

{ lib, config, ... }: let
  inherit (lib) enabled mkIf;
in {
  home-manager.sharedModules = [{
    programs.bun = mkIf config.isDesktop enabled;
  }];
}

File move: btop.nix → btop.nix
BF:BFD[9.787] → [9.1120:1152]
BF:BF[9.1152] → [19.3817:3817]
[9.9]
[19.3817]
File move: bat.nix → bat.nix
BF:BFD[9.787] → [9.1154:1185]
BF:BF[9.1185] → [19.3888:3888]
[9.9]
[19.3888]
File move: bacon.nix → bacon.nix
BF:BFD[9.787] → [9.1187:1220]
BF:BF[9.1220] → [17.27353:27353]
[9.9]
[17.27353]
Replacement in modules/common/bacon.nix at line 1 [17.27353]
B:BD[17.27353] → [11.9290:9304]
```
{ lib, ... }:
```
[17.27353]
[11.9304]
```
{ config, lib, ... }:
```
Replacement in modules/common/bacon.nix at line 3 [17.27353]
B:BD[11.9308] → [11.9308:9332]
```
	inherit (lib) enabled;
```
[11.9308]
[11.9332]
```
	inherit (lib) enabled mkIf;
```
Replacement in modules/common/bacon.nix at line 7 [17.27353]
B:BD[12.4198] → [12.4198:4229]
```
    programs.bacon = enabled {
```
[12.4198]
[12.4229]
```
    programs.bacon = mkIf config.isDesktop (enabled {
```
Replacement in modules/common/bacon.nix at line 30 [17.27353]
B:BD[17.28077] → [17.28077:28084]
```
    };
```
[17.28077]
[12.4972]
```
    });
```
File move: alacritty.nix → alacritty.nix
BF:BFD[9.787] → [9.1222:1259]
BF:BF[9.1259] → [27.3297:3297]
[9.9]
[27.3297]
Replacement in modules/common/alacritty.nix at line 1 [27.3297]
B:BD[27.3297] → [11.9511:9539]
∅:D[11.9539] → [27.3422:3425]
B:BD[27.3422] → [27.3422:3425]
```
{ config, lib, pkgs, ... }:
{
```
[27.3297]
[12.4980]
```
{ config, lib, pkgs, ... }: let
  inherit (lib) enabled mkIf;
in {
```

Replacement in modules/common/alacritty.nix at line 5 [27.3297]

B:BD[12.5014] → [12.5014:5094]

    programs.alacritty = lib.mkIf pkgs.stdenv.isDarwin {
      enable   = true;

[12.5014]

[12.5094]

    programs.alacritty = mkIf config.isDesktopNotWsl (enabled {

Replacement in modules/common/alacritty.nix at line 11 [27.3297]

B:BD[27.3628] → [12.5225:5303]

        font.size                = 22;
  			font.builtin_box_drawing = false;

[27.3628]

[12.5303]

        font.size                = 18;

Deletion in modules/common/alacritty.nix at line 13 [27.3297]
B:BD[12.5365] → [12.5365:5408]
∅:D[12.5408] → [27.3816:3817]
∅:D[11.9843] → [27.3816:3817]
B:BD[27.3816] → [27.3816:3817]
B:BD[27.3817] → [12.5409:5449]
```
  			font.normal.style        = "Regular";
        cursor.unfocused_hollow = true;
```
Replacement in modules/common/alacritty.nix at line 16 [27.3297]
∅:D[12.5531] → [27.4000:4007]
∅:D[11.9953] → [27.4000:4007]
B:BD[27.4000] → [27.4000:4007]
```
    };
```
[12.5531]
[12.5532]
```
    });
```

Insertion in lib/system.nix at line 7 [32.508]

[9.2554]

[32.773]

  modulesLinux  = collectNix ../modules/linux;
  modulesDarwin = collectNix ../modules/darwin;

Replacement in lib/system.nix at line 65 [32.508]

B:BD[32.1711] → [12.6320:6365]

    ] ++ modulesCommon ++ inputModulesLinux;

[32.1711]

[32.1762]

    ] ++ modulesCommon ++ modulesLinux ++ inputModulesLinux;

Replacement in lib/system.nix at line 79 [32.508]
B:BD[32.2069] → [3.153:182]
```
    ] ++ inputModulesDarwin;
```
[32.2069]
[32.2121]
```
    ] ++ modulesDarwin ++ inputModulesDarwin;
```
Deletion in hosts/plum/default.nix at line 27 [33.987]
∅:D[4.1625] → [6.3449:3501]
B:BD[6.3449] → [6.3449:3501]
```
          (self + /modules/linux/node-exporter.nix)
```
Insertion in hosts/plum/default.nix at line 38 [33.987]
[6.3760]
[6.3760]
```
        type = "server";
```
Replacement in hosts/pear/default.nix at line 24 [33.1239]
B:BD[6.5939] → [6.5939:5965]
```
        type = "desktop";
```
[6.5939]
[6.5965]
```
        type  = "desktop";
        isWsl = true;
```

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

B:BD[6.8446] → [6.8446:8656]

        nixpkgs.hostPlatform.system              = "aarch64-darwin";
        nixpkgs.config.allowUnfree               = true;
        nixpkgs.config.permittedInsecurePackages = [ "arc-browser-1.106.0-66192" ];

[6.8446]

[6.8656]

        nixpkgs.hostPlatform.system = "aarch64-darwin";
        nixpkgs.config.allowUnfree  = true;

Deletion in hosts/kiwi/default.nix at line 20 [33.1791]
B:BD[6.11190] → [6.11190:11242]
```
          (self + /modules/linux/node-exporter.nix)
```
Insertion in hosts/kiwi/default.nix at line 31 [33.1791]
[6.11501]
[6.11501]
```
        type = "server";
```

refactor: better module scoping and flatten structure

Dependencies

In channels

Change contents

Insertion in modules/system.nix at line 9 [6.3]

Replacement in modules/system.nix at line 13 [6.3]

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

Replacement in modules/linux/node-exporter.nix at line 3 [7.96]

File addition: darwin (d--x------)

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

File addition: arc-browser.nix (----------)

File deletion: programs

File move: zellij.nix → zellij.nix

Replacement in modules/common/zellij.nix at line 3 [10.18874]

Replacement in modules/common/zellij.nix at line 7 [10.18874]

Replacement in modules/common/zellij.nix at line 10 [10.18874]

Replacement in modules/common/zellij.nix at line 13 [10.18874]

Replacement in modules/common/zellij.nix at line 476 [10.18874]

File move: yazi.nix → yazi.nix

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

Replacement in modules/common/theme.nix at line 6 [14.13]

File move: ssh.nix → ssh.nix

File addition: starship-jj.nix (----------)

Replacement in modules/common/shell/direnv.nix at line 1 [10.15015]

Replacement in modules/common/shell/direnv.nix at line 3 [10.15015]

Replacement in modules/common/shell/direnv.nix at line 7 [10.15015]

Replacement in modules/common/shell/direnv.nix at line 10 [10.15015]

Replacement in modules/common/rust.nix at line 1 [10.21787]

Replacement in modules/common/rust.nix at line 5 [10.21787]

File move: ripgrep.nix → ripgrep.nix

Insertion in modules/common/packages.nix at line 7 [19.4113]

Insertion in modules/common/packages.nix at line 20 [19.4113]

Deletion in modules/common/packages.nix at line 25 [19.4113]

Replacement in modules/common/packages.nix at line 32 [19.4113]

Deletion in modules/common/packages.nix at line 34 [19.4113]

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

File move: jujutsu.nix → jujutsu.nix

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

File move: gpg.nix → gpg.nix

File move: git.nix → git.nix

File move: fzf.nix → fzf.nix

Replacement in modules/common/fonts.nix at line 1 [29.36]

Replacement in modules/common/fonts.nix at line 5 [29.36]

Insertion in modules/common/fonts.nix at line 7 [29.36]

File move: fd.nix → fd.nix

Replacement in modules/common/editor/helix.nix at line 3 [30.72]

Replacement in modules/common/editor/helix.nix at line 6 [30.72]

Replacement in modules/common/editor/helix.nix at line 81 [30.72]

File move: default.nix → default.nix

Replacement in modules/common/common.nix at line 1 [10.23325]

Deletion in modules/common/common.nix at line 6 [10.23325]

Insertion in modules/common/common.nix at line 7 [10.23325]

File addition: claude-code.nix (----------)

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

File move: btop.nix → btop.nix

File move: bat.nix → bat.nix

File move: bacon.nix → bacon.nix

Replacement in modules/common/bacon.nix at line 1 [17.27353]

Replacement in modules/common/bacon.nix at line 3 [17.27353]

Replacement in modules/common/bacon.nix at line 7 [17.27353]

Replacement in modules/common/bacon.nix at line 30 [17.27353]

File move: alacritty.nix → alacritty.nix

Replacement in modules/common/alacritty.nix at line 1 [27.3297]

Replacement in modules/common/alacritty.nix at line 5 [27.3297]

Replacement in modules/common/alacritty.nix at line 11 [27.3297]

Deletion in modules/common/alacritty.nix at line 13 [27.3297]

Replacement in modules/common/alacritty.nix at line 16 [27.3297]

Insertion in lib/system.nix at line 7 [32.508]

Replacement in lib/system.nix at line 65 [32.508]

Replacement in lib/system.nix at line 79 [32.508]

Deletion in hosts/plum/default.nix at line 27 [33.987]

Insertion in hosts/plum/default.nix at line 38 [33.987]

Replacement in hosts/pear/default.nix at line 24 [33.1239]

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

Deletion in hosts/kiwi/default.nix at line 20 [33.1791]

Insertion in hosts/kiwi/default.nix at line 31 [33.1791]