chayleaf/dotfiles
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Compare commits

base: chayleaf:437f8af8cf44de1649a050734233b97f158fd168
Branches Tags
chayleaf:master
chayleaf:ci
...
compare: chayleaf:59452c6cb15d246dea49799b6b5b253f3190ee34
Branches Tags
chayleaf:ci
chayleaf:master

2 commits
437f8af8cf ... 59452c6cb1

Author SHA1 Message Date
chayleaf 59452c6cb1
change update script for ci branch 2024-07-15 02:33:21 +07:00
chayleaf 2b5fa35b29
minor cleanup 2024-07-15 02:31:35 +07:00
5 changed files with 15 additions and 19 deletions
Show stats Expand all files Collapse all files

11
flake.lock
View file

@ -356,16 +356,15 @@
"mobile-nixos": {
"flake": false,
"locked": {
"lastModified": 1702959560,
"narHash": "sha256-3EmjKFKBypRGluGEY1oUMkQRBRDO5rZdzUXwTlRbUiY=",
"owner": "chayleaf",
"lastModified": 1720660935,
"narHash": "sha256-GnDGoVaObUjnYdCHUSIYVE1anMElis+Pq+RY30LFlIk=",
"owner": "NixOS",
"repo": "mobile-nixos",
"rev": "55ec06035e85fcbda5caa6a73d045a9910fb16a2",
"rev": "31704f8a55f5773c9b4e7adb7408a142d142e1f2",
"type": "github"
},
"original": {
"owner": "chayleaf",
"ref": "fix-op6-modem",
"owner": "NixOS",
"repo": "mobile-nixos",
"type": "github"
}

7
flake.nix
View file

@ -2,10 +2,8 @@
description = "NixOS + Home Manager configuration of chayleaf";
inputs = {
#nixpkgs.url = "github:NixOS/nixpkgs/3dc2b4f8166f744c3b3e9ff8224e7c5d74a5424f";
# nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nix-community-infra.url = "github:nix-community/infra";
nixpkgs-kernel.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs-kernel.url = "github:NixOS/nixpkgs/nixos-unstable/c7b821ba2e1e635ba5a76d299af62821cbcb09f3";
nixpkgs.url = "github:chayleaf/nixpkgs";
nixos-hardware.url = "github:NixOS/nixos-hardware";
nix-index-database = {
@ -13,8 +11,7 @@
inputs.nixpkgs.follows = "nixpkgs";
};
mobile-nixos = {
# url = "github:NixOS/mobile-nixos";
url = "github:chayleaf/mobile-nixos/fix-op6-modem";
url = "github:NixOS/mobile-nixos";
flake = false;
};
osu-wine = {

2
system/devices/radxa-rock5a-server.nix
View file

@ -126,7 +126,9 @@ in
options = [ "defaults" "size=2G" "mode=755" ]; };
"/persist" =
{ device = "UUID=${uuids.bch}"; fsType = "bcachefs"; inherit neededForBoot;
# TODO: https://github.com/systemd/systemd/pull/33720/files
options = [
"degraded"
"errors=ro"
"x-systemd.device-timeout=0"
"x-systemd.requires=dev-mapper-bch0.device"

2
system/hosts/server/mailserver.nix
View file

@ -46,8 +46,6 @@ in {
hashedPassword = cfg.hashedNoreplyPassword;
sendOnly = true;
};
# TODO: remove when https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/issues/275 is fixed
services.dovecot2.sieve.extensions = [ "fileinto" ];
services.dovecot2.extraConfig =
let
passwd = builtins.toFile "dovecot2-local-passwd" ''

12
update.sh
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"