From 1cdde3408460f062024607a559a9c24b04cdb4a2 Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Wed, 25 Jan 2023 21:17:24 -0600 Subject: [PATCH] switches --- .task.cfg.mk | 4 ++++ Makefile | 20 +++++++------------- hosts/jeran/configuration.nix | 1 + 3 files changed, 12 insertions(+), 13 deletions(-) create mode 100644 .task.cfg.mk diff --git a/.task.cfg.mk b/.task.cfg.mk new file mode 100644 index 0000000..fb99236 --- /dev/null +++ b/.task.cfg.mk @@ -0,0 +1,4 @@ +PHONIFY = 1 +USAGE := {a.style('==>','bold')} {a.style('flakes ftw','header')} {a.style('<==','bold')}\n +-include .task.mk +$(if $(wildcard .task.mk),,.task.mk: ; curl -fsSL https://raw.githubusercontent.com/daylinmorgan/task.mk/v23.1.1/task.mk -o .task.mk) diff --git a/Makefile b/Makefile index a0ad729..b7d3d18 100644 --- a/Makefile +++ b/Makefile @@ -1,16 +1,10 @@ -boot: - sudo nixos-rebuild boot --flake . - -## switch | perform nixos rebuild -switch: - sudo nixos-rebuild switch --flake . - -## lint | format *.nix -lint: +lint: ## format *.nix nixpkgs-fmt . -.PHONY: lint switch boot +boot: ## evaluate flake for next boot + sudo nixos-rebuild boot --flake . -USAGE := {a.style('==>','bold')} {a.style('flakes ftw','header')} {a.style('<==','bold')}\n --include .task.mk -$(if $(filter help,$(MAKECMDGOALS)),$(if $(wildcard .task.mk),,.task.mk: ; curl -fsSL https://raw.githubusercontent.com/daylinmorgan/task.mk/v22.9.28/task.mk -o .task.mk)) +switch: ## perform nixos rebuild + sudo nixos-rebuild switch --flake . + +-include .task.cfg.mk diff --git a/hosts/jeran/configuration.nix b/hosts/jeran/configuration.nix index 83eb372..879794f 100644 --- a/hosts/jeran/configuration.nix +++ b/hosts/jeran/configuration.nix @@ -68,6 +68,7 @@ nixpkgs-fmt lazydocker + python3 nodejs go rustup