From 100a96ccad2db7345f17b0264926d3a44d3c08c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@jakstys.lt>
Date: Sat, 24 May 2025 21:58:34 +0300
Subject: [PATCH] 25.05

---
 flake.lock                           | 16 ++++++++--------
 flake.nix                            |  4 ++--
 modules/base/default.nix             |  1 -
 modules/profiles/desktop/default.nix | 12 ++++++------
 shared/home/default.nix              |  2 +-
 5 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/flake.lock b/flake.lock
index c3c8d41..2673274 100644
--- a/flake.lock
+++ b/flake.lock
@@ -132,16 +132,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1747688870,
-        "narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=",
+        "lastModified": 1747556831,
+        "narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d5f1f641b289553927b3801580598d200a501863",
+        "rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-24.11",
+        "ref": "release-25.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -205,16 +205,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1747862697,
-        "narHash": "sha256-U4HaNZ1W26cbOVm0Eb5OdGSnfQVWQKbLSPrSSa78KC0=",
+        "lastModified": 1747953325,
+        "narHash": "sha256-y2ZtlIlNTuVJUZCqzZAhIw5rrKP4DOSklev6c8PyCkQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2baa12ff69913392faf0ace833bc54bba297ea95",
+        "rev": "55d1f923c480dadce40f5231feb472e81b0bab48",
         "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 145d6bd..46dd1cf 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,14 +2,14 @@
   description = "motiejus/config";
 
   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";
     flake-utils.url = "github:numtide/flake-utils";
     flake-compat.url = "github:nix-community/flake-compat";
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
     nur.url = "github:nix-community/NUR";
 
-    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";
 
     agenix = {
diff --git a/modules/base/default.nix b/modules/base/default.nix
index 74ab150..d40523b 100644
--- a/modules/base/default.nix
+++ b/modules/base/default.nix
@@ -244,7 +244,6 @@ in
       locate = {
         enable = true;
         package = pkgs.plocate;
-        localuser = null;
         prunePaths = [ "/home/.btrfs" ];
       };
     };
diff --git a/modules/profiles/desktop/default.nix b/modules/profiles/desktop/default.nix
index a44967d..be105bb 100644
--- a/modules/profiles/desktop/default.nix
+++ b/modules/profiles/desktop/default.nix
@@ -28,11 +28,6 @@ in
     };
 
     hardware = {
-      pulseaudio = {
-        enable = true;
-        package = pkgs.pulseaudioFull;
-      };
-
       bluetooth = {
         enable = true;
         powerOnBoot = true;
@@ -68,6 +63,11 @@ in
       gnome.gnome-keyring.enable = true;
       openssh.settings.X11Forwarding = true;
 
+      pulseaudio = {
+        enable = true;
+        package = pkgs.pulseaudioFull;
+      };
+
       logind = {
         powerKey = "suspend";
         powerKeyLongPress = "poweroff";
@@ -461,7 +461,7 @@ in
           gpg-agent = {
             enable = true;
             enableSshSupport = true;
-            pinentryPackage = pkgs.pinentry-gtk2;
+            pinentry.package = pkgs.pinentry-gtk2;
           };
 
           screen-locker = {
diff --git a/shared/home/default.nix b/shared/home/default.nix
index 2082d47..46cf200 100644
--- a/shared/home/default.nix
+++ b/shared/home/default.nix
@@ -87,7 +87,7 @@ in
               "signon.management.page.breach-alerts.enabled" = false;
               "signon.rememberSignons" = false;
             };
-            extensions = with pkgs.nur.repos.rycee.firefox-addons; [
+            extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [
               bitwarden
               header-editor
               ublock-origin