diff options
| author | Michael Hoang <enzime@users.noreply.github.com> | 2024-11-17 02:51:42 +1100 |
|---|---|---|
| committer | Michael Hoang <enzime@users.noreply.github.com> | 2024-11-21 11:07:47 +1100 |
| commit | 65ea368ebbed4fa52a1a59fcb06848c49b310c9c (patch) | |
| tree | 0ec80ce72f40896cbebe2ed6ee8afd01dd3515e3 | |
| parent | 9a1bea70d5728a19ee0a090dc0bcdeb73f09b7a4 (diff) | |
installer: move channel creation to README
| -rw-r--r-- | .github/workflows/test.yml | 6 | ||||
| -rw-r--r-- | README.md | 16 | ||||
| -rw-r--r-- | pkgs/darwin-installer/default.nix | 14 |
3 files changed, 13 insertions, 23 deletions
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 90bd6fd..73a3fb7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -41,8 +41,9 @@ jobs: with: install_url: https://releases.nixos.org/nix/nix-2.18.8/install nix_path: nixpkgs=channel:${{ env.CURRENT_STABLE_CHANNEL }} - - name: Install ${{ env.CURRENT_STABLE_CHANNEL }} channel + - name: Install channels run: | + nix-channel --add https://github.com/LnL7/nix-darwin/archive/master.tar.gz darwin nix-channel --add https://nixos.org/channels/${{ env.CURRENT_STABLE_CHANNEL }} nixpkgs nix-channel --update - name: Install nix-darwin and test @@ -87,8 +88,9 @@ jobs: with: install_url: https://releases.nixos.org/nix/nix-2.24.9/install nix_path: nixpkgs=channel:nixpkgs-unstable - - name: Install nixpkgs-unstable channel + - name: Install channels run: | + nix-channel --add https://github.com/LnL7/nix-darwin/archive/master.tar.gz darwin nix-channel --add https://nixos.org/channels/nixpkgs-unstable nixpkgs nix-channel --update - name: Install nix-darwin and test @@ -119,24 +119,26 @@ nix-darwin.lib.darwinSystem { Copy the [simple](./modules/examples/simple.nix) example to `~/.config/nix-darwin/configuration.nix`. -### Step 2. Installing `nix-darwin` +### Step 2. Adding `nix-darwin` channel + +```bash +nix-channel --add https://github.com/LnL7/nix-darwin/archive/master.tar.gz darwin +nix-channel --update +``` + +### Step 3. Installing `nix-darwin` ```bash nix-build https://github.com/LnL7/nix-darwin/archive/master.tar.gz -A installer ./result/bin/darwin-installer ``` -### Step 3. Updating `nix-darwin` - -The installer will configure a channel for this repository. +### Step 4. Updating `nix-darwin` ```bash nix-channel --update darwin darwin-rebuild changelog ``` - -> NOTE: If you are using Nix as a daemon service the channel for that will be owned by root. -> Use `sudo -i nix-channel --update darwin` instead. </details> ## Documentation diff --git a/pkgs/darwin-installer/default.nix b/pkgs/darwin-installer/default.nix index 0eed518..630c5bf 100644 --- a/pkgs/darwin-installer/default.nix +++ b/pkgs/darwin-installer/default.nix @@ -47,20 +47,6 @@ stdenv.mkDerivation { echo >&2 "Installing nix-darwin..." echo >&2 - i=y - darwinPath=$(NIX_PATH=$HOME/.nix-defexpr/channels nix-instantiate --eval -E '<darwin>' 2> /dev/null) || true - if ! test -e "$darwinPath"; then - if test -t 0; then - read -p "Would you like to manage <darwin> with nix-channel? [y/N] " i - fi - case "$i" in - y|Y) - nix-channel --add https://github.com/LnL7/nix-darwin/archive/master.tar.gz darwin - nix-channel --update - ;; - esac - fi - export NIX_PATH=${nixPath} system=$(nix-build '<darwin>' -A system --no-out-link --show-trace) |