averageatchris/nixos-configs - Change 5PKY2AL3ELY7NERTVH2K2SNF64ZINHWKSOJCUQTL25RJHUXSTLBQC

refactor into flake-utils.eachSystem

Created by Chris Cummings on July 25, 2022

5PKY2AL3ELY7NERTVH2K2SNF64ZINHWKSOJCUQTL25RJHUXSTLBQC

Dependencies

In channels

main

Change contents

Replacement in nixpkgs/nixos/common.nix at line 10 [7.4276]
B:BD[5.14982] → [6.228:259]
```
  nixpkgs.overlays = overlays;
```
[5.14982]
[8.106]
```
  nixpkgs.overlays = lib.attrValues overlays;
```
Deletion in nixpkgs/darwin/suremac/default.nix at line 1 [9.146]
B:BD[9.146] → [9.147:171]
```
{ config, pkgs, ...}: 
```
Insertion in nixpkgs/darwin/suremac/default.nix at line 2 [9.146]
[9.173]
[9.173]
```
  config,
  pkgs,
  ...
}: {
```

Replacement in nixpkgs/darwin/suremac/default.nix at line 28 [9.146]

B:BD[9.883] → [9.883:952]

    extraOptions = '' experimental-features = nix-command flakes '';

[9.883]

[9.952]

    extraOptions = ''experimental-features = nix-command flakes '';

Replacement in nixpkgs/darwin/suremac/default.nix at line 34 [9.146]
B:BD[9.1047] → [9.1047:1086]
```
  networking = let n = "suremac"; in {
```
[9.1047]
[9.1086]
```
  networking = let
    n = "suremac";
  in {
```
Replacement in nixpkgs/darwin/suremac/default.nix at line 50 [9.146]
B:BD[9.1303] → [9.1303:1318]
```
  system  =  {
```
[9.1303]
[9.1318]
```
  system = {
```

Replacement in nixpkgs/darwin/suremac/default.nix at line 54 [9.146]

B:BD[9.1430] → [9.1430:1510]

      AppleInterfaceStyle = null;  # could be "Dark" for all the time dark mode

[9.1430]

[9.1510]

      AppleInterfaceStyle = null; # could be "Dark" for all the time dark mode

Replacement in nixpkgs/darwin/suremac/default.nix at line 82 [9.146]

B:BD[9.2631] → [9.2631:2688]

      "com.apple.mouse.tapBehavior" = 1;  # tap to click

[9.2631]

[9.2688]

      "com.apple.mouse.tapBehavior" = 1; # tap to click

Replacement in nixpkgs/darwin/suremac/default.nix at line 85 [9.146]

B:BD[9.2788] → [9.2788:2863]

      "com.apple.swipescrolldirection" = true;  # natural scroll direction

[9.2788]

[9.2863]

      "com.apple.swipescrolldirection" = true; # natural scroll direction

Replacement in nixpkgs/darwin/suremac/default.nix at line 117 [9.146]

B:BD[9.3878] → [9.3878:4078]

      wvous-bl-corner = 1;  # disable hot corners
      wvous-br-corner = 1;  # disable hot corners
      wvous-tl-corner = 1;  # disable hot corners
      wvous-tr-corner = 1;  # disable hot corners

[9.3878]

[9.4078]

      wvous-bl-corner = 1; # disable hot corners
      wvous-br-corner = 1; # disable hot corners
      wvous-tl-corner = 1; # disable hot corners
      wvous-tr-corner = 1; # disable hot corners

Replacement in nixpkgs/darwin/suremac/default.nix at line 131 [9.146]
B:BD[9.4334] → [9.4334:4364]
```
    defaults.loginwindow =  {
```
[9.4334]
[9.4364]
```
    defaults.loginwindow = {
```
Deletion in nixpkgs/darwin/suremac/default.nix at line 171 [9.146]
B:BD[9.5379] → [9.5379:5380]
Insertion in flake.nix at line 22 [10.1026]
[5.19367]
[5.19367]
```
      inputs.flake-utils.follows = "flake-utils";
```
Insertion in flake.nix at line 27 [10.1026]
[11.2324]
[12.1214]
```
      inputs.flake-utils.follows = "flake-utils";
```
Insertion in flake.nix at line 41 [10.1026]
[11.2331]
[10.1141]
```
    flake-utils.url = "github:numtide/flake-utils";
```

