From f763dc381f83963da57d1e9173cf01588a2049fb Mon Sep 17 00:00:00 2001 From: Jeremy Wall Date: Thu, 18 Jan 2024 09:27:19 -0500 Subject: [PATCH] Set vi line editing and some additional nix options --- nix/base-system/.zshrc | 1 + nix/darwin/darwin-configuration.nix | 6 +++++- nix/darwin/flake.lock | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/nix/base-system/.zshrc b/nix/base-system/.zshrc index 153214f..cb4e2c1 100644 --- a/nix/base-system/.zshrc +++ b/nix/base-system/.zshrc @@ -1,3 +1,4 @@ +set -o vi export PROMPT='%F{green}[%T] %F{cyan}(%n@%m) %F{lightgrey}(%y) %F{cyan} %~ %F{white}%(!.>>.$>) ' diff --git a/nix/darwin/darwin-configuration.nix b/nix/darwin/darwin-configuration.nix index 53b93e0..cdd34ed 100644 --- a/nix/darwin/darwin-configuration.nix +++ b/nix/darwin/darwin-configuration.nix @@ -6,7 +6,8 @@ # SEE: https://github.com/NixOS/nix/issues/4119#issuecomment-1734738812 settings.sandbox = "relaxed"; extraOptions = '' - experimental-features = nix-command flakes + experimental-features = nix-command flakes repl-flake + extra-platforms = x86_64-darwin aarch64-darwin x86_64-linux ''; }; @@ -53,6 +54,9 @@ # programs.bash.enable = true; # default shell on catalina # programs.fish.enable = true; + system.defaults = { + finder.AppleShowAllExtensions = true; + }; system.systemBuilderArgs = lib.mkIf (config.nix.settings.sandbox == "relaxed") { sandboxProfile = '' (allow file-read* file-write* process-exec mach-lookup (subpath "${builtins.storeDir}")) diff --git a/nix/darwin/flake.lock b/nix/darwin/flake.lock index 0638e49..d0fdb2e 100644 --- a/nix/darwin/flake.lock +++ b/nix/darwin/flake.lock @@ -38,11 +38,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-VDkul+Z32T3/AhU5fY7Wtaf7n6U3WOPFG63Z7lL2WjQ=", - "path": "/nix/store/ljim4cw8ldrl6azj7kwmy2fa0vgnhgm6-source/nix/base-system", + "path": "/nix/store/4dzkjjnaj1wf796hms09nnqfr3d7w1zf-source/nix/base-system", "type": "path" }, "original": { - "path": "/nix/store/ljim4cw8ldrl6azj7kwmy2fa0vgnhgm6-source/nix/base-system", + "path": "/nix/store/4dzkjjnaj1wf796hms09nnqfr3d7w1zf-source/nix/base-system", "type": "path" } },