diff options
| author | seth <[email protected]> | 2023-02-15 03:36:58 -0500 |
|---|---|---|
| committer | seth <[email protected]> | 2023-02-15 03:36:58 -0500 |
| commit | e97ba17b86ed4cdc8df673dfc68b447416a74b55 (patch) | |
| tree | 8824d1e22a7abe313ba035001da759075ad5fe58 | |
| parent | 2633e7bcf3b42447d88dbb5645c2f7d0cb9a1418 (diff) | |
fix gpg-agent and cleanup a few things
| -rw-r--r-- | hosts/common/packages.nix | 14 | ||||
| -rw-r--r-- | users/seth/programs/git.nix | 3 | ||||
| -rw-r--r-- | users/seth/programs/mangohud/MangoHud.conf (renamed from users/seth/programs/mangohud/config/MangoHud.conf) | 0 | ||||
| -rw-r--r-- | users/seth/programs/mangohud/default.nix | 3 |
4 files changed, 15 insertions, 5 deletions
diff --git a/hosts/common/packages.nix b/hosts/common/packages.nix index 0cf093c..a2f5c15 100644 --- a/hosts/common/packages.nix +++ b/hosts/common/packages.nix @@ -7,22 +7,30 @@ if config.sys.gui.enable then with pkgs; [firefox] else []; + + pinentry = + if config.sys.desktop == "gnome" + then pkgs.pinentry-gnome + else pkgs.pinentry-curses; in { environment.systemPackages = with pkgs; [ git neofetch - pinentry-curses python310 vim ] - ++ extraPkgs; + ++ extraPkgs + ++ [pinentry]; programs = { gnupg = { agent = { enable = true; - pinentryFlavor = "curses"; + pinentryFlavor = + if config.sys.desktop == "gnome" + then "gnome3" + else "curses"; }; }; }; diff --git a/users/seth/programs/git.nix b/users/seth/programs/git.nix index cd3274f..73269fd 100644 --- a/users/seth/programs/git.nix +++ b/users/seth/programs/git.nix @@ -12,4 +12,7 @@ userEmail = "[email protected]"; userName = "seth"; }; + services.gpg-agent.extraConfig = '' + pinentry-program /run/current-system/sw/bin/pinentry + ''; } diff --git a/users/seth/programs/mangohud/config/MangoHud.conf b/users/seth/programs/mangohud/MangoHud.conf index 8e02a99..8e02a99 100644 --- a/users/seth/programs/mangohud/config/MangoHud.conf +++ b/users/seth/programs/mangohud/MangoHud.conf diff --git a/users/seth/programs/mangohud/default.nix b/users/seth/programs/mangohud/default.nix index ff240b8..a2f0933 100644 --- a/users/seth/programs/mangohud/default.nix +++ b/users/seth/programs/mangohud/default.nix @@ -10,8 +10,7 @@ mangohudConf = if config.seth.desktop != "" then { - source = ./config; - recursive = true; + source = ./MangoHud.conf; } else {}; in { |