Replacement in flake.nix at line 46 [10.1026]

B:BD[5.19474] → [4.177:362]

∅:D[4.362] → [5.19615:19824]

B:BD[5.19615] → [5.19615:19824]

B:BD[5.19824] → [13.3678:3718]

∅:D[13.3718] → [5.19824:19840]

B:BD[5.19824] → [5.19824:19840]

B:BD[5.19840] → [13.3719:3741]

∅:D[13.3741] → [5.19840:19936]

B:BD[5.19840] → [5.19840:19936]

B:BD[5.19936] → [13.3742:3764]

∅:D[13.3764] → [5.19936:19946]

B:BD[5.19936] → [5.19936:19946]

B:BD[5.19946] → [14.878:885]

      nixpkgs,
      emacs-overlay,
      home-manager,
      nixos-hardware,
      nix-doom-emacs,
      wayland-overlay,
      pre-commit-hooks,
      agenix,
      darwin,
      ...
  } @ inputs: let
    overlays = [emacs-overlay.overlay wayland-overlay.overlay];
    pkgs = nixpkgs.legacyPackages.x86_64-linux;
    helloDotfiles = pkgs.writeShellApplication {
      name = "helloDotfiles";
      runtimeInputs = [pkgs.coreutils];
      text = ''
        printf "\n\n"
        echo 👋👋 hello from github:averagechris/dotfiles
        echo have a nice day 😎
        printf "\n\n"
      '';
    };

[5.19474]

