From 10add30249eaac449be623c4a6c61e64fc42235b Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Sat, 30 Apr 2022 11:58:50 -0400 Subject: [PATCH] Fix Makefile --- Makefile | 8 ++++---- README.md | 12 ++---------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index de75a3d..dfa8f71 100644 --- a/Makefile +++ b/Makefile @@ -3,16 +3,16 @@ HOSTNAME := $(shell hostname -s) all: if [[ "`uname`" == 'Darwin' ]]; then \ echo macOS; \ - make macos; \ + make macos-system; \ else \ echo NixOS; \ - make nixos; \ + make nixos-system; \ fi -nixos: +nixos-system: sudo nixos-rebuild switch -j auto -macos: +macos-system: sudo ls # cache sudo # The `TERM` needs to be set to workaround kitty issue: `tput: unknown terminal "xterm-kitty"` TERM=xterm $$(nix build --extra-experimental-features "flakes nix-command" .#darwinConfigurations.$(HOSTNAME).system --no-link --json | nix --extra-experimental-features "flakes nix-command" run ${WITHEXP} nixpkgs#jq -- -r '.[].outputs.out')/sw/bin/darwin-rebuild switch --flake . diff --git a/README.md b/README.md index 9594efe..214dc00 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,9 @@ This repository contains the Nix / NixOS configuration for all of my systems. Start from `flakes.nix` (see [Flakes](https://nixos.wiki/wiki/Flakes)). -## Platforms - -### NixOS +To build, ```sh-session -make nixos # Or, just `make` -``` - -### macOS - -```sh-session -make darwin # Or, just `make` +make ``` ## Install notes