From f73e2a59ccc58cdd25342801017698bfc753a06f Mon Sep 17 00:00:00 2001 From: James Walker Date: Sat, 18 Dec 2021 12:40:52 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20plato:=20gnupg=20config?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hosts/plato/configuration.nix | 9 ++++++--- nix/sources.json | 6 +++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/hosts/plato/configuration.nix b/hosts/plato/configuration.nix index 81389fa..3848c0d 100644 --- a/hosts/plato/configuration.nix +++ b/hosts/plato/configuration.nix @@ -3,8 +3,10 @@ let dotfiles = builtins.fetchTarball "https://github.com/walkah/dotfiles/archive/main.tar.gz"; -in { - imports = [ # Include the results of the hardware scan. +in +{ + imports = [ + # Include the results of the hardware scan. ./hardware-configuration.nix @@ -51,7 +53,7 @@ in { home-manager.users.walkah = import "${dotfiles}/home.nix"; system.autoUpgrade.enable = false; - environment.systemPackages = with pkgs; [ docker-compose weechat ]; + environment.systemPackages = with pkgs; [ docker-compose pinentry weechat ]; fileSystems."/mnt/downloads" = { device = "192.168.6.100:/volume1/Downloads"; @@ -84,6 +86,7 @@ in { programs.gnupg.agent = { enable = true; enableSSHSupport = true; + pinentryFlavor = "curses"; }; # Enable the OpenSSH daemon. diff --git a/nix/sources.json b/nix/sources.json index d3062bd..f78c80f 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -29,10 +29,10 @@ "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "45a3f9d7725c7e21b252c223676cc56fb2ed5d6d", - "sha256": "1m1d0n6hk60agsqvqcfn1g3wkzc9ivn8bavzyssi1ap7d1qxlm63", + "rev": "2d555e5f6529d8485ea7ccdbd3633cf1681eaa2e", + "sha256": "0vfhda0idfdygsrjkyijz5m3ln7569nrph4mcfwlfcvj5b0ns3sl", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/45a3f9d7725c7e21b252c223676cc56fb2ed5d6d.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/2d555e5f6529d8485ea7ccdbd3633cf1681eaa2e.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "sops-nix": {