From a85bd557d37d55dc318965b8002c468f3133622a Mon Sep 17 00:00:00 2001
From: Gabe Dunn <gabe@sent.at>
Date: Thu, 28 Mar 2024 18:51:19 -0700
Subject: [PATCH] fix some system things that broke with update

---
 flake.lock                         |  6 +++---
 home/gabe/features/cli/default.nix |  2 --
 home/gabe/features/cli/gpg.nix     | 16 +++++-----------
 home/gabe/voyager.nix              |  1 -
 hosts/voyager/default.nix          |  1 +
 modules/nixos/desktop/default.nix  |  2 +-
 6 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/flake.lock b/flake.lock
index 4827dbec..213b144e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -712,11 +712,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1709578243,
-        "narHash": "sha256-hF96D+c2PBmAFhymMw3z8hou++lqKtZ7IzpFbYeL1/Y=",
+        "lastModified": 1711625603,
+        "narHash": "sha256-W+9dfqA9bqUIBV5u7jaIARAzMe3kTq/Hp2SpSVXKRQw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "23ff9821bcaec12981e32049e8687f25f11e5ef3",
+        "rev": "c0ef0dab55611c676ad7539bf4e41b3ec6fa87d2",
         "type": "github"
       },
       "original": {
diff --git a/home/gabe/features/cli/default.nix b/home/gabe/features/cli/default.nix
index 6f72778f..0206a419 100644
--- a/home/gabe/features/cli/default.nix
+++ b/home/gabe/features/cli/default.nix
@@ -6,8 +6,6 @@ with lib; {
     ./fish.nix
     ./git.nix
     ./gpg.nix
-    # ./jujutsu.nix
-    # ./lyrics.nix
     ./neovim.nix
     ./nix-index.nix
     ./programs.nix
diff --git a/home/gabe/features/cli/gpg.nix b/home/gabe/features/cli/gpg.nix
index ce0764b2..e7ad3f6a 100644
--- a/home/gabe/features/cli/gpg.nix
+++ b/home/gabe/features/cli/gpg.nix
@@ -1,20 +1,14 @@
 { pkgs, config, lib, ... }:
-let
-  pinentry = if config.gtk.enable then {
-    packages = [ pkgs.pinentry-gnome3 pkgs.gcr ];
-    name = "gnome3";
-  } else {
-    packages = [ pkgs.pinentry-curses ];
-    name = "curses";
-  };
-in {
-  home.packages = pinentry.packages;
+
+{
+  home.packages = with pkgs; [ gcr pinentry-curses pinentry-gnome3 ];
 
   services.gpg-agent = {
     enable = false;
     enableSshSupport = true;
     sshKeys = [ "11148591F2B2026E9B2227BD5C7A1973A2838278" ];
-    pinentryFlavor = pinentry.name;
+    pinentryPackage =
+      if config.gtk.enable then pkgs.pinentry-gnome3 else pkgs.pinentry-curses;
     enableExtraSocket = true;
   };
 
diff --git a/home/gabe/voyager.nix b/home/gabe/voyager.nix
index 9e513de9..60c9c4ee 100644
--- a/home/gabe/voyager.nix
+++ b/home/gabe/voyager.nix
@@ -7,7 +7,6 @@
     wm.wm = "bspwm";
 
     isLaptop = true;
-    remap = true;
 
     hardware = {
       cpuTempPath = "/sys/devices/platform/coretemp.0/hwmon/hwmon6/temp1_input";
diff --git a/hosts/voyager/default.nix b/hosts/voyager/default.nix
index ceb27b87..6edb7a39 100644
--- a/hosts/voyager/default.nix
+++ b/hosts/voyager/default.nix
@@ -13,6 +13,7 @@
     enable = true;
     isLaptop = true;
     useZen = true;
+    remap = true;
     wm = "bspwm";
 
     gaming = {
diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix
index d9e4d0b2..249deed2 100644
--- a/modules/nixos/desktop/default.nix
+++ b/modules/nixos/desktop/default.nix
@@ -220,7 +220,7 @@ in {
     };
 
     # dbus packages
-    services.dbus.packages = with pkgs; [ python310Packages.dbus-python ];
+    services.dbus.packages = with pkgs; [ gcr python310Packages.dbus-python ];
 
     # udev
     services.udev.packages = with pkgs; [ gnome.gnome-settings-daemon ];