From e84ae57f66f7a9f8ee82aa89d02eb140304e207e Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Thu, 5 Dec 2024 03:16:22 +0000
Subject: [PATCH] deal with update breakage

---
 flake.lock                     | 25 ++++++++-----------------
 flake.nix                      |  5 +++++
 sets/fonts.nix                 |  2 +-
 sets/hacking.nix               |  2 +-
 system/rainbowdash/default.nix |  1 -
 system/starlight/postgres.nix  |  2 +-
 6 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/flake.lock b/flake.lock
index 14ec283..c0f0577 100644
--- a/flake.lock
+++ b/flake.lock
@@ -22,33 +22,21 @@
     },
     "crane": {
       "inputs": {
-        "flake-compat": [
-          "lanzaboote",
-          "flake-compat"
-        ],
-        "flake-utils": [
-          "lanzaboote",
-          "flake-utils"
-        ],
         "nixpkgs": [
-          "lanzaboote",
           "nixpkgs"
-        ],
-        "rust-overlay": [
-          "lanzaboote",
-          "rust-overlay"
         ]
       },
       "locked": {
-        "lastModified": 1681177078,
-        "narHash": "sha256-ZNIjBDou2GOabcpctiQykEQVkI8BDwk7TyvlWlI4myE=",
+        "lastModified": 1724367763,
+        "narHash": "sha256-LkXQbqWYSEeKeVDWHt702HluW/89bBpYsA6d7FD0gk8=",
         "owner": "ipetkov",
         "repo": "crane",
-        "rev": "0c9f468ff00576577d83f5019a66c557ede5acf6",
+        "rev": "3f502002862cdf91debcc49068fc563f00bc894e",
         "type": "github"
       },
       "original": {
         "owner": "ipetkov",
+        "ref": "v0.18.1",
         "repo": "crane",
         "type": "github"
       }
@@ -346,7 +334,9 @@
     },
     "lanzaboote": {
       "inputs": {
-        "crane": "crane",
+        "crane": [
+          "crane"
+        ],
         "flake-compat": "flake-compat",
         "flake-parts": "flake-parts",
         "flake-utils": [
@@ -584,6 +574,7 @@
     "root": {
       "inputs": {
         "artemist": "artemist",
+        "crane": "crane",
         "darwin": "darwin",
         "fonts": "fonts",
         "home-manager": "home-manager",
diff --git a/flake.nix b/flake.nix
index 501eff5..930f765 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,6 +7,10 @@
       url = "git+https://git.mildlyfunctional.gay/artemist/packages.git";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    crane = {
+      url = "github:ipetkov/crane/v0.18.1";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     darwin = {
       url = "github:lnl7/nix-darwin";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -24,6 +28,7 @@
       url = "github:nix-community/lanzaboote/v0.3.0";
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.flake-utils.follows = "utils";
+      inputs.crane.follows = "crane";
     };
     lix = {
       url = "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz";
diff --git a/sets/fonts.nix b/sets/fonts.nix
index 7c2494d..5c54abd 100644
--- a/sets/fonts.nix
+++ b/sets/fonts.nix
@@ -111,7 +111,7 @@
         nasin-nanpa
 
         # Weird symbols
-        (nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; })
+        nerd-fonts.symbols-only
       ]
       ++ (builtins.attrValues pkgs.extraFonts);
   };
diff --git a/sets/hacking.nix b/sets/hacking.nix
index 4dc75ca..412f992 100644
--- a/sets/hacking.nix
+++ b/sets/hacking.nix
@@ -10,10 +10,10 @@
   };
   environment.systemPackages = with pkgs; [
     apktool
+    binwalk
     imhex
     llvm
     nmap
-    python3Packages.binwalk-full
 
     ghidra
 
diff --git a/system/rainbowdash/default.nix b/system/rainbowdash/default.nix
index ecb8a82..7f4045c 100644
--- a/system/rainbowdash/default.nix
+++ b/system/rainbowdash/default.nix
@@ -19,7 +19,6 @@
     ../../sets/workstation.nix
     inputs.nixos-hardware.nixosModules.common-cpu-intel
     inputs.nixos-hardware.nixosModules.common-pc-laptop
-    inputs.nixos-hardware.nixosModules.common-pc-laptop-acpi_call
     inputs.nixos-hardware.nixosModules.common-pc-ssd
   ];
 
diff --git a/system/starlight/postgres.nix b/system/starlight/postgres.nix
index fe04d5c..645b298 100644
--- a/system/starlight/postgres.nix
+++ b/system/starlight/postgres.nix
@@ -6,7 +6,7 @@
     package = pkgs.postgresql_16;
     enableJIT = true;
 
-    extraPlugins = with config.services.postgresql.package.pkgs; [ postgis ];
+    extensions = with config.services.postgresql.package.pkgs; [ postgis ];
 
     ensureUsers = [
       {