Fix rofi, eww and gpg

2024-11-05 21:52:07 +01:00
parent e4bf731436
commit 6ba393d433
9 changed files with 14 additions and 11 deletions
--- a/modules/desktop/rofi.nix
+++ b/modules/desktop/rofi.nix
@@ -10,9 +10,12 @@ in
    enable = lib.mkEnableOption "rofi";
  };
  config = lib.mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [
-      rofi
-    ];
+    environment.systemPackages = with pkgs;
+      if hyprCfg.enable then [
+        rofi-wayland
+      ] else [
+        rofi
+      ];

    hm.xdg.configFile."rofi/menus".source = ../../config/rofi/menus;
    hm.xdg.configFile."rofi/nix.png".source = nix-colors-lib.nixWallpaperFromScheme {
--- a/modules/system/gpg.nix
+++ b/modules/system/gpg.nix
@@ -11,7 +11,7 @@ in
    programs.gnupg.agent = {
      enable = true;
      enableSSHSupport = true;
-      pinentryPackage = pkgs.pinentry-rofi;
+      pinentryPackage = pkgs.pinentry-qt;
    };
    environment.systemPackages = with pkgs; [
      pinentry