don/NixOS-Configs
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Activity

updates from makefile

Browse source
This commit is contained in:
Don Harper 2024-06-30 10:09:16 -05:00
parent 6ee9e560ce
commit a005d54d98
2 changed files with 46 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

36
flake.lock generated
View file

@ -121,11 +121,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719193457, "lastModified": 1719733833,
"narHash": "sha256-ByDySG4oQN6KzLCuJjTax6+cMVtOixuYuu2GnnoPpoI=", "narHash": "sha256-6h2EqZU9bL9rHlXE+2LCBgnDImejzbS+4dYsNDDFlkY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "50d4d13fbac5db81f8c1e79d95ad87a2970b9201", "rev": "d185770ea261fb5cf81aa5ad1791b93a7834d12c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -242,11 +242,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719180626, "lastModified": 1719677234,
"narHash": "sha256-vZAzm5KQpR6RGple1dzmSJw5kPivES2heCFM+ZWkt0I=", "narHash": "sha256-qO9WZsj/0E6zcK4Ht1y/iJ8XfwbBzq7xdqhBh44OP/M=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6b1f90a8ff92e81638ae6eb48cd62349c3e387bb", "rev": "36317d4d38887f7629876b0e43c8d9593c5cc48d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -304,11 +304,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1719194950, "lastModified": 1719756707,
"narHash": "sha256-ymnWoyiiJEFnlkGJWdZ/FS2JsPkIw9K0vqH7uP3QdDM=", "narHash": "sha256-V/XPD8DsQpHtF5fONTCC9CjQXZhIvrbZ/cT2fJ8oUX8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nix", "repo": "nix",
"rev": "927b719bce3b586454766fce7d8ed45c32cce14b", "rev": "dc538ad2f7f156727d4d42cba5d5741d6d332939",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -318,11 +318,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1719145664, "lastModified": 1719681865,
"narHash": "sha256-+0bBlerLxsHUJcKPDWZM1wL3V9bzCFjz+VyRTG8fnUA=", "narHash": "sha256-Lp+l1IsREVbz8WM35OJYZz8sAH0XOjrZWUXVB5bJ2qg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "c3e48cbd88414f583ff08804eb57b0da4c194f9e", "rev": "a59f00f5ac65b19382617ba00f360f8bc07ed3ac",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -382,11 +382,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1719075281, "lastModified": 1719506693,
"narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=", "narHash": "sha256-C8e9S7RzshSdHB7L+v9I51af1gDM5unhJ2xO1ywxNH8=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af", "rev": "b2852eb9365c6de48ffb0dc2c9562591f652242a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -455,11 +455,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719152448, "lastModified": 1719525570,
"narHash": "sha256-Acbi1Crd+UEbpPW8IR0ZGRKV+JCnMXDS2cglFQJvRPM=", "narHash": "sha256-xSO/H67GAHEW0siD2PHoO/e97MbROL3r3s5SpF6A6Dc=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "0fc4e9f1449a9dce4be7a1ecedd97949da591181", "rev": "1ff9d37d27377bfe8994c24a8d6c6c1734ffa116",
"type": "github" "type": "github"
}, },
"original": { "original": {

42
makefile
View file

@ -15,34 +15,48 @@ weekly: pull clean update switch ci push clean
cweekly: clean pull switch clean cweekly: clean pull switch clean
update: update:
nix flake update @echo "Updating flake.lock"
@nix flake update &> nixos-switch.log || ( cat nixos-switch.log && false)
@rm nixos-switch.log
clean: clean:
home-manager expire-generations "-5 days" @echo "Cleaning old entries and store"
doas nix-collect-garbage --quiet --log-format bar --no-build-output --delete-old @home-manager expire-generations "-5 days"
doas nix store optimise @doas nix-collect-garbage --quiet --log-format bar --no-build-output --delete-old
@doas nix store optimise
push: push:
@. ~/.bash_ssh @echo pushing to git
git push @git push
pull: pull:
# @. ~/.bash_ssh @echo Updating from git repo
git pull @git pull &> nixos-switch.log || ( cat nixos-switch.log && false)
doas nix-prefetch-url file://$$PWD/$$(ls -1 src/linuxx64* | tail -n1) @rm nixos-switch.log
# doas nix-prefetch-url file://$$PWD/$$(ls -1 src/linuxarm64* | tail -n1) @doas nix-prefetch-url file://$$PWD/$$(ls -1 src/linuxx64* | tail -n1) &> nixos-switch.log || ( cat nixos-switch.log && false)
@rm nixos-switch.log
# @doas nix-prefetch-url file://$$PWD/$$(ls -1 src/linuxarm64* | tail -n1) &> nixos-switch.log || ( cat nixos-switch.log && false)
# @rm nixos-switch.log
ci: ci:
git commit -m"updates from makefile" --all @echo "git commit all"
@git commit -m"updates from makefile" --all &> nixos-switch.log || ( cat nixos-switch.log && false)
@rm nixos-switch.log
check: check:
@nix flake check --show-trace $(ARGS) @echo "running flake check"
@nix flake check --show-trace $(ARGS) &> nixos-switch.log || ( cat nixos-switch.log && false)
@rm nixos-switch.log
flaketest: flaketest:
@nix run "github:DeterminateSystems/flake-checker" @echo running flake-checker
@nix run "github:DeterminateSystems/flake-checker" &> nixos-switch.log || ( cat nixos-switch.log && false)
@rm nixos-switch.log
test: check test: check
doas nixos-rebuild dry-build --flake ./#$(HOSTNAME) @echo "nixos-rebuild dryrun"
@doas nixos-rebuild dry-build --flake ./#$(HOSTNAME) &> nixos-switch.log || ( cat nixos-switch.log && false)
@rm nixos-switch.log
prep: prep:
@locate home-manager-backup | sort -u | xargs rm -f @locate home-manager-backup | sort -u | xargs rm -f