From 914b1db85bab32ab2d836eadd91934df0240f07d Mon Sep 17 00:00:00 2001 From: Swarsel Date: Thu, 11 Jul 2024 16:40:50 +0200 Subject: [PATCH] chore: refine yubikey settings --- SwarselSystems.org | 22 +- index.html | 591 ++++--------------------- profiles/TEMPLATE/home.nix | 6 +- profiles/TEMPLATE/nixos.nix | 1 + profiles/common/home.nix | 263 +---------- profiles/common/nixos.nix | 16 +- profiles/fourside/home.nix | 7 +- profiles/fourside/nixos.nix | 6 +- profiles/onett/home.nix | 6 +- profiles/onett/nixos.nix | 1 + profiles/sandbox/nixos.nix | 2 +- profiles/server1/jellyfin/nixos.nix | 2 +- profiles/server1/matrix/nixos.nix | 1 - profiles/surface/home.nix | 1 + profiles/threed/home.nix | 6 +- profiles/threed/nixos.nix | 1 + programs/emacs/init.el | 2 + programs/firefox/tridactyl/tridactylrc | 12 + 18 files changed, 150 insertions(+), 796 deletions(-) diff --git a/SwarselSystems.org b/SwarselSystems.org index 1a44ea0..56b0ad2 100644 --- a/SwarselSystems.org +++ b/SwarselSystems.org @@ -105,7 +105,7 @@ These blocks are used in several places throughout the configurations, but not o These blocks are to be used on systems that are not running NixOS. For example, one such system would be a Fedora system running home manager, where the respective NixOS features might not be available. -*** Theme +*** Theme (stylix) :PROPERTIES: :CUSTOM_ID: h:5bc1b0c9-dc59-4c81-b5b5-e60699deda78 :END: @@ -270,10 +270,12 @@ I also enable the extra socket here for ssh agent forwarding. But I have not ful enable = true; enableSshSupport = true; enableExtraSocket = true; - pinentryPackage = pkgs.pinentry-gtk2; + pinentryPackage = pkgs.pinentry.gtk2; + defaultCacheTtl = 600; + maxCacheTtl = 7200; extraConfig = '' - allow-emacs-pinentry allow-loopback-pinentry + allow-emacs-pinentry ''; }; @@ -4782,14 +4784,17 @@ Mostly used to install some compilers and lsp's that I want to have available wh yubikey-personalization yubikey-personalization-gui yubico-pam - # yubioath-flutter - # yubikey-manager - # yubikey-manager-qt + yubioath-flutter + yubikey-manager + yubikey-manager-qt yubico-piv-tool + cfssl + pcsctools + pcscliteWithPolkit.out # pinentry # theme related - gnome.adwaita-icon-theme + adwaita-icon-theme # kde-connect xdg-desktop-portal @@ -6360,7 +6365,6 @@ The rest of this configuration is found here: tooltip-format= "{:%Y %B}\n{calendar}"; }; - pulseaudio= { format= "{icon} {volume:2}%"; format-bluetooth= "{icon} {volume}%"; @@ -9294,6 +9298,8 @@ Also, Emacs needs a little extra love to accept my Yubikey for git commits etc. ;; yubikey support for pushing commits ;; commiting is enabled through nixos gpg-agent config + (use-package pinentry) + (pinentry-start) (setq epg-pinentry-mode 'loopback) (setenv "SSH_AUTH_SOCK" (string-chop-newline (shell-command-to-string "gpgconf --list-dirs agent-ssh-socket"))) #+end_src diff --git a/index.html b/index.html index 38cf104..caa47e6 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + SwarselSystems: NixOS + Emacs Configuration @@ -206,7 +206,7 @@

Table of Contents