From a806ba4ef2ea8eaea3ea0b8746f28fde5edb40ee Mon Sep 17 00:00:00 2001
From: coolneng <akasroua@gmail.com>
Date: Tue, 3 Sep 2024 11:39:42 +0200
Subject: [PATCH] Adapt package names to new top-level nomenclature

---
 modules/gui.nix      | 2 +-
 modules/software.nix | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/gui.nix b/modules/gui.nix
index 4c2a73b..2d94373 100644
--- a/modules/gui.nix
+++ b/modules/gui.nix
@@ -76,7 +76,7 @@ with pkgs;
   # GPG agent
   programs.gnupg.agent = {
     enable = true;
-    pinentryFlavor = "gnome3";
+    pinentryPackage = pinentry-gnome3;
   };
 
   # Tmux
diff --git a/modules/software.nix b/modules/software.nix
index ff8469b..dc9cc3b 100644
--- a/modules/software.nix
+++ b/modules/software.nix
@@ -78,7 +78,7 @@ in
     # Productivity
     zathura
     libreoffice-fresh
-    gnome.simple-scan
+    simple-scan
     bc
     citrix_workspace
     teams-for-linux
@@ -116,7 +116,7 @@ in
     ## Nix
     nixfmt-rfc-style
     ## Python
-    nodePackages.pyright
+    pyright
     black
     ## C/C++
     clang-tools