jjanzen/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cleanup makefile

Browse source
This commit is contained in:
Jacob Janzen 2024-12-15 22:03:02 -06:00
parent c4f485441a
commit 69a5a1909e
2 changed files with 74 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
Makefile
View file

@ -1,8 +1,7 @@
.PHONY: install update macos-update macos-install nixos-update nixos-install fonts .PHONY: install update macos-update macos-install nixos-update nixos-install fonts
# Determine the current system from its hostname. # Determine the current system from its hostname.
# My university network changes my hostname on my laptop. I use the disgusting system_profiler pipeline to get the real hostname # My university network changes my hostname on my laptop. I use the disgusting system_profiler pipeline to get the real hostname if the uname command fails
# if the uname command fails
SYSTEM := $(shell uname -n) SYSTEM := $(shell uname -n)
ifeq ($(wildcard src/$(project)/*),) ifeq ($(wildcard src/$(project)/*),)
SYSTEM = $(shell system_profiler SPSoftwareDataType | grep "Computer Name" | xargs | sed 's/Computer Name: //' | sed 's/$$/.local/') SYSTEM = $(shell system_profiler SPSoftwareDataType | grep "Computer Name" | xargs | sed 's/Computer Name: //' | sed 's/$$/.local/')
@ -33,14 +32,11 @@ endif
# update by default, install first # update by default, install first
all: update all: update
update: install $(UPDATE_TARGET) update: install $(UPDATE_TARGET)
cp $(DSTDIR)/.flake/flake.lock $(SRCDIR)/.flake
# install configs and any additional targets # install configs and any additional targets
install: $(CONFIGS) $(INSTALL_TARGET) install: $(CONFIGS) $(INSTALL_TARGET)
# ignored files
%.tar.gz:
:
# install encrypted org configs # install encrypted org configs
$(DSTDIR)/%: $(SRCDIR)/%.org.gpg $(DSTDIR)/%: $(SRCDIR)/%.org.gpg
mkdir -p $(dir $@) mkdir -p $(dir $@)
@ -58,33 +54,18 @@ $(DSTDIR)/%: $(SRCDIR)/%
mkdir -p $(dir $@) mkdir -p $(dir $@)
cp $< $@ cp $< $@
# install fonts
fonts: $(DSTDIR)/$(FONTSDIR)/.ComputerModern $(DSTDIR)/$(FONTSDIR)/.SauceCodePro
-fc-cache -f
$(DSTDIR)/$(FONTSDIR)/.ComputerModern: $(SRCDIR)/$(FONTSDIR)/ComputerModern.tar.gz
mkdir -p $(DSTDIR)/$(FONTSDIR)
tar xf $(SRCDIR)/$(FONTSDIR)/ComputerModern.tar.gz -C $(DSTDIR)/$(FONTSDIR)
touch $(DSTDIR)/$(FONTSDIR)/.ComputerModern
$(DSTDIR)/$(FONTSDIR)/.SauceCodePro: $(SRCDIR)/$(FONTSDIR)/SauceCodePro.tar.gz
mkdir -p $(DSTDIR)/$(FONTSDIR)
tar xf $(SRCDIR)/$(FONTSDIR)/SauceCodePro.tar.gz -C $(DSTDIR)/$(FONTSDIR)
touch $(DSTDIR)/$(FONTSDIR)/.SauceCodePro
# macos update just runs brew upgrade
macos-update: install macos-update: install
brew upgrade nix flake update --flake $(DSTDIR)/.flake
darwin-rebuild switch --flake $(DSTDIR)/.flake
# macos install tells System Events to update the wallpaper # macos install tells System Events to update the wallpaper after installation
macos-install: $(CONFIGS) macos-install: $(CONFIGS)
darwin-rebuild switch --flake $(DSTDIR)/.flake darwin-rebuild switch --flake $(DSTDIR)/.flake
osascript -e "tell application \"System Events\" to tell every desktop to set picture to \"/$$HOME/.wallpaper\" as POSIX file" osascript -e "tell application \"System Events\" to tell every desktop to set picture to \"/$$HOME/.wallpaper\" as POSIX file"
# nixos update backs up the flake lock file
nixos-update: install nixos-update: install
nix flake update $(DSTDIR)/.flake nix flake update $(DSTDIR)/.flake
cp $(DSTDIR)/.flake/flake.lock $(SRCDIR)/.flake
sudo nixos-rebuild switch --flake $(DSTDIR)/.flake sudo nixos-rebuild switch --flake $(DSTDIR)/.flake
# nixos install runs nixos-rebuild switch to install everything declaratively
nixos-install: $(CONFIGS) nixos-install: $(CONFIGS)
sudo nixos-rebuild switch --flake $(DSTDIR)/.flake sudo nixos-rebuild switch --flake $(DSTDIR)/.flake

69
macos.local/.flake/flake.lock generated Normal file
View file

@ -0,0 +1,69 @@
{
"nodes": {
"home-manager": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1734093295,
"narHash": "sha256-hSwgGpcZtdDsk1dnzA0xj5cNaHgN9A99hRF/mxMtwS4=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "66c5d8b62818ec4c1edb3e941f55ef78df8141a8",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"nix-darwin": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1733570843,
"narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=",
"owner": "LnL7",
"repo": "nix-darwin",
"rev": "a35b08d09efda83625bef267eb24347b446c80b8",
"type": "github"
},
"original": {
"owner": "LnL7",
"repo": "nix-darwin",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1734126203,
"narHash": "sha256-0XovF7BYP50rTD2v4r55tR5MuBLet7q4xIz6Rgh3BBU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "71a6392e367b08525ee710a93af2e80083b5b3e2",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"home-manager": "home-manager",
"nix-darwin": "nix-darwin",
"nixpkgs": "nixpkgs"
}
}
},
"root": "root",
"version": 7
}