fix some system things that broke with update

redxtech · Mar 29, 2024 · a85bd55 · a85bd55
1 parent 349a155
commit a85bd55
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 18 deletions.
diff --git a/flake.lock b/flake.lock
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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 ];