From 1c2078fddea05f3bd9e5bdc0e6b161e948433f25 Mon Sep 17 00:00:00 2001
From: foehammer127 <foehammer@disroot.org>
Date: Fri, 15 Aug 2025 16:38:21 -0500
Subject: [PATCH] Summer Updates.

---
 common/bash.nix        |  1 +
 common/git.nix         |  2 ++
 common/gpg/default.nix |  2 +-
 flake.lock             | 16 ++++++++--------
 flake.nix              |  4 ++--
 nvim/default.nix       |  7 ++++++-
 6 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/common/bash.nix b/common/bash.nix
index 61bb267..7aa944a 100644
--- a/common/bash.nix
+++ b/common/bash.nix
@@ -21,6 +21,7 @@
       tl = "tmux list-sessions";
       ta = "tmux attach";
       rfc_date = "date --rfc-3339='seconds'";
+      lg = "lazygit";
     };
   };
 
diff --git a/common/git.nix b/common/git.nix
index d49be51..e7c192b 100644
--- a/common/git.nix
+++ b/common/git.nix
@@ -1,4 +1,6 @@
 {...}: {
+  programs.lazygit.enable = true;
+
   programs.git = {
     enable = true;
     lfs.enable = true;
diff --git a/common/gpg/default.nix b/common/gpg/default.nix
index 477c0ea..c9e5f9c 100644
--- a/common/gpg/default.nix
+++ b/common/gpg/default.nix
@@ -10,7 +10,7 @@
     enableExtraSocket = true;
     defaultCacheTtl = 34560000;
     maxCacheTtl = 34560000;
-    pinentryPackage = pkgs.pinentry.tty;
+    pinentry.package = pkgs.pinentry.tty;
     enableSshSupport = true;
 
     extraConfig = ''
diff --git a/flake.lock b/flake.lock
index 79edc18..e9ccfa7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -86,32 +86,32 @@
         ]
       },
       "locked": {
-        "lastModified": 1747020534,
-        "narHash": "sha256-D/6rkiC6w2p+4SwRiVKrWIeYzun8FBg7NlMKMwQMxO0=",
+        "lastModified": 1747556831,
+        "narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "b4bbdc6fde16fc2051fcde232f6e288cd22007ca",
+        "rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-24.11",
+        "ref": "release-25.05",
         "repo": "home-manager",
         "type": "github"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1746957726,
-        "narHash": "sha256-k9ut1LSfHCr0AW82ttEQzXVCqmyWVA5+SHJkS5ID/Jo=",
+        "lastModified": 1747953325,
+        "narHash": "sha256-y2ZtlIlNTuVJUZCqzZAhIw5rrKP4DOSklev6c8PyCkQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "a39ed32a651fdee6842ec930761e31d1f242cb94",
+        "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 70ba78f..3eb238c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,11 +1,11 @@
 {
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
 
     flake-parts.url = "github:hercules-ci/flake-parts";
 
     home-manager = {
-      url = "github:nix-community/home-manager/release-24.11";
+      url = "github:nix-community/home-manager/release-25.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
diff --git a/nvim/default.nix b/nvim/default.nix
index a28b7e9..6e35a9b 100644
--- a/nvim/default.nix
+++ b/nvim/default.nix
@@ -1,4 +1,8 @@
-{pkgs, ...}: let
+{
+  pkgs,
+  lib,
+  ...
+}: let
   plugins = let
     inherit (pkgs) vimPlugins;
   in
@@ -66,6 +70,7 @@
     buildVimPlugin {
       name = "FoehammerVim";
       src = ./config;
+      buildInputs = plugins;
     };
 
   extraConfig = ''