Compare commits

..

No commits in common. "3986842287f718b58f26b0f73ec8191e10d4474e" and "9891755ed99791a439ea0becea1c7af4937a1097" have entirely different histories.

2 changed files with 12 additions and 18 deletions

View File

@ -21,9 +21,6 @@
# Auto upgrade nix package and the daemon service. # Auto upgrade nix package and the daemon service.
services.nix-daemon.enable = true; services.nix-daemon.enable = true;
nix.package = pkgs.nix; nix.package = pkgs.nix;
nix.extraOptions = ''
experimental-features = nix-command flakes
'';
nix.distributedBuilds = true; nix.distributedBuilds = true;
nix.buildMachines = [{ nix.buildMachines = [{
@ -66,16 +63,14 @@
}; };
}; };
system.activationScripts.applications.text = pkgs.lib.mkForce ( system.activationScripts.applications.text = pkgs.lib.mkForce (''
''
rm -rf /Applications/Nix rm -rf /Applications/Nix
mkdir -p /Applications/Nix mkdir -p /Applications/Nix
for app in $(find ${config.system.build.applications}/Applications -maxdepth 1 -type l); do for app in $(find ${config.system.build.applications}/Applications -maxdepth 1 -type l); do
src="$(/usr/bin/stat -f%Y "$app")" src="$(/usr/bin/stat -f%Y "$app")"
cp -r "$src" /Applications/Nix cp -r "$src" /Applications/Nix
done done
'' '');
);
# Used for backwards compatibility, please read the changelog before changing. # Used for backwards compatibility, please read the changelog before changing.
# $ darwin-rebuild changelog # $ darwin-rebuild changelog

View File

@ -16,7 +16,6 @@
home.packages = with pkgs; [ home.packages = with pkgs; [
direnv direnv
exa
fd fd
git git
gitAndTools.gh gitAndTools.gh
@ -71,10 +70,10 @@
EDITOR = "vim"; EDITOR = "vim";
GOPATH = "$HOME/.go"; GOPATH = "$HOME/.go";
}; };
shellAliases = {
ls = "exa --git";
ll = "exa -lh --git";
}; };
dircolors = {
enable = true;
enableZshIntegration = true;
}; };
starship = { starship = {
enable = true; enable = true;