[14.885]

    nixpkgs,
    emacs-overlay,
    home-manager,
    nixos-hardware,
    nix-doom-emacs,
    wayland-overlay,
    pre-commit-hooks,
    agenix,
    darwin,
    flake-utils,
    ...
  } @ inputs:
    with flake-utils.lib;
      eachSystem
      [system.x86_64-linux system.aarch64-linux]
      (sys: let
        overlays = [emacs-overlay.overlay wayland-overlay.overlay];
        pkgs = nixpkgs.legacyPackages.${sys};
      in {
        packages = rec {
          hello = pkgs.writeShellApplication {
            name = "helloDotfiles";
            runtimeInputs = [pkgs.coreutils];
            text = ''
              printf "\n\n"
              echo 👋👋 hello from ~averagechris/dotfiles
              echo have a nice day 😎
              printf "\n\n"
            '';
          };
          default = hello;
        };

Replacement in flake.nix at line 79 [10.1026]

B:BD[14.886] → [14.886:962]

B:BD[14.962] → [15.3206:3270]

∅:D[15.3270] → [14.1010:1646]

B:BD[14.1010] → [14.1010:1646]

B:BD[14.1646] → [15.3271:3298]

∅:D[15.3298] → [14.1646:2417]

B:BD[14.1646] → [14.1646:2417]

B:BD[14.2417] → [15.3299:3326]

∅:D[15.3326] → [14.2417:2892]

B:BD[14.2417] → [14.2417:2892]

∅:D[14.2892] → [5.19946:19953]

B:BD[5.19946] → [5.19946:19953]

B:BD[5.19953] → [13.3765:4257]

∅:D[13.4257] → [5.19953:20062]

B:BD[5.19953] → [5.19953:20062]

∅:D[16.242] → [10.1180:1181]

∅:D[12.1319] → [10.1180:1181]

∅:D[11.2473] → [10.1180:1181]

∅:D[5.20062] → [10.1180:1181]

B:BD[10.1180] → [10.1180:1181]

B:BD[10.1181] → [5.20063:20091]

B:BD[5.20091] → [17.130:221]

B:BD[17.221] → [9.5625:5632]

    thelio-nixos = nixpkgs.lib.nixosSystem {
      system = "x86_64-linux";
      specialArgs = {
        inherit inputs overlays;
      };
      modules = [
        ./nixpkgs/nixos/thelio
        nixos-hardware.nixosModules.system76
        ./nixpkgs/nixos/common.nix
        ./nixpkgs/nixos/desktop_common.nix
        ./nixpkgs/nixos/graphical.nix
        ./nixpkgs/nixos/greetd.nix
        ./nixpkgs/nixos/networking.nix
        ./nixpkgs/nixos/docker.nix
        ./nixpkgs/nixos/sound.nix
        ./nixpkgs/nixos/tailscale.nix
        ./nixpkgs/nixos/users/chris.nix
        ./nixpkgs/nixos/users/chris-focus.nix
        home-manager.nixosModules.home-manager
        {
          home-manager.useGlobalPkgs = true;
          home-manager.useUserPackages = true;
        }
        agenix.nixosModule
      ];
    };
    xps-nixos = nixpkgs.lib.nixosSystem {
      system = "x86_64-linux";
      specialArgs = {inherit inputs overlays;};
      modules = [
        ./nixpkgs/nixos/xps
        nixos-hardware.nixosModules.system76
        ./nixpkgs/nixos/common.nix
        ./nixpkgs/nixos/desktop_common.nix
        ./nixpkgs/nixos/docker.nix
        ./nixpkgs/nixos/graphical.nix
        ./nixpkgs/nixos/greetd.nix
        ./nixpkgs/nixos/networking.nix
        ./nixpkgs/nixos/sound.nix
        ./nixpkgs/nixos/tailscale.nix
        ./nixpkgs/nixos/users/chris-focus.nix
        ./nixpkgs/nixos/users/chris.nix
        home-manager.nixosModules.home-manager
        {
          home-manager.useGlobalPkgs = true;
          home-manager.useUserPackages = true;
        }
        agenix.nixosModule
      ];
    };
    tootsie = nixpkgs.lib.nixosSystem {
      system = "x86_64-linux";
      specialArgs = {inherit inputs overlays;};
      modules = [
        ./nixpkgs/nixos/tootsie
        ./nixpkgs/nixos/common.nix
        ./nixpkgs/nixos/tailscale.nix
        ./nixpkgs/nixos/users/chris-minimal.nix
        home-manager.nixosModules.home-manager
        {
          home-manager.useGlobalPkgs = true;
          home-manager.useUserPackages = true;
        }
      ];
    };
    taz = nixpkgs.lib.nixosSystem {
      system = "x86_64-linux";
      specialArgs = {inherit inputs overlays;};
      modules = [
        ./nixpkgs/nixos/taz
        ./nixpkgs/nixos/common.nix
        ./nixpkgs/nixos/searx.nix
        ./nixpkgs/nixos/tailscale.nix
        ./nixpkgs/nixos/users/chris-minimal.nix
        home-manager.nixosModules.home-manager
        {
          home-manager.useGlobalPkgs = true;
          home-manager.useUserPackages = true;
        }
      ];
    };
  in {
    overlays = {
      emacs = emacs-overlay.overlay;
      wayland = wayland-overlay.overlay;
    };
    nixosConfigurations = {
      inherit
        taz
        thelio-nixos
        tootsie
        xps-nixos
        ;
    };

[14.886]

[9.5632]

        checks =
          {
            pre-commit = pre-commit-hooks.lib.${sys}.run {
              src = ./.;
              hooks = {
                alejandra.enable = true;
                statix.enable = true;
                shellcheck.enable = true;
                markdown-formatter = {
                  enable = true;
                  name = "markdown-formatter";
                  types = ["markdown"];
                  language = "system";
                  pass_filenames = true;
                  entry = with pkgs.python310Packages; "${mdformat}/bin/mdformat";
                };
                markdown-linter = {
                  enable = true;
                  name = "markdown-linter";
                  types = ["markdown"];
                  language = "system";
                  pass_filenames = true;
                  entry = with pkgs; "${mdl}/bin/mdl -g";
                };
              };
            };
          }
          // (
            if sys == system.x86_64-linux
            then {
              # these checks take ~4GB of memory right now to run
              # since nix flake check loads all of outputs.nixosConfigurations
              # into memory at once 😢
              thelio-nixos = self.outputs.nixosConfigurations.thelio-nixos.config.system.build.toplevel;
              xps-nixos = self.outputs.nixosConfigurations.xps-nixos.config.system.build.toplevel;
              tootsie = self.outputs.nixosConfigurations.tootsie.config.system.build.toplevel;
              taz = self.outputs.nixosConfigurations.taz.config.system.build.toplevel;
            }
            else {}
          );

Replacement in flake.nix at line 120 [10.1026]

B:BD[9.5633] → [9.5633:5773]

∅:D[17.221] → [5.22226:22233]

∅:D[14.2939] → [5.22226:22233]

∅:D[9.5773] → [5.22226:22233]

B:BD[5.22226] → [5.22226:22233]

    darwinConfigurations.suremac = darwin.lib.darwinSystem {
      system = "aarch64-darwin";
      modules = [ ./nixpkgs/darwin/suremac ];
    };

[9.5633]

[10.1998]

        devShells = {
          default = pkgs.mkShell {
            shellHook =
              self.checks.${sys}.pre-commit.shellHook
              + ''
                helloDotfiles
              '';
            buildInputs = with pkgs; [
              alejandra
              cachix
              self.outputs.packages.${sys}.hello
              mdl
              statix
              python310Packages.mdformat
            ];
          };
        };

Replacement in flake.nix at line 138 [10.1026]

B:BD[10.1999] → [5.22234:22285]

    packages.x86_64-linux.default = helloDotfiles;

[10.1999]

[10.2051]

        formatter = pkgs.alejandra;
      })
      // rec {
        overlays = {
          emacs = emacs-overlay.overlay;
          wayland = wayland-overlay.overlay;
        };
        nixosConfigurations = {
          thelio-nixos = nixpkgs.lib.nixosSystem {
            system = system.x86_64-linux;
            specialArgs = {
              inherit (self.outputs) overlays;
              inherit inputs;
            };
            modules = [
              ./nixpkgs/nixos/thelio
              nixos-hardware.nixosModules.system76
              ./nixpkgs/nixos/common.nix
              ./nixpkgs/nixos/desktop_common.nix
              ./nixpkgs/nixos/graphical.nix
              ./nixpkgs/nixos/greetd.nix
              ./nixpkgs/nixos/networking.nix
              ./nixpkgs/nixos/docker.nix
              ./nixpkgs/nixos/sound.nix
              ./nixpkgs/nixos/tailscale.nix
              ./nixpkgs/nixos/users/chris.nix
              ./nixpkgs/nixos/users/chris-focus.nix
              home-manager.nixosModules.home-manager
              {
                home-manager.useGlobalPkgs = true;
                home-manager.useUserPackages = true;
              }
              agenix.nixosModule
            ];
          };

Replacement in flake.nix at line 174 [10.1026]

B:BD[10.2052] → [3.132:288]

∅:D[3.288] → [5.22286:22314]

B:BD[10.2052] → [5.22286:22314]

B:BD[5.22314] → [3.289:511]

    # these checks take ~4GB of memory right now to run
    # since nix flake check loads all of outputs.nixosConfigurations
    # into memory at once 😢
    checks.x86_64-linux = {
      thelio-nixos = thelio-nixos.config.system.build.toplevel;
      xps-nixos = xps-nixos.config.system.build.toplevel;
      tootsie = tootsie.config.system.build.toplevel;
      taz = taz.config.system.build.toplevel;

[10.2052]

[13.4480]

          xps-nixos = nixpkgs.lib.nixosSystem {
            system = system.x86_64-linux;
            specialArgs = {
              inherit (self.outputs) overlays;
              inherit inputs;
            };
            modules = [
              ./nixpkgs/nixos/xps
              nixos-hardware.nixosModules.system76
              ./nixpkgs/nixos/common.nix
              ./nixpkgs/nixos/desktop_common.nix
              ./nixpkgs/nixos/docker.nix
              ./nixpkgs/nixos/graphical.nix
              ./nixpkgs/nixos/greetd.nix
              ./nixpkgs/nixos/networking.nix
              ./nixpkgs/nixos/sound.nix
              ./nixpkgs/nixos/tailscale.nix
              ./nixpkgs/nixos/users/chris-focus.nix
              ./nixpkgs/nixos/users/chris.nix
              home-manager.nixosModules.home-manager
              {
                home-manager.useGlobalPkgs = true;
                home-manager.useUserPackages = true;
              }
              agenix.nixosModule
            ];
          };

Replacement in flake.nix at line 202 [10.1026]

∅:D[13.4481] → [5.22314:22793]

B:BD[5.22314] → [5.22314:22793]

      pre-commit = pre-commit-hooks.lib.x86_64-linux.run {
        src = ./.;
        hooks = {
          alejandra.enable = true;
          statix.enable = true;
          shellcheck.enable = true;
          markdown-formatter = {
            enable = true;
            name = "markdown-formatter";
            types = ["markdown"];
            language = "system";
            pass_filenames = true;
            entry = with pkgs.python310Packages; "${mdformat}/bin/mdformat";

[13.4481]

[5.22793]

          tootsie = nixpkgs.lib.nixosSystem {
            system = system.x86_64-linux;
            specialArgs = {
              inherit (self.outputs) overlays;
              inherit inputs;
            };
            modules = [
              ./nixpkgs/nixos/tootsie
              ./nixpkgs/nixos/common.nix
              ./nixpkgs/nixos/tailscale.nix
              ./nixpkgs/nixos/users/chris-minimal.nix
              home-manager.nixosModules.home-manager
              {
                home-manager.useGlobalPkgs = true;
                home-manager.useUserPackages = true;
              }
            ];

Replacement in flake.nix at line 220 [10.1026]

B:BD[5.22806] → [5.22806:23055]

          markdown-linter = {
            enable = true;
            name = "markdown-linter";
            types = ["markdown"];
            language = "system";
            pass_filenames = true;
            entry = with pkgs; "${mdl}/bin/mdl -g";

[5.22806]

[5.23055]


          taz = nixpkgs.lib.nixosSystem {
            system = system.x86_64-linux;
            specialArgs = {
              inherit (self.outputs) overlays;
              inherit inputs;
            };
            modules = [
              ./nixpkgs/nixos/taz
              ./nixpkgs/nixos/common.nix
              ./nixpkgs/nixos/searx.nix
              ./nixpkgs/nixos/tailscale.nix
              ./nixpkgs/nixos/users/chris-minimal.nix
              home-manager.nixosModules.home-manager
              {
                home-manager.useGlobalPkgs = true;
                home-manager.useUserPackages = true;
              }
            ];

Deletion in flake.nix at line 241 [10.1026]
B:BD[18.5121] → [5.23069:23085]
```
      };
    };
```

Replacement in flake.nix at line 242 [10.1026]

B:BD[11.3932] → [5.23086:23148]

B:BD[5.23148] → [13.4482:4613]

∅:D[13.4613] → [5.23213:23388]

B:BD[5.23213] → [5.23213:23388]

    devShells = {
      x86_64-linux.default = pkgs.mkShell {
        shellHook =
          self.checks.x86_64-linux.pre-commit.shellHook
          + ''
            helloDotfiles
          '';
        buildInputs = with pkgs; [
          alejandra
          cachix
          helloDotfiles
          mdl
          statix
          python310Packages.mdformat
        ];

[11.3932]

[11.3943]

        darwinConfigurations.suremac = darwin.lib.darwinSystem {
          system = system.aarch64-darwin;
          modules = [./nixpkgs/darwin/suremac];
        };

Deletion in flake.nix at line 247 [10.1026]
∅:D[11.3953] → [10.2061:2068]
B:BD[10.2061] → [10.2061:2068]
B:BD[10.2068] → [5.23389:23440]
```
    };
    formatter.x86_64-linux = pkgs.alejandra;
  };
```
Deletion in flake.nix at line 248 [10.1026]
B:BD[10.2076] → [9.5774:5775]

Deletion in flake.lock at line 289 [10.2112]

B:BD[19.662] → [5.23442:23864]

      "locked": {
        "lastModified": 1644229661,
        "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
        "owner": "numtide",
        "repo": "flake-utils",
        "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
        "type": "github"
      },
      "original": {
        "owner": "numtide",
        "repo": "flake-utils",
        "type": "github"
      }
    },
    "flake-utils_4": {

Replacement in flake.lock at line 343 [10.2112]
B:BD[19.990] → [5.23865:23905]
```
        "flake-utils": "flake-utils_4",
```
[19.990]
[19.1030]
```
        "flake-utils": "flake-utils_3",
```

Replacement in flake.lock at line 372 [10.2112]

∅:D[2.4075] → [20.1143:1183]

B:BD[11.9900] → [20.1143:1183]

        "flake-utils": "flake-utils_2",

[2.4075]

[11.9938]

        "flake-utils": [
          "flake-utils"
        ],

Replacement in flake.lock at line 566 [10.2112]

B:BD[5.23950] → [5.23950:23990]

        "flake-utils": "flake-utils_3",

[5.23950]

[5.23990]

        "flake-utils": [
          "flake-utils"
        ],

Insertion in flake.lock at line 608 [10.2112]
[11.14979]
[11.14979]
```
        "flake-utils": "flake-utils_2",
```

refactor into flake-utils.eachSystem

Dependencies

In channels

Change contents

Replacement in nixpkgs/nixos/common.nix at line 10 [7.4276]

Deletion in nixpkgs/darwin/suremac/default.nix at line 1 [9.146]

Insertion in nixpkgs/darwin/suremac/default.nix at line 2 [9.146]

Replacement in nixpkgs/darwin/suremac/default.nix at line 28 [9.146]

Replacement in nixpkgs/darwin/suremac/default.nix at line 34 [9.146]

Replacement in nixpkgs/darwin/suremac/default.nix at line 50 [9.146]

Replacement in nixpkgs/darwin/suremac/default.nix at line 54 [9.146]

Replacement in nixpkgs/darwin/suremac/default.nix at line 82 [9.146]

Replacement in nixpkgs/darwin/suremac/default.nix at line 85 [9.146]

Replacement in nixpkgs/darwin/suremac/default.nix at line 117 [9.146]

Replacement in nixpkgs/darwin/suremac/default.nix at line 131 [9.146]

Deletion in nixpkgs/darwin/suremac/default.nix at line 171 [9.146]

Insertion in flake.nix at line 22 [10.1026]

Insertion in flake.nix at line 27 [10.1026]

Insertion in flake.nix at line 41 [10.1026]

Replacement in flake.nix at line 46 [10.1026]

Replacement in flake.nix at line 79 [10.1026]

Replacement in flake.nix at line 120 [10.1026]

Replacement in flake.nix at line 138 [10.1026]

Replacement in flake.nix at line 174 [10.1026]

Replacement in flake.nix at line 202 [10.1026]

Replacement in flake.nix at line 220 [10.1026]

Deletion in flake.nix at line 241 [10.1026]

Replacement in flake.nix at line 242 [10.1026]

Deletion in flake.nix at line 247 [10.1026]

Deletion in flake.nix at line 248 [10.1026]

Deletion in flake.lock at line 289 [10.2112]

Replacement in flake.lock at line 343 [10.2112]

Replacement in flake.lock at line 372 [10.2112]

Replacement in flake.lock at line 566 [10.2112]

Insertion in flake.lock at line 608 [10.2112]