Compare commits
No commits in common. "e71cbbad52db6874e0539725a3ca5cb37da3f647" and "8b3eb263a8456dc937d52609e18f655174ee1cf1" have entirely different histories.
e71cbbad52
...
8b3eb263a8
2 changed files with 10 additions and 27 deletions
|
@ -1,32 +1,16 @@
|
|||
{ pkgs, system, ... }: {
|
||||
environment = {
|
||||
# We'll use Vim globally.
|
||||
systemPackages = [
|
||||
pkgs.vim
|
||||
];
|
||||
variables.EDITOR = "${pkgs.vim}/bin/vim";
|
||||
};
|
||||
|
||||
system.activationScripts.extraActivation.text = ''
|
||||
# Remove the symlink if it doesn't already exist.
|
||||
rm -f /Library/Java/JavaVirtualMachines/zulu-latest.jdk
|
||||
|
||||
# We should only have a single JDK present within our package,
|
||||
# but let's limit `find` regardless.
|
||||
JDK_LOCATION="$(find "${pkgs.jdk}" -name "*.jdk" | head -n1)"
|
||||
|
||||
# Symlink!
|
||||
ln -sf "$JDK_LOCATION" "/Library/Java/JavaVirtualMachines/zulu-latest.jdk"
|
||||
'';
|
||||
# List packages installed in system profile. To search by name, run:
|
||||
# $ nix-env -qaP | grep wget
|
||||
environment.systemPackages = [
|
||||
pkgs.vim
|
||||
];
|
||||
|
||||
# Auto upgrade nix package and the daemon service.
|
||||
services.nix-daemon.enable = true;
|
||||
nix = {
|
||||
# Keep the latest version of Nix.
|
||||
package = pkgs.nix;
|
||||
# Necessary for using flakes on this system.
|
||||
settings.experimental-features = "nix-command flakes";
|
||||
};
|
||||
nix.package = pkgs.nix;
|
||||
|
||||
# Necessary for using flakes on this system.
|
||||
nix.settings.experimental-features = "nix-command flakes";
|
||||
|
||||
# Create /etc/zshrc that loads the nix-darwin environment.
|
||||
programs.zsh.enable = true;
|
||||
|
|
|
@ -105,8 +105,7 @@
|
|||
# System-wide configuration
|
||||
./darwin/darwin.nix
|
||||
# Our provided home-manager configuration
|
||||
home-manager.darwinModules.home-manager
|
||||
{
|
||||
home-manager.darwinModules.home-manager {
|
||||
home-manager = {
|
||||
useGlobalPkgs = true;
|
||||
useUserPackages = true;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue