minor cleanup

This commit is contained in:
chayleaf 2024-07-15 02:31:35 +07:00
parent 39bb1f8750
commit 8acba4620b
Signed by: chayleaf
GPG key ID: 78171AD46227E68E
4 changed files with 10 additions and 14 deletions

View file

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

View file

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

View file

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

View file

@ -46,8 +46,6 @@ in {
hashedPassword = cfg.hashedNoreplyPassword; hashedPassword = cfg.hashedNoreplyPassword;
sendOnly = true; 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 = services.dovecot2.extraConfig =
let let
passwd = builtins.toFile "dovecot2-local-passwd" '' passwd = builtins.toFile "dovecot2-local-passwd" ''