pegasust
/
dotfiles
1
0
Fork 0
Code Issues 6 Pull Requests Projects Releases Wiki Activity

add upload to cache

bare
Hung 2023-03-23 13:49:13 -07:00
parent 0e91219d9a
commit fa4f674853
5 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
flake.lock
View File

@ -287,11 +287,11 @@
}, },
"locked": { "locked": {
"dir": "contrib", "dir": "contrib",
"lastModified": 1679453843, "lastModified": 1679556473,
"narHash": "sha256-A5K608V6vAgWyqf6Q4pUWXsDJZ8K+cxSvegbUcdmSbg=", "narHash": "sha256-1kABkonN3VFGTUqb5vKCd5vrU182FGKww67KdnZ6QdQ=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "a7b537c7a4e5b6114cd75df5178199f4449c6480", "rev": "ea0b66d208dbcd5d5c0a17810596d769c7a0b6dd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -308,11 +308,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1679472829, "lastModified": 1679559242,
"narHash": "sha256-hcSVMIpuFuAyFEs+7h2fKym0cDUivgdkjm0TjMgEvYo=", "narHash": "sha256-2qQlbQPLRLmMgbFsY48qnMmgBlCsN9onqpZHx6DPXG0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "7a114101d1b72e734fbaba9e523026dd1598bc7e", "rev": "583c7d315e87975b3a226cafd3ac099b8fdd0b6b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -330,11 +330,11 @@
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
"lastModified": 1679477897, "lastModified": 1679587834,
"narHash": "sha256-QI0YuJskVtEhV+7E7GAi04SYbU7KOQ7PEHLxuam7B40=", "narHash": "sha256-x55B7l1Sp/oMrPecwZFcDiqYh1uL+h19nkw274mgKys=",
"owner": "tweag", "owner": "tweag",
"repo": "nickel", "repo": "nickel",
"rev": "0c9fa8a960ca84bd5fa21a61f52834362a04ad4d", "rev": "7284ce50a312c0a96b188e4c81e6e258b9521075",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -589,11 +589,11 @@
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_5"
}, },
"locked": { "locked": {
"lastModified": 1679451618, "lastModified": 1679537973,
"narHash": "sha256-gWFYRgmeT+8xDYHK4HSuCY9Pi7mSxC+2illHrmDkG7A=", "narHash": "sha256-R6borgcKeyMIjjPeeYsfo+mT8UdS+OwwbhhStdCfEjg=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "a89d328ca7d106c3fdbbd072b6c7088ab5b798a3", "rev": "fbc7ae3f14d32e78c0e8d7865f865cc28a46b232",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake.nix
View File

@ -2,8 +2,6 @@
nixConfig = { nixConfig = {
accept-flake-config = true; accept-flake-config = true;
experimental-features = "nix-command flakes"; experimental-features = "nix-command flakes";
# for darwin's browser
allowUnsupportedSystem = true;
max-jobs = 4; max-jobs = 4;
}; };
description = "My personal configuration in Nix (and some native configurations)"; description = "My personal configuration in Nix (and some native configurations)";

1
nix-conf/home-manager/hwtr/nix.conf
View File

@ -1,3 +1,4 @@
accept-flake-config = true accept-flake-config = true
experimental-features = nix-command flakes experimental-features = nix-command flakes
post-build-hook = /etc/nix/upload-to-cache.sh

5
scripts/hm-switch.sh
View File

@ -8,14 +8,15 @@ echo "SCRIPT_DIR: ${SCRIPT_DIR}"
HOME_MANAGER_DIR="${SCRIPT_DIR}/../nix-conf/home-manager" HOME_MANAGER_DIR="${SCRIPT_DIR}/../nix-conf/home-manager"
# Manage nix.conf. Ideally, this should be done with snapshot-based version # Manage nix.conf. Ideally, this should be done with snapshot-based version
# and with preview on-the-spot, with some timeout # and with preview on-the-spot, with some timeout (like deploy-rs)
if [ -f /etc/nix/nix.conf ]; then if [ -f /etc/nix/nix.conf ]; then
# managed nix.conf # managed nix.conf
BACKUP_FILE="/etc/nix/nix.conf.backup" BACKUP_FILE="/etc/nix/nix.conf.backup"
echo "overwriting /etc/nix/nix.conf. Please find latest backup in ${BACKUP_FILE}" echo "overwriting /etc/nix/nix.conf. Please find latest backup in ${BACKUP_FILE}"
sudo cp /etc/nix/nix.conf ${BACKUP_FILE} sudo cp /etc/nix/nix.conf ${BACKUP_FILE}
sudo cp "${HOME_MANAGER_DIR}/hwtr/nix.conf" /etc/nix/
fi fi
sudo cp "${HOME_MANAGER_DIR}/hwtr/nix.conf" /etc/nix/
sudo cp "${SCRIPT_DIR}/upload-to-cache.sh" /etc/nix/
# Mason is bad: it puts binaries onto xdg.data # Mason is bad: it puts binaries onto xdg.data
# let's make mason starts fresh, just in case we introduce RPATH hacks # let's make mason starts fresh, just in case we introduce RPATH hacks

11
scripts/upload-to-cache.sh Normal file
View File

@ -0,0 +1,11 @@
#!/bin/sh
set -eu
set -f # disable globbing (/nix/store may contain glob chars)
export IFS=' '
# $OUT_PATHS when invoked by nix.settings.post-build-hook will be
# space-separated paths to /nix/store/
echo "Uploading paths" $OUT_PATHS
exec nix copy --to "s3://example-nix-cache" $OUT_PATHS