fix(nix): use pinentry-gnome for rbw

sbulav · Jan 31, 2024 · 94ffc74 · 94ffc74
1 parent ee4bad4
commit 94ffc74
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 103 deletions.
diff --git a/nix/modules/nixos/desktop/addons/gtk/default.nix b/nix/modules/nixos/desktop/addons/gtk/default.nix
@@ -12,6 +12,13 @@ in {
   options.custom.desktop.addons.gtk = with types; {
     enable = mkBoolOpt false "Whether to customize GTK and apply themes.";
 
+    environment.systemPackages = with pkgs; [
+      adwaita-qt
+      adwaita-qt6
+      gnome.adwaita-icon-theme
+      gnome.gnome-tweaks
+    ];
+
     home.config = mkIf cfg.enable {
       gtk = {
         enable = true;

diff --git a/nix/modules/nixos/desktop/addons/rofi/default.nix b/nix/modules/nixos/desktop/addons/rofi/default.nix
@@ -15,7 +15,7 @@ in {
   };
 
   config = mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [rbw rofi-rbw wtype];
+    environment.systemPackages = with pkgs; [rofi-rbw wtype];
     home.programs.rofi = {
       enable = true;
       plugins = with pkgs; [

diff --git a/nix/modules/nixos/suites/desktop/default.nix b/nix/modules/nixos/suites/desktop/default.nix
@@ -14,6 +14,7 @@ in {
   };
 
   config = mkIf cfg.enable {
+    system.security.rbw.enable = true;
     custom = {
       desktop = {
         hyprland = enabled;
@@ -25,6 +26,7 @@ in {
         telegram = enabled;
         vlc = enabled;
         zathura = enabled;
+        pcmanfm = enabled;
       };
     };
   };

diff --git a/nix/modules/nixos/system/security/gpg/default.nix b/nix/modules/nixos/system/security/gpg/default.nix
@@ -47,7 +47,6 @@ in {
     environment.systemPackages = with pkgs; [
       gnupg
       pinentry-curses
-      pinentry-qt
     ];
 
     programs = {

diff --git a/nix/modules/nixos/system/security/gpg/tmux.conf b/nix/modules/nixos/system/security/gpg/tmux.conf
diff --git a/nix/modules/nixos/system/security/rbw/default.nix b/nix/modules/nixos/system/security/rbw/default.nix
@@ -0,0 +1,35 @@
+{
+  options,
+  config,
+  pkgs,
+  lib,
+  inputs,
+  ...
+}:
+with lib;
+with lib.custom; let
+  cfg = config.system.security.rbw;
+in {
+  options.system.security.rbw = with types; {
+    enable = mkBoolOpt false "Whether or not to enable rbw.";
+    lockTimeout = mkOpt int 28800 "The amount of time to wait before continuing with shell init.";
+  };
+
+  config = mkIf cfg.enable {
+    environment.systemPackages = with pkgs; [
+      rbw
+      pinentry-gnome
+    ];
+
+    home.programs = {
+      rbw = {
+        enable = true;
+        settings = {
+          lock_timeout = cfg.lockTimeout;
+          pinentry = "gnome3";
+          email = "[email protected]";
+        };
+      };
+    };
+  };
+}