averageatchris/nixos-configs - Change PKUQNGARQTNWOZNQYHXVQH2UEXORRVKZZUYGXPQB3AAS6QXAWXBQC

bump flake add logout cmd (#9)

bump flake add logout cmd
quote loginctl
try building nixosConfigurations in check
remove poetry
add nix community and wayland caches

Created by Chris Cummings on June 24, 2022

PKUQNGARQTNWOZNQYHXVQH2UEXORRVKZZUYGXPQB3AAS6QXAWXBQC

Dependencies

In channels

main

Change contents

Replacement in nixpkgs/sway/keybindings.nix at line 46 [6.45]
B:BD[5.4192] → [5.4192:4233]
```
        "Shift+q" = "exec swaymsg exit";
```
[5.4192]
[5.4233]
```
        "Shift+q" = "exec logout";
```
Deletion in nixpkgs/sway/keybindings.nix at line 50 [6.45]
B:BD[5.4378] → [5.4378:4413]
```
        w = "kill; mode default;";
```

Replacement in nixpkgs/sway/keybindings.nix at line 54 [6.45]

B:BD[5.4471] → [5.4471:4628]

        "${cfg.up}" = "resize shrink width 15 px";
        "${cfg.down}" = "resize grow height 15 px";
        "${cfg.left}" = "resize shrink height 15 px";

[5.4471]

[5.4628]

        "${cfg.up}" = "resize grow height 15 px";
        "${cfg.down}" = "resize shrink height 15 px";
        "${cfg.left}" = "resize shrink width 15 px";

Replacement in nixpkgs/sway/keybindings.nix at line 58 [6.45]

B:BD[5.4680] → [5.4680:4855]

        "Shift+${cfg.up}" = "resize shrink width 45 px";
        "Shift+${cfg.down}" = "resize grow height 45 px";
        "Shift+${cfg.left}" = "resize shrink height 45 px";

[5.4680]

[5.4855]

        "Shift+${cfg.up}" = "resize grow height 45 px";
        "Shift+${cfg.down}" = "resize shrink height 45 px";
        "Shift+${cfg.left}" = "resize shrink width 45 px";

Replacement in nixpkgs/sway/keybindings.nix at line 157 [6.45]

B:BD[6.487] → [2.37:78]

    "Shift+space" = "mode compose_mode";

[6.487]

[7.6694]

    "${cfg.modifier}+alt+space" = "mode compose_mode";

Insertion in nixpkgs/shell/shell_extras.nix at line 167 [8.70]

[3.593]

    '';
  };
  logout = writeShellApplication {
    name = "logout";
    runtimeInputs = [coreutils gawk gnugrep];
    text = ''
      USER="$(whoami)" \
      loginctl kill-session \
        "$(loginctl list-sessions \
                   | grep "$USER" \
                   | awk '{ print $1 }')"

Deletion in nixpkgs/nixos/tootsie/default.nix at line 48 [10.1364]
B:BD[9.1859] → [5.12892:12933]
```
    home.packages = with pkgs; [poetry];
```

Replacement in nixpkgs/emacs/doom.d/init.el at line 94 [12.2338]

B:BD[11.963] → [11.963:1011]

               +pyright
               +poetry)

[11.963]

[12.4408]

               +pyright)

Deletion in nixpkgs/emacs/doom.d/config.el at line 11 [14.10596]
B:BD[13.88] → [13.88:158]
∅:D[13.158] → [15.99:100]
∅:D[11.1106] → [15.99:100]
B:BD[14.12937] → [15.99:100]
∅:D[15.100] → [16.472:473]
B:BD[14.12937] → [16.472:473]
```
(add-hook! python-mode
  (setq poetry-tracking-strategy 'projectile))
```
Deletion in nixpkgs/emacs/doom.d/config.el at line 21 [14.10596]
B:BD[15.287] → [15.287:348]
```
      :desc "Start poetry transient buffer" :nv "p" #'poetry
```
Deletion in nixpkgs/emacs/default.nix at line 17 [14.12973]
B:BD[11.1279] → [11.1279:1295]
```
    pkgs.poetry
```

Insertion in flake.nix at line 54 [17.1026]

[5.19946]

    };
    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;
        }
      ];
    };
    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;
        }
      ];
    };
    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;
        }
      ];

Replacement in flake.nix at line 126 [17.1026]

B:BD[5.20091] → [5.20091:22226]

      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;
          }
        ];
      };
      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;
          }
        ];
      };
      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;
          }
        ];
      };

