Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion home/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
}: {
imports = [
./programs
./services.nix
];

age.identityPaths = [
Expand Down
12 changes: 0 additions & 12 deletions home/services.nix

This file was deleted.

3 changes: 3 additions & 0 deletions hosts/Rhizome/home.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{pkgs, ...}: {
rc.gpg.enable = true;
}
1 change: 1 addition & 0 deletions modules/home/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
./programs
./development.nix
./editor.nix
./gpg.nix
./scm.nix
./ssh.nix
./utilities.nix
Expand Down
44 changes: 44 additions & 0 deletions modules/home/gpg.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
config,
lib,
pkgs,
...
}: let
inherit (lib) mkIf;

cfg = config.rc.gpg;
in {
options = {
rc.gpg = {
enable = lib.mkEnableOption "GPG-based identity configuration";
};
};

config = mkIf cfg.enable {
programs.gpg = {
enable = true;
settings = {
default-key = "413D1A0152BCB08D2E3DDACAF88C08579051AB48";
};
};

programs.git.signing = {
key = "F88C08579051AB48";
signByDefault = true;
};

services.gpg-agent = {
enable = true;
enableScDaemon = true;
enableSshSupport = true;
enableZshIntegration = true;
defaultCacheTtlSsh = 600;
maxCacheTtlSsh = 3600;
noAllowExternalCache = true;
pinentry.package = with pkgs;
if stdenv.isDarwin
then pinentry_mac
else pinentry-tty;
};
};
}
11 changes: 0 additions & 11 deletions modules/home/scm.nix
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,6 @@ in {

programs.git = {
enable = true;
signing = {
key = "F88C08579051AB48";
signByDefault = true;
};
settings = {
user = {
name = "✿ corey";
Expand All @@ -72,13 +68,6 @@ in {
enable = true;
enableGitIntegration = true;
};

programs.gpg = {
enable = true;
settings = {
default-key = "413D1A0152BCB08D2E3DDACAF88C08579051AB48";
};
};
})

(mkIf gitCfg.enableHubWrapper {
Expand Down
Loading