diff --git a/CHANGELOG b/CHANGELOG index 74591ef..e64e013 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -209,7 +209,7 @@ Use a channel for nix-darwin or configure nix.nixPath - sudo nix-channel --add https://github.com/LnL7/nix-darwin/archive/master.tar.gz darwin + sudo nix-channel --add https://github.com/nix-darwin/nix-darwin/archive/master.tar.gz darwin sudo nix-channel --update nix.nixPath = diff --git a/README.md b/README.md index 8c8fb73..24ce05f 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -[logo](https://github.com/LnL7/nix-darwin) +[logo](https://github.com/nix-darwin/nix-darwin) # nix-darwin -[![Test](https://github.com/LnL7/nix-darwin/actions/workflows/test.yml/badge.svg)](https://github.com/LnL7/nix-darwin/actions/workflows/test.yml) +[![Test](https://github.com/nix-darwin/nix-darwin/actions/workflows/test.yml/badge.svg)](https://github.com/nix-darwin/nix-darwin/actions/workflows/test.yml) Nix modules for darwin, `/etc/nixos/configuration.nix` for macOS. @@ -73,8 +73,8 @@ Add the following to `flake.nix` in the same folder as `configuration.nix`: inputs = { # Use `github:NixOS/nixpkgs/nixpkgs-24.11-darwin` to use Nixpkgs 24.11. nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - # Use `github:LnL7/nix-darwin/nix-darwin-24.11` to use Nixpkgs 24.11. - nix-darwin.url = "github:LnL7/nix-darwin/master"; + # Use `github:nix-darwin/nix-darwin/nix-darwin-24.11` to use Nixpkgs 24.11. + nix-darwin.url = "github:nix-darwin/nix-darwin/master"; nix-darwin.inputs.nixpkgs.follows = "nixpkgs"; }; @@ -142,9 +142,9 @@ Copy the [simple](./modules/examples/simple.nix) example to `/etc/nix-darwin/con ```bash # If you use Nixpkgs unstable (the default): -sudo nix-channel --add https://github.com/LnL7/nix-darwin/archive/master.tar.gz darwin +sudo nix-channel --add https://github.com/nix-darwin/nix-darwin/archive/master.tar.gz darwin # If you use Nixpkgs 24.11: -sudo nix-channel --add https://github.com/LnL7/nix-darwin/archive/nix-darwin-24.11.tar.gz darwin +sudo nix-channel --add https://github.com/nix-darwin/nix-darwin/archive/nix-darwin-24.11.tar.gz darwin sudo nix-channel --update ``` @@ -177,7 +177,7 @@ sudo nix-channel --update ## Documentation -`darwin-help` will open up a local copy of the reference documentation, it can also be found online [here](https://daiderd.com/nix-darwin/manual/index.html). +`darwin-help` will open up a local copy of the reference documentation, it can also be found online [here](https://nix-darwin.github.io/nix-darwin/manual/index.html). The documentation is also available as manpages by running `man 5 configuration.nix`. diff --git a/doc/manual/default.nix b/doc/manual/default.nix index ef4b64d..3d0e7a4 100644 --- a/doc/manual/default.nix +++ b/doc/manual/default.nix @@ -30,7 +30,7 @@ let declarations = map (decl: if lib.hasPrefix (toString prefix) (toString decl) then - gitHubDeclaration "LnL7" "nix-darwin" revision + gitHubDeclaration "nix-darwin" "nix-darwin" revision (lib.removePrefix "/" (lib.removePrefix (toString prefix) (toString decl))) # TODO: handle this in a better way (may require upstream diff --git a/eval-config.nix b/eval-config.nix index 71e70ac..f50966f 100644 --- a/eval-config.nix +++ b/eval-config.nix @@ -37,7 +37,7 @@ assert enableNixpkgsReleaseCheck -> checkRelease lib || throw '' inputs = { nixpkgs.url = "github:NixOS/nixpkgs/NIXPKGS-BRANCH"; - nix-darwin.url = "github:LnL7/nix-darwin/NIX-DARWIN-BRANCH"; + nix-darwin.url = "github:nix-darwin/nix-darwin/NIX-DARWIN-BRANCH"; nix-darwin.inputs.nixpkgs.follows = "nixpkgs"; # … }; @@ -46,7 +46,7 @@ assert enableNixpkgsReleaseCheck -> checkRelease lib || throw '' $ sudo nix-channel --list nixpkgs https://nixos.org/channels/NIXPKGS-BRANCH - darwin https://github.com/LnL7/nix-darwin/archive/NIX-DARWIN-BRANCH.tar.gz + darwin https://github.com/nix-darwin/nix-darwin/archive/NIX-DARWIN-BRANCH.tar.gz … $ nix-channel --list … @@ -58,12 +58,12 @@ assert enableNixpkgsReleaseCheck -> checkRelease lib || throw '' You can then fix your channels like this: $ sudo nix-channel --add https://nixos.org/channels/NIXPKGS-BRANCH nixpkgs - $ sudo nix-channel --add https://github.com/LnL7/nix-darwin/archive/NIX-DARWIN-BRANCH.tar.gz darwin + $ sudo nix-channel --add https://github.com/nix-darwin/nix-darwin/archive/NIX-DARWIN-BRANCH.tar.gz darwin $ sudo nix-channel --update After that, activating your system again should work correctly. If it doesn’t, please open an issue at - and include as much + and include as much information as possible. ''; diff --git a/modules/examples/flake/flake.nix b/modules/examples/flake/flake.nix index 447c468..db65b12 100644 --- a/modules/examples/flake/flake.nix +++ b/modules/examples/flake/flake.nix @@ -3,7 +3,7 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - nix-darwin.url = "github:LnL7/nix-darwin/master"; + nix-darwin.url = "github:nix-darwin/nix-darwin/master"; nix-darwin.inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/modules/system/checks.nix b/modules/system/checks.nix index 6afe796..47835ac 100644 --- a/modules/system/checks.nix +++ b/modules/system/checks.nix @@ -170,7 +170,7 @@ let if ! test -e "$darwinPath"; then echo "error: Changed but target does not exist, aborting activation" >&2 echo "Add the darwin repo as a channel or set nix.nixPath:" >&2 - echo "$ sudo nix-channel --add https://github.com/LnL7/nix-darwin/archive/master.tar.gz darwin" >&2 + echo "$ sudo nix-channel --add https://github.com/nix-darwin/nix-darwin/archive/master.tar.gz darwin" >&2 echo "$ sudo nix-channel --update" >&2 echo >&2 echo "or set" >&2