Myned/nixos
Myned/nixos
1
1
Fork 0
Code Issues Activity

Compare commits

base: Myned:98982c277860a5084480102687cefd88466d7412
Branches Tags
Myned:master
..
compare: Myned:f86e222e48426d30e3e0279231500b6bcd71a40c
Branches Tags
Myned:master

No commits in common. "98982c277860a5084480102687cefd88466d7412" and "f86e222e48426d30e3e0279231500b6bcd71a40c" have entirely different histories.
98982c2778 ... f86e222e48

3 changed files with 4 additions and 9 deletions
Show stats Expand all files Collapse all files

6
configuration.nix
View file

@ -2,14 +2,11 @@
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";
@ -83,8 +80,9 @@
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

1
options/custom/programs/waybar/style.css
View file

@ -37,7 +37,6 @@ tooltip {
} }
.module { .module {
margin: 0 1px;
padding: 4px 12px; padding: 4px 12px;
} }

6
options/custom/scripts/nixos.sh
View file

@ -20,6 +20,7 @@ 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
@ -41,7 +42,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
@ -58,17 +59,14 @@ _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