[5.20091]

[5.22226]

      inherit thelio-nixos xps-nixos tootsie;

Replacement in flake.lock at line 5 [17.2112]

B:BD[18.498] → [4.279:389]

        "lastModified": 1654906507,
        "narHash": "sha256-EmTiGePNSPgf/Cx0CiKopy2xet9faU6tQG7VhinxgrM=",

[18.498]

[18.608]

        "lastModified": 1655946012,
        "narHash": "sha256-+QmcvgnRmGPbAlCIOAVHggIMH2GE7w76EI17jYDTmHc=",

Replacement in flake.lock at line 9 [17.2112]

B:BD[18.661] → [4.390:449]

        "rev": "d9be95a45f8ae428aaa6e78e874ba6f3100ed38a",

[18.661]

[18.720]

        "rev": "3aad50c30c826430b0270fcf8264c8c41b005403",

Replacement in flake.lock at line 60 [17.2112]

B:BD[19.4913] → [4.450:560]

        "lastModified": 1655032304,
        "narHash": "sha256-t0E7c7V+hk6ILXl4+TBLqQfqq8/4IKyb/cFg0a8mqI8=",

[19.4913]

[19.5023]

        "lastModified": 1656009808,
        "narHash": "sha256-ZKJAaJun8JJdrBwb6i6gBZG4sI26kYlQ+OBfLUm4Tpc=",

Replacement in flake.lock at line 64 [17.2112]

B:BD[19.5090] → [4.561:620]

        "rev": "a73897fc387a83c8dd2142ed597041113954ec23",

[19.5090]

[19.5149]

        "rev": "c5fb32efa5d3d44b9f36a994c2a0cedae80ab9ab",

Replacement in flake.lock at line 289 [17.2112]

B:BD[19.9117] → [4.1535:1645]

        "lastModified": 1654628474,
        "narHash": "sha256-Llm9X8Af15uC9IMStxqjCfO15WgYTqTnsQq8wMcpp5Q=",

[19.9117]

[20.1013]

        "lastModified": 1655928858,
        "narHash": "sha256-qVOcb7WVDiqs2yseZwCZRsKT0be8bF3NZufdBZVvZXU=",

Replacement in flake.lock at line 293 [17.2112]

B:BD[19.9293] → [4.1646:1705]

        "rev": "70824bb5c790b820b189f62f643f795b1d2ade2e",

[19.9293]

[19.9352]

        "rev": "e622bad16372aa5ada79a7fa749ec78715dffc54",

Replacement in flake.lock at line 308 [17.2112]

B:BD[21.1094] → [4.1706:1816]

        "lastModified": 1654430953,
        "narHash": "sha256-WwTJ98qr9SLobV4RcaGII+ERzPiwP9u/7EOHMp7BFok=",

[21.1094]

[21.1204]

        "lastModified": 1655640547,
        "narHash": "sha256-Kvw69uR8dzP51jjsWW53ksu6AelBbqUtUpY8OApDfW4=",

Replacement in flake.lock at line 312 [17.2112]

B:BD[21.1271] → [4.1817:1876]

        "rev": "b87027ce25d164c19bbf4bb0a38ae2e4f7558b8d",

[21.1271]

[19.9472]

        "rev": "f42242395d06c2be077f5ab7c6cd3ce22f8ed141",

Replacement in flake.lock at line 379 [17.2112]

B:BD[19.11248] → [4.1877:1987]

        "lastModified": 1654057797,
        "narHash": "sha256-mXo7C4v7Jj2feBzcReu1Eu/3Rnw5b023E9kOyFsHZQw=",

[19.11248]

[19.11358]

        "lastModified": 1655789751,
        "narHash": "sha256-DbL2gn7YwkuX10OdlWfZ/A7zEJztwHh9NMeau1JMTdk=",

Replacement in flake.lock at line 383 [17.2112]

B:BD[19.11418] → [4.1988:2047]

        "rev": "0cab18a48de7914ef8cad35dca0bb36868f3e1af",

[19.11418]

[19.11477]

        "rev": "f9d8dff4e621f2d7f2b84d9e84bc6359715f971c",

Replacement in flake.lock at line 394 [17.2112]

B:BD[17.2163] → [4.2048:2158]

        "lastModified": 1654953433,
        "narHash": "sha256-TwEeh4r50NdWHFAHQSyjCk2cZxgwUfcCCAJOhPdXB28=",

[17.2163]

