oop

Makefile

@@ -1,63 +1,31 @@
-.PHONY: init install link unlink rebuild update purge edit help
+.PHONY: init rebuild update purge help
 
-NIXOS_DIR := /etc/nixos
 REPO_DIR := $(shell pwd)
-SETTINGS := settings.nix
 
-# Colors for output
 GREEN := \033[0;32m
 YELLOW := \033[0;33m
 RED := \033[0;31m
-NC := \033[0m # No Color
+NC := \033[0m
 
 help:
 	@echo "NixOS Config"
 	@echo ""
 	@echo "  make init     - first time setup"
-	@echo "  make rebuild  - rebuild nixos"
-	@echo "  make update   - upgrade + rebuild"
+	@echo "  make rebuild  - rebuild nixos with flakes"
+	@echo "  make update   - update flake inputs and rebuild"
 	@echo "  make purge    - garbage collect"
-	@echo "  make link     - symlink to /etc/nixos"
-	@echo "  make unlink   - remove symlink"
-	@echo "  make edit     - edit settings.nix"
 
 init:
 	@./scripts/init.sh
-	@$(MAKE) --no-print-directory link
-	@echo ""
-	@echo "done. run 'make rebuild' when ready"
-
-link:
-	@if [ -L "$(NIXOS_DIR)" ]; then \
-		sudo rm $(NIXOS_DIR); \
-	elif [ -d "$(NIXOS_DIR)" ]; then \
-		sudo mv $(NIXOS_DIR) $(NIXOS_DIR).bak; \
-		echo "backed up /etc/nixos to /etc/nixos.bak"; \
-	fi
-	@sudo ln -sf $(REPO_DIR) $(NIXOS_DIR)
-	@echo "linked $(REPO_DIR) -> $(NIXOS_DIR)"
-
-unlink:
-	@if [ -L "$(NIXOS_DIR)" ]; then \
-		sudo rm $(NIXOS_DIR); \
-		sudo mkdir -p $(NIXOS_DIR); \
-		echo "unlinked"; \
-	else \
-		echo "/etc/nixos is not a symlink"; \
-	fi
 
 rebuild:
-	sudo nixos-rebuild switch
+	git add .
+	sudo nixos-rebuild switch --flake .#lavitz
 
 update:
-	sudo nixos-rebuild switch --upgrade
+	nix flake update
+	@$(MAKE) --no-print-directory rebuild
 
 purge:
 	sudo nix-collect-garbage -d
 	sudo /run/current-system/bin/switch-to-configuration boot
-
-check:
-	nix-instantiate '<nixpkgs/nixos>' -A system --dry-run
-
-edit:
-	@$${EDITOR:-nano} $(SETTINGS)