Add home-manager config for sonja from ~/.config/home-manager
Moves home-manager configuration into the flake under home/sonja/, integrating git, GPG agent, and package config. Fixes deprecated home-manager options and removes nixpkgs.config override incompatible with useGlobalPkgs. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
17
home/sonja/git.nix
Normal file
17
home/sonja/git.nix
Normal file
@@ -0,0 +1,17 @@
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
programs.git = {
|
||||
enable = true;
|
||||
signing = {
|
||||
key = "0xC3D40E4903C6D427";
|
||||
signByDefault = true;
|
||||
};
|
||||
|
||||
settings = {
|
||||
user.name = "wytch";
|
||||
user.email = "wytch@sassysalamander.net";
|
||||
gpg.program = "${pkgs.gnupg}/bin/gpg2";
|
||||
};
|
||||
};
|
||||
}
|
||||
53
home/sonja/gpg-agent.nix
Normal file
53
home/sonja/gpg-agent.nix
Normal file
@@ -0,0 +1,53 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
cfg = config.custom.pgp;
|
||||
in {
|
||||
options.custom.pgp.enable = lib.mkEnableOption "Enable PGP Gnupgp";
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
# 1. Provide the bridge to pcscd
|
||||
home.file.".gnupg/scdaemon.conf".text = ''
|
||||
disable-ccid
|
||||
pcsc-driver ${pkgs.pcsclite.lib}/lib/libpcsclite.so.1
|
||||
'';
|
||||
|
||||
# 2. Configure the Agent
|
||||
services.gpg-agent = {
|
||||
enable = true;
|
||||
enableSshSupport = true;
|
||||
enableZshIntegration = true;
|
||||
pinentry.package = pkgs.pinentry-curses;
|
||||
|
||||
# Removed 'disable-scdaemon' so it can actually talk to our config above
|
||||
extraConfig = ''
|
||||
allow-loopback-pinentry
|
||||
'';
|
||||
};
|
||||
|
||||
# 3. Standard GPG settings
|
||||
programs.gpg = {
|
||||
enable = true;
|
||||
settings = {
|
||||
use-agent = true;
|
||||
personal-cipher-preferences = "AES256 AES192 AES";
|
||||
personal-digest-preferences = "SHA512 SHA384 SHA256";
|
||||
cert-digest-algo = "SHA512";
|
||||
s2k-digest-algo = "SHA512";
|
||||
s2k-cipher-algo = "AES256";
|
||||
charset = "utf-8";
|
||||
fixed-list-mode = "";
|
||||
no-comments = "";
|
||||
no-emit-version = "";
|
||||
no-greeting = "";
|
||||
keyid-format = "0xlong";
|
||||
list-options = "show-uid-validity";
|
||||
verify-options = "show-uid-validity";
|
||||
with-fingerprint = "";
|
||||
require-cross-certification = "";
|
||||
no-symkey-cache = "";
|
||||
};
|
||||
};
|
||||
|
||||
home.packages = [ pkgs.gnupg pkgs.pcsclite ];
|
||||
};
|
||||
}
|
||||
29
home/sonja/home.nix
Normal file
29
home/sonja/home.nix
Normal file
@@ -0,0 +1,29 @@
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
./gpg-agent.nix
|
||||
./git.nix
|
||||
];
|
||||
|
||||
custom.pgp.enable = true;
|
||||
|
||||
home.packages = [
|
||||
pkgs.librewolf
|
||||
pkgs.zsh
|
||||
pkgs.neovim
|
||||
pkgs.nmap
|
||||
pkgs.alacritty
|
||||
pkgs.tmux
|
||||
pkgs.git
|
||||
pkgs.uv
|
||||
pkgs.discord
|
||||
pkgs.steam-unwrapped
|
||||
pkgs.steam-tui
|
||||
pkgs.supersonic
|
||||
pkgs.fzf
|
||||
pkgs.claude-code
|
||||
];
|
||||
|
||||
home.stateVersion = "25.11";
|
||||
}
|
||||
Reference in New Issue
Block a user