From 288d2837eb64e90f565146cae574e2cf6dd29cd6 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 14 Mar 2024 23:33:00 +0000 Subject: [PATCH] Update lock file --- flake.lock | 24 ++++++++++++------------ flake.nix | 2 ++ lib/nixos/configuration.nix | 2 +- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index d997bf6..b359d8f 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ ] }, "locked": { - "lastModified": 1710164657, - "narHash": "sha256-l64+ZjaQAVkHDVaK0VHwtXBdjcBD6nLBD+p7IfyBp/w=", + "lastModified": 1710452332, + "narHash": "sha256-+lKOoQ89fD6iz6Ro7Adml4Sx6SqQcTWII4t1rvVtdjs=", "owner": "nix-community", "repo": "home-manager", - "rev": "017b12de5b899ef9b64e2c035ce257bfe95b8ae2", + "rev": "096d9c04b3e9438855aa65e24129b97a998bd3d9", "type": "github" }, "original": { @@ -56,11 +56,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1709961763, - "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=", + "lastModified": 1710272261, + "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34", + "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2", "type": "github" }, "original": { @@ -88,11 +88,11 @@ }, "nixpkgs-2311": { "locked": { - "lastModified": 1710162809, - "narHash": "sha256-i2R2bcnQp+85de67yjgZVvJhd6rRnJbSYNpGmB6Leb8=", + "lastModified": 1710283656, + "narHash": "sha256-nI+AOy4uK6jLGBi9nsbHjL1EdSIzoo8oa+9oeVhbyFc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ddcd7598b2184008c97e6c9c6a21c5f37590b8d2", + "rev": "51063ed4f2343a59fdeebb279bb81d87d453942b", "type": "github" }, "original": { @@ -147,11 +147,11 @@ "nixpkgs-2305": "nixpkgs-2305" }, "locked": { - "lastModified": 1710273386, - "narHash": "sha256-TM8QZzAYHWk1YBol2Lc3qVkDs5XdlV1Khoxv7z8x75c=", + "lastModified": 1710402144, + "narHash": "sha256-dzLumqxKdo7zskzt5/Pfcx5DtsENRewieo4bcSpJ0Q8=", "owner": "opdavies", "repo": "opdavies.nvim", - "rev": "4b26e2037591824f6128ef6921d13e59f37177cf", + "rev": "021093bd3da84d7499ee0991140222649cf9f978", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index aa0f698..5bb758d 100644 --- a/flake.nix +++ b/flake.nix @@ -4,8 +4,10 @@ home-manager.url = "github:nix-community/home-manager"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-2311.url = "github:nixos/nixpkgs/nixos-23.11"; + opdavies-nvim.inputs.nixpkgs.follows = "nixpkgs"; opdavies-nvim.url = "github:opdavies/opdavies.nvim"; + # opdavies-nvim.url = "path:/home/opdavies/Code/github.com/opdavies/opdavies.nvim"; }; outputs = inputs @ { diff --git a/lib/nixos/configuration.nix b/lib/nixos/configuration.nix index ce5714b..55b7f10 100644 --- a/lib/nixos/configuration.nix +++ b/lib/nixos/configuration.nix @@ -256,7 +256,7 @@ in { programs.gnupg.agent = { enable = true; enableSSHSupport = true; - pinentryFlavor = "qt"; + pinentryPackage = pkgs.pinentry-qt; }; programs.firefox = {