From 68c5816d4d3bde233bf0815cc803fe77ac913356 Mon Sep 17 00:00:00 2001 From: Noah Masur <7386960+nmasur@users.noreply.github.com> Date: Wed, 24 Jan 2024 14:41:24 -0500 Subject: [PATCH] fixes for testing on brand new darwin system --- docs/installation.md | 17 +++++++++++------ modules/darwin/homebrew.nix | 4 ---- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/docs/installation.md b/docs/installation.md index 739e7d6..7ca77fa 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -49,19 +49,24 @@ move the `windows/alacritty.yml` file to To get started on a bare macOS installation, first install Nix: ```bash -sh -c "$(curl -L https://nixos.org/nix/install)" +curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix | sh -s -- install ``` -Then use Nix to build nix-darwin: +Launch a new shell. Then use Nix to switch to the macOS configuration: ```bash -nix-build https://github.com/LnL7/nix-darwin/archive/master.tar.gz -A installer -./result/bin/darwin-installer +sudo rm /etc/bashrc +sudo rm /etc/nix/nix.conf +nix \ + --extra-experimental-features flakes \ + --extra-experimental-features nix-command \ + run nix-darwin -- switch \ + --flake github:nmasur/dotfiles#lookingglass ``` -Then switch to the macOS configuration: +Once installed, you can continue to update the macOS configuration: ```bash -darwin-rebuild switch --flake github:nmasur/dotfiles#lookingglass +darwin-rebuild switch --flake ~/dev/personal/dotfiles ``` diff --git a/modules/darwin/homebrew.nix b/modules/darwin/homebrew.nix index 7b7059c..4a24f56 100644 --- a/modules/darwin/homebrew.nix +++ b/modules/darwin/homebrew.nix @@ -24,10 +24,6 @@ brewfile = true; # Run brew bundle from anywhere lockfiles = false; # Don't save lockfile (since running from anywhere) }; - taps = [ - "homebrew/cask" # Required for casks - "homebrew/cask-drivers" # Used for Logitech G-Hub - ]; brews = [ "trash" # Delete files and folders to trash instead of rm "openjdk" # Required by Apache Directory Studio