From 0b8068039cdca34548cd37508111f84614c63263 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Mon, 24 Feb 2025 10:08:21 +0000 Subject: [PATCH] Add pass to all hosts --- nix/hosts/PW05CH3L/configuration.nix | 11 ++++++++++- nix/hosts/common/default.nix | 8 ++++++++ nix/hosts/common/programs.nix | 8 ++++++++ nix/hosts/t490/configuration.nix | 1 - 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/nix/hosts/PW05CH3L/configuration.nix b/nix/hosts/PW05CH3L/configuration.nix index df586ba..ef6e969 100644 --- a/nix/hosts/PW05CH3L/configuration.nix +++ b/nix/hosts/PW05CH3L/configuration.nix @@ -1,4 +1,9 @@ -{ inputs, username, ... }: +{ + inputs, + pkgs, + username, + ... +}: { imports = [ @@ -6,6 +11,10 @@ ../../users/opdavies ]; + environment.systemPackages = with pkgs; [ + wl-clipboard + ]; + features = { cli = { docker.enable = true; diff --git a/nix/hosts/common/default.nix b/nix/hosts/common/default.nix index c7c2c77..bb8128c 100644 --- a/nix/hosts/common/default.nix +++ b/nix/hosts/common/default.nix @@ -29,6 +29,14 @@ fastfetch mermaid-cli mkcert + (pass.withExtensions ( + e: with e; [ + passExtensions.pass-audit + passExtensions.pass-import + passExtensions.pass-otp + passExtensions.pass-update + ] + )) ] ++ pkgs.lib.optionals (!headless) [ acpi diff --git a/nix/hosts/common/programs.nix b/nix/hosts/common/programs.nix index b984595..71dc03e 100644 --- a/nix/hosts/common/programs.nix +++ b/nix/hosts/common/programs.nix @@ -1,5 +1,13 @@ +{ pkgs, ... }: + { programs = { + gnupg.agent = { + enable = true; + enableSSHSupport = true; + pinentryPackage = pkgs.pinentry-qt; + }; + zsh = { enable = true; histSize = 5000; diff --git a/nix/hosts/t490/configuration.nix b/nix/hosts/t490/configuration.nix index fdf3fba..cd10d58 100644 --- a/nix/hosts/t490/configuration.nix +++ b/nix/hosts/t490/configuration.nix @@ -54,7 +54,6 @@ environment.systemPackages = with pkgs; [ gtypist newsboat - pass rclone rclone-browser sxiv