From 0a608bd781dcda40144097b007fac0a0c60a8ee1 Mon Sep 17 00:00:00 2001 From: Soispha Date: Tue, 1 Aug 2023 15:31:42 +0200 Subject: Refactor(treewide): Move module configuration in separate files --- home-manager/config/gpg/agent-program | 2 -- home-manager/config/gpg/default.nix | 65 ---------------------------------- home-manager/config/gpg/keys/key_1 | Bin 754 -> 0 bytes home-manager/config/gpg/keys/key_2 | Bin 717 -> 0 bytes home-manager/config/gpg/keys/key_3 | Bin 51304 -> 0 bytes 5 files changed, 67 deletions(-) delete mode 100755 home-manager/config/gpg/agent-program delete mode 100644 home-manager/config/gpg/default.nix delete mode 100644 home-manager/config/gpg/keys/key_1 delete mode 100644 home-manager/config/gpg/keys/key_2 delete mode 100644 home-manager/config/gpg/keys/key_3 (limited to 'home-manager/config/gpg') diff --git a/home-manager/config/gpg/agent-program b/home-manager/config/gpg/agent-program deleted file mode 100755 index e6917db0..00000000 --- a/home-manager/config/gpg/agent-program +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -onlykey-gpg-agent -v --skey-slot=ECC32 --dkey-slot=ECC32 "$@" diff --git a/home-manager/config/gpg/default.nix b/home-manager/config/gpg/default.nix deleted file mode 100644 index 52069c94..00000000 --- a/home-manager/config/gpg/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ - config, - nixosConfig, - sysLib, - pkgs, - ... -}: let - agent-program = sysLib.writeShellScriptWithLibrary { - name = "onlykey-gpg-agent"; - src = ./agent-program; - dependencies = with pkgs; [ - python3 - onlykey-agent - ]; - }; - settings = - if nixosConfig.networking.hostName == "isimud" - then {} - else { - # Hardware-based GPG configuration - agent-program = "${agent-program}/bin/onlykey-gpg-agent"; - - default-key = "Soispha "; - # TODO add more - }; - gpg-agent = - if nixosConfig.networking.hostName == "isimud" - then { - enable = true; - enableZshIntegration = true; - enableScDaemon = true; # smartcards and such things - pinentryFlavor = "tty"; - } - else { - enable = false; - enableZshIntegration = true; - enableScDaemon = true; # smartcards and such things - pinentryFlavor = "tty"; - }; -in { - programs.gpg = { - enable = true; - homedir = "${config.xdg.dataHome}/gnupg/onlykey"; - mutableKeys = false; - mutableTrust = false; - inherit settings; - publicKeys = [ - { - source = ./keys/key_1; - trust = "ultimate"; - } - { - source = ./keys/key_2; - trust = "ultimate"; - } - { - source = ./keys/key_3; - trust = "full"; - } - ]; - }; - services = { - inherit gpg-agent; - }; -} diff --git a/home-manager/config/gpg/keys/key_1 b/home-manager/config/gpg/keys/key_1 deleted file mode 100644 index b10b8b6c..00000000 Binary files a/home-manager/config/gpg/keys/key_1 and /dev/null differ diff --git a/home-manager/config/gpg/keys/key_2 b/home-manager/config/gpg/keys/key_2 deleted file mode 100644 index 0b06cf3b..00000000 Binary files a/home-manager/config/gpg/keys/key_2 and /dev/null differ diff --git a/home-manager/config/gpg/keys/key_3 b/home-manager/config/gpg/keys/key_3 deleted file mode 100644 index 22ffb931..00000000 Binary files a/home-manager/config/gpg/keys/key_3 and /dev/null differ -- cgit 1.4.1