From 7fa428beb2a703ab98de66844d2e014fa64fde98 Mon Sep 17 00:00:00 2001 From: Patrick Date: Fri, 6 Oct 2023 23:46:48 +0200 Subject: [PATCH] chore: reworked some shit --- README.md | 3 +++ users/common/graphical/Xorg/default.nix | 5 ++++- users/common/graphical/default.nix | 6 ------ users/common/programs/gpg.nix | 1 + users/patrick/patrick.nix | 5 +++++ 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index dad4bd9..bc0ab48 100644 --- a/README.md +++ b/README.md @@ -98,6 +98,9 @@ If you want to be able to boot microsoft signed images append `--microsoft` 1. Time to reboot and pray +TPM keys +`systemd-cryptenroll --tpm2-pcrs=7+8+9 --tpm2-with-pin={yes/no} --tpm2-device=auto ` + ## Deploy diff --git a/users/common/graphical/Xorg/default.nix b/users/common/graphical/Xorg/default.nix index 56dec18..8ae7547 100644 --- a/users/common/graphical/Xorg/default.nix +++ b/users/common/graphical/Xorg/default.nix @@ -1,5 +1,8 @@ {pkgs, ...}: { - home.packages = [pkgs.xclip]; + home.packages = [ + pkgs.xclip + pkgs.xdragon + ]; imports = [ ../. ./rofi.nix diff --git a/users/common/graphical/default.nix b/users/common/graphical/default.nix index 348040d..ec965fa 100644 --- a/users/common/graphical/default.nix +++ b/users/common/graphical/default.nix @@ -9,15 +9,9 @@ ]; home = { packages = with pkgs; [ - thunderbird - signal-desktop - chromium - xdragon - xournalpp zathura pinentry feh - galaxy-buds-client mpv ]; }; diff --git a/users/common/programs/gpg.nix b/users/common/programs/gpg.nix index 555f69e..5554ca3 100644 --- a/users/common/programs/gpg.nix +++ b/users/common/programs/gpg.nix @@ -2,6 +2,7 @@ services.gpg-agent = { enable = true; enableSshSupport = true; + pinentryFlavor = "qt"; }; programs.gpg = { diff --git a/users/patrick/patrick.nix b/users/patrick/patrick.nix index ea82067..cbb17e3 100644 --- a/users/patrick/patrick.nix +++ b/users/patrick/patrick.nix @@ -5,6 +5,11 @@ nextcloud-client discord netflix + xournalpp + galaxy-buds-client + thunderbird + signal-desktop + chromium ]; }; }