From 8d9e6f53ad4a5f028fc30d804e9d60ab984d39d7 Mon Sep 17 00:00:00 2001
From: Trolli Schmittlauch <t.schmittlauch@orlives.de>
Date: Fri, 15 Nov 2024 20:58:09 +0100
Subject: [PATCH 1/2] nixfmt: still user RC style package

---
 home/modules/packages.nix | 2 +-
 home/modules/vscodium.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/home/modules/packages.nix b/home/modules/packages.nix
index 1e23bd1..0d5fdd9 100644
--- a/home/modules/packages.nix
+++ b/home/modules/packages.nix
@@ -91,7 +91,7 @@ let
 
   nixHelpers = [
     nixpkgs-review
-    nixfmt
+    nixfmt-rfc-style
     nix-top
     statix
   ];
diff --git a/home/modules/vscodium.nix b/home/modules/vscodium.nix
index 2a2fa42..76b4c8d 100644
--- a/home/modules/vscodium.nix
+++ b/home/modules/vscodium.nix
@@ -78,7 +78,7 @@
           "editor.formatOnSave" = false;
           "editor.formatOnType" = false;
         };
-        "nix.formatterPath" = lib.getExe pkgs.nixfmt;
+        "nix.formatterPath" = lib.getExe pkgs.nixfmt-rfc-style;
         "nix.enableLanguageServer" = true;
         "nix.serverPath" = lib.getExe pkgs.nixd;
         "nix.serverSettings" = { };

From f9e5a42ca94e8d64235ff825000bcb3d61a877c5 Mon Sep 17 00:00:00 2001
From: Trolli Schmittlauch <t.schmittlauch@orlives.de>
Date: Fri, 15 Nov 2024 20:58:45 +0100
Subject: [PATCH 2/2] calibre: continue to pull in from nixos-24.05 for now

On 24.11, there's a test failure.
---
 flake.lock                | 17 +++++++++++++++++
 flake.nix                 |  1 +
 home/modules/packages.nix |  2 +-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/flake.lock b/flake.lock
index 38da4fb..d2f63a3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -192,6 +192,22 @@
         "type": "github"
       }
     },
+    "nixos-2405": {
+      "locked": {
+        "lastModified": 1731386116,
+        "narHash": "sha256-lKA770aUmjPHdTaJWnP3yQ9OI1TigenUqVC3wweqZuI=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "689fed12a013f56d4c4d3f612489634267d86529",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-24.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixos-hardware": {
       "locked": {
         "lastModified": 1731403644,
@@ -324,6 +340,7 @@
         "lanzaboote": "lanzaboote",
         "mysecrets": "mysecrets",
         "nix-darwin": "nix-darwin",
+        "nixos-2405": "nixos-2405",
         "nixos-hardware": "nixos-hardware",
         "nixos-unstable": "nixos-unstable",
         "nixpkgs": "nixpkgs_2",
diff --git a/flake.nix b/flake.nix
index 4162d81..fcdd618 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,6 +4,7 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/release-24.11";
     #nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
+    nixos-2405.url = "github:NixOS/nixpkgs/nixos-24.05";
     nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
     home-manager = {
diff --git a/home/modules/packages.nix b/home/modules/packages.nix
index 0d5fdd9..32b5f33 100644
--- a/home/modules/packages.nix
+++ b/home/modules/packages.nix
@@ -150,7 +150,7 @@ let
     chromium
     falkon
     thunderbird
-    #calibre   # FIXME: using bin due to failing tests
+    inputs.nixos-unstable.legacyPackages.${system}.calibre   # FIXME: test failure in 24.11
     dino
     zotero
     ding