Compare commits
4 commits
f86e222e48
...
98982c2778
Author | SHA1 | Date | |
---|---|---|---|
98982c2778 | |||
bf663bc849 | |||
4c4d2aec7b | |||
ca5b252167 |
3 changed files with 9 additions and 4 deletions
|
@ -2,11 +2,14 @@
|
||||||
config,
|
config,
|
||||||
inputs,
|
inputs,
|
||||||
lib,
|
lib,
|
||||||
|
pkgs,
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
age.secrets = let
|
age.secrets = let
|
||||||
secret = filename: {
|
secret = filename: {
|
||||||
file = "${inputs.self}/secrets/${filename}";
|
file = "${inputs.self}/secrets/${filename}";
|
||||||
|
owner = config.custom.username;
|
||||||
|
group = config.custom.username;
|
||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
"common/nix/access-tokens.conf" = secret "common/nix/access-tokens.conf";
|
"common/nix/access-tokens.conf" = secret "common/nix/access-tokens.conf";
|
||||||
|
@ -80,9 +83,8 @@
|
||||||
|
|
||||||
nix = {
|
nix = {
|
||||||
#!! Override upstream nix
|
#!! Override upstream nix
|
||||||
# TODO: Try lix v2.92.0
|
|
||||||
# https://git.lix.systems/lix-project/lix
|
# https://git.lix.systems/lix-project/lix
|
||||||
#// package = pkgs.lix;
|
package = pkgs.lix;
|
||||||
|
|
||||||
# BUG: Absolute paths are forbidden in pure mode
|
# BUG: Absolute paths are forbidden in pure mode
|
||||||
# https://github.com/NixOS/nix/issues/11030
|
# https://github.com/NixOS/nix/issues/11030
|
||||||
|
|
|
@ -37,6 +37,7 @@ tooltip {
|
||||||
}
|
}
|
||||||
|
|
||||||
.module {
|
.module {
|
||||||
|
margin: 0 1px;
|
||||||
padding: 4px 12px;
|
padding: 4px 12px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,6 @@ cd /etc/nixos || exit 1
|
||||||
# @flag -p --poweroff Gracefully poweroff system after a successful build
|
# @flag -p --poweroff Gracefully poweroff system after a successful build
|
||||||
# @flag -r --reboot Gracefully reboot system after a successful build
|
# @flag -r --reboot Gracefully reboot system after a successful build
|
||||||
# @flag -u --update Update flake.lock before building
|
# @flag -u --update Update flake.lock before building
|
||||||
# @arg extra~ Pass extra arguments to builder
|
|
||||||
build() { :; }
|
build() { :; }
|
||||||
|
|
||||||
# Internal wrapper for subcommands
|
# Internal wrapper for subcommands
|
||||||
|
@ -42,7 +41,7 @@ _build() {
|
||||||
else
|
else
|
||||||
# Build current system
|
# Build current system
|
||||||
if [[ "${argc_builder:-}" == nh ]]; then
|
if [[ "${argc_builder:-}" == nh ]]; then
|
||||||
nh os "$1" ${argc_extra:+"${argc_extra[@]}"}
|
nh os "$1" -- ${argc_extra:+"${argc_extra[@]}"}
|
||||||
elif [[ "${argc_builder:-}" == nixos ]]; then
|
elif [[ "${argc_builder:-}" == nixos ]]; then
|
||||||
sudo nixos-rebuild "$1" ${argc_extra:+"${argc_extra[@]}"}
|
sudo nixos-rebuild "$1" ${argc_extra:+"${argc_extra[@]}"}
|
||||||
fi
|
fi
|
||||||
|
@ -59,14 +58,17 @@ _build() {
|
||||||
|
|
||||||
# @cmd Build and boot NixOS configuration
|
# @cmd Build and boot NixOS configuration
|
||||||
# @alias b,bo,boo
|
# @alias b,bo,boo
|
||||||
|
# @arg extra~ Pass extra arguments to builder
|
||||||
build::boot() { _build boot; }
|
build::boot() { _build boot; }
|
||||||
|
|
||||||
# @cmd Build and switch NixOS configuration
|
# @cmd Build and switch NixOS configuration
|
||||||
# @alias s,sw,swi,swit,switc
|
# @alias s,sw,swi,swit,switc
|
||||||
|
# @arg extra~ Pass extra arguments to builder
|
||||||
build::switch() { _build switch; }
|
build::switch() { _build switch; }
|
||||||
|
|
||||||
# @cmd Build and test NixOS configuration
|
# @cmd Build and test NixOS configuration
|
||||||
# @alias t,te,tes
|
# @alias t,te,tes
|
||||||
|
# @arg extra~ Pass extra arguments to builder
|
||||||
build::test() { _build test; }
|
build::test() { _build test; }
|
||||||
|
|
||||||
# @cmd Compare NixOS system generations
|
# @cmd Compare NixOS system generations
|
||||||
|
|
Loading…
Add table
Reference in a new issue