Compare commits

...

2 commits

Author SHA1 Message Date
chayleaf 34ce013bf5
change update script for ci branch 2024-08-14 20:46:38 +07:00
chayleaf 206a5ce766
stuff 2024-08-14 20:46:31 +07:00
4 changed files with 17 additions and 16 deletions

View file

@ -937,17 +937,17 @@
]
},
"locked": {
"lastModified": 1723550937,
"narHash": "sha256-5gEXPy9qIrNi0nPk3D1ctVxh5Ndfrhyu+02R6BIcnHQ=",
"ref": "refs/heads/master",
"rev": "e0f642180056f351fd712f2b4f3149fd9f02367f",
"revCount": 24,
"type": "git",
"url": "https://git.pavluk.org/chayleaf/unbound-rust-mod.git"
"lastModified": 1723583256,
"narHash": "sha256-EhgdkSGgEFZJsPhlq3tG9LvWBaix/ZoLUeqcAUPDWlk=",
"owner": "chayleaf",
"repo": "unbound-rust-mod",
"rev": "8a99f2ed1290addee2eabeb5963e6bfc4f825295",
"type": "github"
},
"original": {
"type": "git",
"url": "https://git.pavluk.org/chayleaf/unbound-rust-mod.git"
"owner": "chayleaf",
"repo": "unbound-rust-mod",
"type": "github"
}
},
"utils": {

View file

@ -53,7 +53,7 @@
inputs.nixpkgs.follows = "nixpkgs";
};
unbound-rust-mod = {
url = "git+https://git.pavluk.org/chayleaf/unbound-rust-mod.git";
url = "github:chayleaf/unbound-rust-mod";
inputs.nixpkgs.follows = "nixpkgs";
};
flake-compat = {

View file

@ -112,6 +112,7 @@ in {
"https://git.sr.ht/"
"https://api.github.com/repos/"
"https://github.com/"
"https://git.pavluk.org/"
# for nginx CF-Connecting-IP config generation
"https://www.cloudflare.com/ips-v4"
"https://www.cloudflare.com/ips-v6"

View file

@ -7,9 +7,9 @@ mozilla-addons-to-nix \
./pkgs/firefox-addons/addons.json \
./pkgs/firefox-addons/generated.nix || echo "failed to update firefox addons"
nix flake update
if [ -z ${SUDO_ASKPASS+x} ]; then
sudo nixos-rebuild switch --flake . --option extra-builtins-file "$(pwd)/extra-builtins.nix"
else
sudo -A nixos-rebuild switch --flake . --option extra-builtins-file "$(pwd)/extra-builtins.nix"
fi
home-manager switch --flake . --option extra-builtins-file "$(pwd)/extra-builtins.nix"
#if [ -z ${SUDO_ASKPASS+x} ]; then
# sudo nixos-rebuild switch --flake . --option extra-builtins-file "$(pwd)/extra-builtins.nix"
#else
# sudo -A nixos-rebuild switch --flake . --option extra-builtins-file "$(pwd)/extra-builtins.nix"
#fi
#home-manager switch --flake . --option extra-builtins-file "$(pwd)/extra-builtins.nix"