From 78fde7d5cfaaf5c2e56fcd0b1ec13fc28aa09b85 Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Sat, 20 Dec 2025 21:34:32 +0100
Subject: [PATCH] update(flake): bump nixos to 25.11

---
 flake.lock                               | 18 +++++++++---------
 flake.nix                                |  4 ++--
 users/transcaffeine/default.nix          |  4 ++--
 users/transcaffeine/home-manager/git.nix |  8 ++++----
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/flake.lock b/flake.lock
index 0cee047..8e18e94 100644
--- a/flake.lock
+++ b/flake.lock
@@ -24,16 +24,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1763992789,
-        "narHash": "sha256-WHkdBlw6oyxXIra/vQPYLtqY+3G8dUVZM8bEXk0t8x4=",
+        "lastModified": 1765979862,
+        "narHash": "sha256-/r9/1KamvbHJx6I40H4HsSXnEcBAkj46ZwibhBx9kg0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "44831a7eaba4360fb81f2acc5ea6de5fde90aaa3",
+        "rev": "d3135ab747fd9dac250ffb90b4a7e80634eacbe9",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-25.05",
+        "ref": "release-25.11",
         "repo": "home-manager",
         "type": "github"
       }
@@ -55,15 +55,15 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1766014764,
-        "narHash": "sha256-Uzr9k25GX5AvRfrYo4NB4ZkzELVjIZ46oP2mEi9b2z0=",
-        "rev": "2b0d2b456e4e8452cf1c16d00118d145f31160f9",
+        "lastModified": 1765838191,
+        "narHash": "sha256-Rgx3RPys4DTsfZPBbJa2QpJGbjnWVC7V2Rlviyp4qMI=",
+        "rev": "c6f52ebd45e5925c188d1a20119978aa4ffd5ef6",
         "type": "tarball",
-        "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.813672.2b0d2b456e4e/nixexprs.tar.xz"
+        "url": "https://releases.nixos.org/nixos/25.11/nixos-25.11.1948.c6f52ebd45e5/nixexprs.tar.xz"
       },
       "original": {
         "type": "tarball",
-        "url": "https://channels.nixos.org/nixos-25.05/nixexprs.tar.xz"
+        "url": "https://channels.nixos.org/nixos-25.11/nixexprs.tar.xz"
       }
     },
     "nixpkgs-forked": {
diff --git a/flake.nix b/flake.nix
index 0f952da..2098d04 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,10 +1,10 @@
 {
   inputs = {
-    nixpkgs.url = "https://channels.nixos.org/nixos-25.05/nixexprs.tar.xz";
+    nixpkgs.url = "https://channels.nixos.org/nixos-25.11/nixexprs.tar.xz";
     nixpkgs-unstable.url = "https://channels.nixos.org/nixos-unstable-small/nixexprs.tar.xz";
     nixpkgs-forked.url = "github:transcaffeine/nixpkgs/nexus/3.81.1";
     home-manager = {
-      url = "github:nix-community/home-manager/release-25.05";
+      url = "github:nix-community/home-manager/release-25.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nixos-hardware.url = "github:NixOS/nixos-hardware";
diff --git a/users/transcaffeine/default.nix b/users/transcaffeine/default.nix
index b3d4342..2a55e94 100644
--- a/users/transcaffeine/default.nix
+++ b/users/transcaffeine/default.nix
@@ -10,9 +10,9 @@
       "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCnjrKWYc0bcIsTkdpyC+yAsxSeY9M1WxVDNm3I/R3BYqyvfFuzJMQyh5APhM52yKGMN9UOuJPNPz0C4P6EY3iC3ZqUHFJ6ILrZZxdLZBVxdy2F19Xv6XcZkZxLpRKWapVFECF5z/Bi0rg1uzNRyrHjfZWcHfHIvlqxUYiitvvTbbSMQKqEV8wlnshSzBoYzaKtV1+crwlgz6wCnXq8HIupEeWfUc9kc+zunpYnuHnU5Z3HhzQGBuIiPoVritDjOo7qYREftV4qQ15xFWdezsMZlR15edwZeyNdAEx044QgaGddC8uEMoi5cp4APIqH1cEkIvSU6Y+esdgZ4CHU6M5G5ub5PTT2TaKoUMLLFtpW6QImjVApixFTHWR7tUhqInplWWLqvviS4MoI1ppxgcDUg/bgPdeDBsoRkbESr2uT8ResNi9DlPlN2rlUjlb28awzHm7agFhwfPQZ1afnFSUh0tTFz1WeR7xIGhxR1xXc8sapJhgLnYYWpR2NaJzbYYdk7CWW/3rgEsJem7Kvll6HevnFgRP/uVhEyGZl9hw+tECzvwB/LEmQ/4raDMxqOB9XO9kusJX/jTnQIObrFubfKn3ToXlYbQxZX9+QobANvQ8huILz1bBeH8aKjf9RXu+j4VNyoCKhzU/v0MIdRCsgVWgjuYXMGRo0MFMFyMqQiw== transcaffeine-openpgp:0x353A3E5B"
     ];
     packages = with pkgs; [
-      pinentry
+      pinentry-gnome3
       gnupg
-      sequoia
+      sequoia-sq
       pass
       spotify
       gimp-with-plugins
diff --git a/users/transcaffeine/home-manager/git.nix b/users/transcaffeine/home-manager/git.nix
index 7494b43..032c91e 100644
--- a/users/transcaffeine/home-manager/git.nix
+++ b/users/transcaffeine/home-manager/git.nix
@@ -11,16 +11,16 @@
     );
     key = gitconfig.user.signingKey;
     aliases = gitconfig.alias;
+    user = gitconfig.user;
   in {
     enable = true;
-    userName = gitconfig.user.name;
-    userEmail = gitconfig.user.email;
     signing = {
       signByDefault = true;
       inherit key;
     };
-    inherit aliases;
-    extraConfig = {
+    settings = {
+      inherit user;
+      inherit aliases;
       format = gitconfig.format;
       commit = gitconfig.commit;
       tag = gitconfig.tag;