fix nix version again

fspv · Dec 20, 2024 · d543129 · d543129
1 parent 3b38d11
commit d543129
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 17 deletions.
diff --git a/.config/nix/dev.nix b/.config/nix/dev.nix
@@ -3,8 +3,7 @@
 { pkgs ? import <nixpkgs> {} }:
 
 let
-  # Also change .github/workflows/*.yml and ~/.local/share/bin/init-user-env.sh
-  # when changing this
+  # Also change ~/.local/share/bin/init-nix.sh
   stablePkgs = import (fetchTarball "https://github.com/nixos/nixpkgs/archive/nixos-24.11.tar.gz") {
     # You can include overlays here https://nixos.wiki/wiki/Overlays
     overlays = [

diff --git a/.github/workflows/nix-docker-build.yml b/.github/workflows/nix-docker-build.yml
@@ -22,10 +22,7 @@ jobs:
         uses: cachix/install-nix-action@v27
       - name: Build Docker image
         run: |
-          # Also change .config/nix/*.nix and
-          # ~/.local/share/bin/init-user-env.sh when changing the channel
-          nix-channel --add https://nixos.org/channels/nixos-24.11 nixpkgs
-          nix-channel --update
+          ./.local/share/bin/init-nix.sh
           nix-build .config/nix/docker.nix
       - name: Load Docker image
         run: |

diff --git a/.github/workflows/nix-shell.yml b/.github/workflows/nix-shell.yml
@@ -22,8 +22,7 @@ jobs:
         run: nix-collect-garbage -d
       - name: Init user env
         run: |
-          nix-channel --add https://nixos.org/channels/nixos-24.05 nixpkgs
-          nix-channel --update
+          ./.local/share/bin/init-nix.sh
           ./.local/share/bin/init-user-env.sh
       - name: Install dependencies
         run: |
@@ -49,8 +48,7 @@ jobs:
         run: nix-collect-garbage -d
       - name: Init user env
         run: |
-          nix-channel --add https://nixos.org/channels/nixos-24.05 nixpkgs
-          nix-channel --update
+          ./.local/share/bin/init-nix.sh
           ./.local/share/bin/init-user-env.sh
       - name: Install dependencies
         run: |
@@ -76,8 +74,7 @@ jobs:
         run: nix-collect-garbage -d
       - name: Init user env
         run: |
-          nix-channel --add https://nixos.org/channels/nixos-24.05 nixpkgs
-          nix-channel --update
+          ./.local/share/bin/init-nix.sh
           ./.local/share/bin/init-user-env.sh
       - name: Install dependencies
         run: |
@@ -101,8 +98,7 @@ jobs:
   #       uses: cachix/install-nix-action@v27
   #     - name: Init user env
   #       run: |
-  #         nix-channel --add https://nixos.org/channels/nixos-24.05 nixpkgs
-  #         nix-channel --update
+  #          ./.local/share/bin/init-nix.sh
   #         nix-shell .config/nix/dev.nix --run ./.local/share/bin/init-user-env.sh
   #     - name: Install dependencies
   #       run: |

diff --git a/.local/share/bin/init-nix.sh b/.local/share/bin/init-nix.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -uex
+
+# Also change .config/nix/*.nix when changing the version
+nix-channel --add https://nixos.org/channels/nixos-24.11 nixpkgs
+nix-channel --update
diff --git a/.local/share/bin/init-user-env.sh b/.local/share/bin/init-user-env.sh
@@ -50,9 +50,7 @@ then
     flatpak install -y --user flathub org.wezfurlong.wezterm
 fi
 
-# Also change .github/workflows/*.yml and .config/nix/*.nix when changing the version
-nix-channel --add https://nixos.org/channels/nixos-24.11 nixpkgs
-nix-channel --update
+${HOME}/.local/share/bin/init-nix.sh
 
 if [ "$(uname -m)" = "x86_64" ]; then
     # Not all plugins are available on aarch64 and kubectl is not really needed there now