From 9d3d9d9a16b7d79cda64a0d6d2440932edb45fc6 Mon Sep 17 00:00:00 2001 From: Kabbone Date: Mon, 2 Oct 2023 16:50:40 +0200 Subject: [PATCH] hosts: desktop: make gpg keys work again --- hosts/configuration_desktop.nix | 2 +- hosts/desktop/default.nix | 6 +++--- modules/shell/zsh.nix | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hosts/configuration_desktop.nix b/hosts/configuration_desktop.nix index 250f3e3..a7df73e 100644 --- a/hosts/configuration_desktop.nix +++ b/hosts/configuration_desktop.nix @@ -150,7 +150,7 @@ }; pcscd.enable = true; yubikey-agent.enable = true; - udev.packages = [ pkgs.yubikey-personalization ]; + udev.packages = [ pkgs.yubikey-personalization pkgs.nitrokey-udev-rules ]; #flatpak.enable = true; # download flatpak file from website - sudo flatpak install - reboot if not showing up # sudo flatpak uninstall --delete-data (> flatpak list --app) - flatpak uninstall --unused # List: diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix index 9f66b53..7f92a2e 100644 --- a/hosts/desktop/default.nix +++ b/hosts/desktop/default.nix @@ -44,9 +44,9 @@ # enable = false; # extraBackends = [ pkgs.sane-airscan ]; # }; - hardware = { - nitrokey.enable = true; - }; +# hardware = { +# nitrokey.enable = true; +# }; # environment = { # systemPackages = with pkgs; [ diff --git a/modules/shell/zsh.nix b/modules/shell/zsh.nix index b3fdff8..5f6793b 100644 --- a/modules/shell/zsh.nix +++ b/modules/shell/zsh.nix @@ -27,10 +27,10 @@ ''; initExtra = '' # Zsh theme - #export GPG_TTY=$(tty) - #gpg-connect-agent updatestartuptty /bye >/dev/null - #unset SSH_AGENT_PID - #export SSH_AUTH_SOCK="/run/user/$UID/gnupg/S.gpg-agent.ssh" + export GPG_TTY=$(tty) + gpg-connect-agent updatestartuptty /bye >/dev/null + unset SSH_AGENT_PID + export SSH_AUTH_SOCK="/run/user/$UID/gnupg/S.gpg-agent.ssh" # Spaceship source ${pkgs.spaceship-prompt}/share/zsh/site-functions/prompt_spaceship_setup autoload -U promptinit; promptinit