[17.2273]

        "lastModified": 1655895887,
        "narHash": "sha256-AbihSVmPKFcQmaVgzNSLQ8sLAaVTTELPSzZ+/gRVfyk=",

Replacement in flake.lock at line 398 [17.2112]

B:BD[17.2326] → [4.2159:2218]

        "rev": "90cd5459a1fd707819b9a3fb9c852beaaac3b79a",

[17.2326]

[17.2385]

        "rev": "e1e08fe28bf0588a41cd556eac40b98d2793da99",

Replacement in flake.lock at line 410 [17.2112]

B:BD[21.1703] → [4.2219:2329]

        "lastModified": 1654390539,
        "narHash": "sha256-TRg9Q+oqua0hy/LpHLnE+RFklc4FPZZRZwqLEbc0gBo=",

[21.1703]

[21.1813]

        "lastModified": 1655599917,
        "narHash": "sha256-kjZbt5WdTrnjMxL79okg9TCoRUdADG50x/TWozbyTsE=",

Replacement in flake.lock at line 414 [17.2112]

B:BD[21.1878] → [4.2330:2389]

        "rev": "df6d865904611bb9f5d7a0aff18fe4b52db14b33",

[21.1878]

[17.2522]

        "rev": "5fb55578aa2f1a502d636a8ac71aece57cb730bb",

Replacement in flake.lock at line 427 [17.2112]

B:BD[4.2479] → [4.2479:2553]

        "narHash": "sha256-8nc7lcYOgih3YEmRMlBwZaLLJYpLPYKBlewqHqx8ieg=",

[4.2479]

[4.2553]

        "narHash": "sha256-RNLq09vfj21TyYuUCeD6BNTNC6Ew8bLhQULZytN4Xx8=",

Replacement in flake.lock at line 430 [17.2112]

B:BD[4.2602] → [4.2602:2661]

        "rev": "9e7a20e6ee3f6751f699f79c0b299390f81f7bcd",

[4.2602]

[4.2661]

        "rev": "91dee681dd1c478d6040a00835d73c0f4a4c5c29",

Replacement in flake.lock at line 559 [17.2112]

B:BD[5.24068] → [5.24068:24178]

        "lastModified": 1652714503,
        "narHash": "sha256-qQKVEfDe5FqvGgkZtg5Pc491foeiDPIOeycHMqnPDps=",

[5.24068]

[5.24178]

        "lastModified": 1655906603,
        "narHash": "sha256-wwyJc0VPm7NQlQRspMrFFQQak1hHJwRfcNgGTL2onDA=",

Replacement in flake.lock at line 563 [17.2112]

B:BD[5.24245] → [5.24245:24304]

        "rev": "521a524771a8e93caddaa0ac1d67d03766a8b0b3",

[5.24245]

[5.24304]

        "rev": "b7a131d06a23b02ab8eaa12d249d282f3590cbf9",

Replacement in flake.lock at line 657 [17.2112]

B:BD[18.1163] → [4.3677:3787]

        "lastModified": 1655025336,
        "narHash": "sha256-ReKL9Nj7JgNAZVrvH5XCAs3xSDXDft/vpc6mbiQQUAE=",

[18.1163]

[18.1273]

        "lastModified": 1656010183,
        "narHash": "sha256-P2mP92EbAyaxay6iODyiwqd9mJLZL5u/wvdtetlQBN8=",

Replacement in flake.lock at line 661 [17.2112]

B:BD[18.1342] → [4.3788:3847]

        "rev": "9c2868e7ed6da014bdeb75ea68717bc8fe0c40b6",

[18.1342]

[19.15527]

        "rev": "757ae220a543431c43eedef59fe393e9713b3030",

Insertion in .github/workflows/test.yaml at line 16 [22.294]

[22.595]

      with:
        extra_nix_config: |
          access-tokens = github.com=${{ secrets.REPO_TOKEN }}

Replacement in .github/workflows/test.yaml at line 23 [22.294]

B:BD[22.734] → [23.327:415]

    - run: nix flake check --extra-access-tokens github.com='${{ secrets.REPO_TOKEN }}'

[22.734]

        extraPullNames: nix-community, nixpkgs-wayland
    - run: nix build .#nixosConfigurations.thelio-nixos.config.system.build.toplevel
    - run: nix build .#nixosConfigurations.xps-nixos.config.system.build.toplevel
    - run: nix build .#nixosConfigurations.tootsie.config.system.build.toplevel
    - run: nix flake check