mirror of
https://github.com/LnL7/nix-darwin.git
synced 2024-12-14 11:57:34 +00:00
treewide: remove nix.package
example
This commit is contained in:
parent
6d794390fa
commit
7918e24e5b
4 changed files with 4 additions and 13 deletions
8
.github/workflows/test.yml
vendored
8
.github/workflows/test.yml
vendored
|
@ -55,7 +55,7 @@ jobs:
|
||||||
|
|
||||||
nixConfHash=$(shasum -a 256 /etc/nix/nix.conf | cut -d ' ' -f 1)
|
nixConfHash=$(shasum -a 256 /etc/nix/nix.conf | cut -d ' ' -f 1)
|
||||||
/usr/bin/sed -i.bak \
|
/usr/bin/sed -i.bak \
|
||||||
"s/# nix.package = pkgs.nix;/nix.settings.access-tokens = [ \"github.com=\${{ secrets.GITHUB_TOKEN }}\" ]; environment.etc.\"nix\/nix.conf\".knownSha256Hashes = [ \"$nixConfHash\" ];/" \
|
"s/# programs.fish.enable = true;/nix.settings.access-tokens = [ \"github.com=\${{ secrets.GITHUB_TOKEN }}\" ]; environment.etc.\"nix\/nix.conf\".knownSha256Hashes = [ \"$nixConfHash\" ];/" \
|
||||||
~/.nixpkgs/darwin-configuration.nix
|
~/.nixpkgs/darwin-configuration.nix
|
||||||
|
|
||||||
nix-shell -A installer
|
nix-shell -A installer
|
||||||
|
@ -103,7 +103,7 @@ jobs:
|
||||||
|
|
||||||
nixConfHash=$(shasum -a 256 /etc/nix/nix.conf | cut -d ' ' -f 1)
|
nixConfHash=$(shasum -a 256 /etc/nix/nix.conf | cut -d ' ' -f 1)
|
||||||
/usr/bin/sed -i.bak \
|
/usr/bin/sed -i.bak \
|
||||||
"s/# nix.package = pkgs.nix;/nix.settings.access-tokens = [ \"github.com=\${{ secrets.GITHUB_TOKEN }}\" ]; environment.etc.\"nix\/nix.conf\".knownSha256Hashes = [ \"$nixConfHash\" ];/" \
|
"s/# programs.fish.enable = true;/nix.settings.access-tokens = [ \"github.com=\${{ secrets.GITHUB_TOKEN }}\" ]; environment.etc.\"nix\/nix.conf\".knownSha256Hashes = [ \"$nixConfHash\" ];/" \
|
||||||
~/.nixpkgs/darwin-configuration.nix
|
~/.nixpkgs/darwin-configuration.nix
|
||||||
|
|
||||||
nix-shell -A installer
|
nix-shell -A installer
|
||||||
|
@ -145,7 +145,7 @@ jobs:
|
||||||
nix flake init -t $darwin
|
nix flake init -t $darwin
|
||||||
nixConfHash=$(shasum -a 256 /etc/nix/nix.conf | cut -d ' ' -f 1)
|
nixConfHash=$(shasum -a 256 /etc/nix/nix.conf | cut -d ' ' -f 1)
|
||||||
/usr/bin/sed -i.bak \
|
/usr/bin/sed -i.bak \
|
||||||
"s/# nix.package = pkgs.nix;/nix.settings.access-tokens = [ \"github.com=\${{ secrets.GITHUB_TOKEN }}\" ]; environment.etc.\"nix\/nix.conf\".knownSha256Hashes = [ \"$nixConfHash\" ];/" \
|
"s/# programs.fish.enable = true;/nix.settings.access-tokens = [ \"github.com=\${{ secrets.GITHUB_TOKEN }}\" ]; environment.etc.\"nix\/nix.conf\".knownSha256Hashes = [ \"$nixConfHash\" ];/" \
|
||||||
flake.nix
|
flake.nix
|
||||||
popd
|
popd
|
||||||
nix run .#darwin-rebuild -- \
|
nix run .#darwin-rebuild -- \
|
||||||
|
@ -178,7 +178,7 @@ jobs:
|
||||||
nix flake init -t $darwin
|
nix flake init -t $darwin
|
||||||
nixConfHash=$(shasum -a 256 /etc/nix/nix.conf | cut -d ' ' -f 1)
|
nixConfHash=$(shasum -a 256 /etc/nix/nix.conf | cut -d ' ' -f 1)
|
||||||
/usr/bin/sed -i.bak \
|
/usr/bin/sed -i.bak \
|
||||||
"s/# nix.package = pkgs.nix;/nix.settings.access-tokens = [ \"github.com=\${{ secrets.GITHUB_TOKEN }}\" ]; environment.etc.\"nix\/nix.conf\".knownSha256Hashes = [ \"$nixConfHash\" ];/" \
|
"s/# programs.fish.enable = true;/nix.settings.access-tokens = [ \"github.com=\${{ secrets.GITHUB_TOKEN }}\" ]; environment.etc.\"nix\/nix.conf\".knownSha256Hashes = [ \"$nixConfHash\" ];/" \
|
||||||
flake.nix
|
flake.nix
|
||||||
popd
|
popd
|
||||||
nix run .#darwin-rebuild -- \
|
nix run .#darwin-rebuild -- \
|
||||||
|
|
|
@ -66,9 +66,6 @@ Configuration lives in `~/.nixpkgs/darwin-configuration.nix`. Check out
|
||||||
environment.systemPackages =
|
environment.systemPackages =
|
||||||
[ pkgs.vim
|
[ pkgs.vim
|
||||||
];
|
];
|
||||||
|
|
||||||
# Auto upgrade nix package and the daemon service.
|
|
||||||
nix.package = pkgs.nix;
|
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
|
@ -16,9 +16,6 @@
|
||||||
[ pkgs.vim
|
[ pkgs.vim
|
||||||
];
|
];
|
||||||
|
|
||||||
# Auto upgrade nix package and the daemon service.
|
|
||||||
# nix.package = pkgs.nix;
|
|
||||||
|
|
||||||
# Necessary for using flakes on this system.
|
# Necessary for using flakes on this system.
|
||||||
nix.settings.experimental-features = "nix-command flakes";
|
nix.settings.experimental-features = "nix-command flakes";
|
||||||
|
|
||||||
|
|
|
@ -11,9 +11,6 @@
|
||||||
# $ darwin-rebuild switch -I darwin-config=$HOME/.config/nixpkgs/darwin/configuration.nix
|
# $ darwin-rebuild switch -I darwin-config=$HOME/.config/nixpkgs/darwin/configuration.nix
|
||||||
# environment.darwinConfig = "$HOME/.config/nixpkgs/darwin/configuration.nix";
|
# environment.darwinConfig = "$HOME/.config/nixpkgs/darwin/configuration.nix";
|
||||||
|
|
||||||
# Auto upgrade nix package and the daemon service.
|
|
||||||
# nix.package = pkgs.nix;
|
|
||||||
|
|
||||||
# Enable alternative shell support in nix-darwin.
|
# Enable alternative shell support in nix-darwin.
|
||||||
# programs.fish.enable = true;
|
# programs.fish.enable = true;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue