stroopwafel/bluetooth: fix bind mount with impermanence

This commit is contained in:
Benjamin Yule Bädorf 2024-02-08 19:00:15 +01:00
parent 5cbe522ba0
commit 67e924f022
Signed by: b12f
GPG key ID: 729956E1124F8F26
5 changed files with 35 additions and 9 deletions

View file

@ -175,6 +175,21 @@
"type": "github" "type": "github"
} }
}, },
"impermanence": {
"locked": {
"lastModified": 1706639736,
"narHash": "sha256-CaG4j9+UwBDfinxxvJMo6yOonSmSo0ZgnbD7aj2Put0=",
"owner": "nix-community",
"repo": "impermanence",
"rev": "cd13c2917eaa68e4c49fea0ff9cada45440d7045",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "impermanence",
"type": "github"
}
},
"mobile-nixos": { "mobile-nixos": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -329,6 +344,7 @@
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"home-manager": "home-manager", "home-manager": "home-manager",
"impermanence": "impermanence",
"mobile-nixos": "mobile-nixos", "mobile-nixos": "mobile-nixos",
"musnix": "musnix", "musnix": "musnix",
"nixos-flake": "nixos-flake", "nixos-flake": "nixos-flake",

View file

@ -25,6 +25,8 @@
nixos-hardware.url = "github:nixos/nixos-hardware"; nixos-hardware.url = "github:nixos/nixos-hardware";
impermanence.url = "github:nix-community/impermanence";
mobile-nixos.url = "github:nixos/mobile-nixos"; mobile-nixos.url = "github:nixos/mobile-nixos";
mobile-nixos.flake = false; mobile-nixos.flake = false;

View file

@ -5,6 +5,7 @@
stroopwafel = self.nixos-flake.lib.mkLinuxSystem { stroopwafel = self.nixos-flake.lib.mkLinuxSystem {
nixpkgs.hostPlatform = "x86_64-linux"; nixpkgs.hostPlatform = "x86_64-linux";
imports = [ imports = [
inputs.impermanence.nixosModules.impermanence
self.nixosModules.base self.nixosModules.base
./stroopwafel ./stroopwafel
self.nixosModules.b12f self.nixosModules.b12f

View file

@ -17,6 +17,7 @@
# Enables experimental features and interfaces. # Enables experimental features and interfaces.
# Makes BlueZ Battery Provider available # Makes BlueZ Battery Provider available
Experimental = true; Experimental = true;
AutoEnable = true;
}; };
}; };
}; };

View file

@ -1,15 +1,21 @@
{ lib, config, ... }: { lib, config, ... }:
{ {
environment.persistence."/persist" = {
hideMounts = true;
directories = [
"/var/log"
"/var/lib/bluetooth"
"/var/lib/nixos"
"/var/lib/systemd/coredump"
"/etc/NetworkManager/system-connections"
];
files = [
"/etc/machine-id"
];
};
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [
"L /var/lib/bluetooth - - - - /persist/var/lib/bluetooth"
"d /persist/var/lib/bluetooth 0500 root root"
"L /var/lib/docker - - - - /persist/var/lib/docker"
"d /persist/var/lib/docker 0510 root root"
"L /etc/NetworkManager/system-connections - - - - /persist/etc/NetworkManager/system-connections"
"d /persist/etc/NetworkManager/system-connections 0700 root root"
"d /persist/etc/ssh 0400 root root" "d /persist/etc/ssh 0400 root root"
]; ];