From 24a58b13021195480a582844829a130742e59643 Mon Sep 17 00:00:00 2001
From: Rouven Seifert <rouven@rfive.de>
Date: Sun, 24 Mar 2024 23:39:00 +0100
Subject: [PATCH 1/2] update readme
---
README.md | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/README.md b/README.md
index f3ff301..8fd9750 100644
--- a/README.md
+++ b/README.md
@@ -27,14 +27,11 @@ tmpfs / # root on tmpfs using impermanence
nvme0n1
├─nvme0n1p1 /boot
├─nvme0n1p2 # LUKS-encrypted partition
-│ └─luksroot # zfs setup
-│ └─rpool
-│ └─nixos
-│ ├─nix /nix
-│ ├─home /home
-│ └─var
-│ ├─lib /var/lib
-│ └─log /var/log
+│ └─luksroot # btrfs with subvolumes
+│ ├─nix /nix
+│ ├─home /home
+│ ├─lib /var/lib
+│ └─log /var/log
└─nvme0n1p3
└─luksswap [SWAP] # encrypted swap partition
```
From 23bafdca728fe70a42c9137a960fe9d2a4ec1846 Mon Sep 17 00:00:00 2001
From: Rouven Seifert <rouven@rfive.de>
Date: Sun, 24 Mar 2024 23:39:07 +0100
Subject: [PATCH 2/2] updates
---
flake.lock | 26 +++++++++++++-------------
overlays/default.nix | 7 +++++++
2 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/flake.lock b/flake.lock
index 634034d..4229ce9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -180,11 +180,11 @@
]
},
"locked": {
- "lastModified": 1710336510,
- "narHash": "sha256-mT/Z1AseVhhiFooCu2J7wudx+FivkRrlRBW0iBC2V/o=",
+ "lastModified": 1711133180,
+ "narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "383296ffa45b539c28bf79ec2a272f652838ddd1",
+ "rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb",
"type": "github"
},
"original": {
@@ -281,11 +281,11 @@
]
},
"locked": {
- "lastModified": 1710120787,
- "narHash": "sha256-tlLuB73OCOKtU2j83bQzSYFyzjJo3rjpITZE5MoofG8=",
+ "lastModified": 1711249705,
+ "narHash": "sha256-h/NQECj6mIzF4XR6AQoSpkCnwqAM+ol4+qOdYi2ykmQ=",
"owner": "nix-community",
"repo": "nix-index-database",
- "rev": "e76ff2df6bfd2abe06abd8e7b9f217df941c1b07",
+ "rev": "34519f3bb678a5abbddf7b200ac5347263ee781b",
"type": "github"
},
"original": {
@@ -296,11 +296,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1710272261,
- "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=",
+ "lastModified": 1711163522,
+ "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2",
+ "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4",
"type": "github"
},
"original": {
@@ -414,11 +414,11 @@
"river": {
"flake": false,
"locked": {
- "lastModified": 1710341821,
- "narHash": "sha256-cWFJv5QUmcBqnJGk9twjcndk3/dIAEZ5tOKVhRhQhAg=",
+ "lastModified": 1711277167,
+ "narHash": "sha256-i+5wQkGsiyN/LaGfuj306tdiv+7vcbgahL9JvscM4iw=",
"ref": "refs/heads/master",
- "rev": "fecfa89a9a8ba1d9704b4d07fe02c16cd20a1644",
- "revCount": 1172,
+ "rev": "12de175e115f08d1a77b438910ba6dc58a3d80af",
+ "revCount": 1216,
"submodules": true,
"type": "git",
"url": "https://github.com/riverwm/river"
diff --git a/overlays/default.nix b/overlays/default.nix
index 10286f4..d572f2d 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -10,6 +10,13 @@ in
pww = callPackage ../pkgs/pww { };
ianny = callPackage ../pkgs/ianny { };
+ fprintd = prev.fprintd.overrideAttrs (_: {
+ mesonCheckFlags = [
+ "--no-suite"
+ "fprintd:TestPamFprintd"
+ ];
+ });
+
tpm2-pkcs11 = prev.tpm2-pkcs11.override { fapiSupport = false; };
imv = prev.imv.override {
# freeimage is broken