From ed6bc13b13a0c57bee60bad5164c38779e53d558 Mon Sep 17 00:00:00 2001
From: Lauren Lagarde <lauren@lagarde.dev>
Date: Tue, 10 Jun 2025 23:13:30 -0500
Subject: [PATCH] Initial updates to 25.05

---
 features/embedded.nix |  5 +++--
 flake.lock            | 20 ++++++++++----------
 flake.nix             |  4 ++--
 tweaks/bluetooth.nix  |  2 +-
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/features/embedded.nix b/features/embedded.nix
index 3a464b5..53cc72e 100644
--- a/features/embedded.nix
+++ b/features/embedded.nix
@@ -2,8 +2,9 @@
   nixpkgs.config.allowUnfree = true;
   nixpkgs.config.segger-jlink.acceptLicense = true;
 
-  # TODO: whygodwhy.jpg
-  nixpkgs.config.permittedInsecurePackages = [ "segger-jlink-qt4-796s" ];
+  nixpkgs.config.permittedInsecurePackages = [
+    "segger-jlink-qt4-810"
+  ];
 
   environment.systemPackages = with pkgs; [
     pkgs-unstable.platformio # https://github.com/NixOS/nixpkgs/commit/0ba947ba44fc17c7cc94be2374dbfb939900cecd
diff --git a/flake.lock b/flake.lock
index a7e03e4..b1e4a49 100644
--- a/flake.lock
+++ b/flake.lock
@@ -61,16 +61,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1735344290,
-        "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=",
+        "lastModified": 1749154018,
+        "narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "613691f285dad87694c2ba1c9e6298d04736292d",
+        "rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-24.11",
+        "ref": "release-25.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -141,11 +141,11 @@
       "locked": {
         "lastModified": 1,
         "narHash": "sha256-pYpD+mKj2FS//91FsFc7YfemYBNLrFwXev9v3Q4JUEo=",
-        "path": "/nix/store/rm2bwhpxralxzakij7s6mcgbhcn9a5gx-source/modules/mlaga97-home-manager",
+        "path": "/nix/store/505ys9vsc77f4h0jsbs2dvm144v01gj9-source/modules/mlaga97-home-manager",
         "type": "path"
       },
       "original": {
-        "path": "/nix/store/rm2bwhpxralxzakij7s6mcgbhcn9a5gx-source/modules/mlaga97-home-manager",
+        "path": "/nix/store/505ys9vsc77f4h0jsbs2dvm144v01gj9-source/modules/mlaga97-home-manager",
         "type": "path"
       }
     },
@@ -236,16 +236,16 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1735531152,
-        "narHash": "sha256-As8I+ebItDKtboWgDXYZSIjGlKeqiLBvjxsQHUmAf1Q=",
+        "lastModified": 1749494155,
+        "narHash": "sha256-FG4DEYBpROupu758beabUk9lhrblSf5hnv84v1TLqMc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3ffbbdbac0566a0977da3d2657b89cbcfe9a173b",
+        "rev": "88331c17ba434359491e8d5889cce872464052c2",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-24.11",
+        "ref": "nixos-25.05",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 5f61b54..9724547 100644
--- a/flake.nix
+++ b/flake.nix
@@ -20,7 +20,7 @@
   description = "Lauren's System Flake";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
 
     # Lix over Nix
@@ -34,7 +34,7 @@
     nixos-generators.inputs.nixpkgs.follows = "nixpkgs";
 
     # Home Manager
-    home-manager.url = "github:nix-community/home-manager/release-24.11";
+    home-manager.url = "github:nix-community/home-manager/release-25.05";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
     mlaga97-home-manager.url = "./modules/mlaga97-home-manager/";
diff --git a/tweaks/bluetooth.nix b/tweaks/bluetooth.nix
index 19502dd..e0a389d 100644
--- a/tweaks/bluetooth.nix
+++ b/tweaks/bluetooth.nix
@@ -12,7 +12,7 @@
   };
 
   # PipeWire appears to have marginally less shitty bluetooth support
-  hardware.pulseaudio.enable = false;
+  services.pulseaudio.enable = false;
   security.rtkit.enable = true;
   services.pipewire = {
     enable = true;