willemml/dotfiles.nix
1
0
Fork 0
mirror of https://github.com/willemml/dotfiles.nix.git synced 2025-04-13 03:37:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix gpg-agent pinentry and merge programs

Browse source
This commit is contained in:
willemml 2022-12-04 21:09:34 -08:00
parent bd35608bba
commit 7b07cb6832
Signed by: willemml
GPG key ID: C3DE5DF6198DACBD
6 changed files with 45 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
darwin-configuration.nix
View file

@ -1,4 +1,4 @@
{ config, pkgs, lib, currentSystem, ... }: { config, pkgs, lib, ... }:
let let
user = builtins.getEnv "USER"; user = builtins.getEnv "USER";
@ -32,6 +32,8 @@ in
# Create /etc/zshrc that loads the nix-darwin environment. # Create /etc/zshrc that loads the nix-darwin environment.
programs.zsh.enable = true; programs.zsh.enable = true;
programs.gnupg.agent.enable = true;
# Used for backwards compatibility, please read the changelog before changing. # Used for backwards compatibility, please read the changelog before changing.
# $ darwin-rebuild changelog # $ darwin-rebuild changelog
system.stateVersion = 4; system.stateVersion = 4;
@ -44,5 +46,5 @@ in
services.emacs.enable = true; services.emacs.enable = true;
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.users.${user} = import ./home.nix { inherit lib config pkgs currentSystem; }; home-manager.users.${user} = import ./home.nix { inherit lib config pkgs; };
} }

7
emacs.nix
View file

@ -1,7 +0,0 @@
{ config, pkgs, ... }:
{
programs.emacs = {
enable = true;
};
}

20
git.nix
View file

@ -1,20 +0,0 @@
{ pkgs, ... }:
{
programs.git = {
enable = true;
delta = {
enable = true;
};
signing = {
# gpgPath = "${pkgs.gpg.outPath}";
key = "C3DE5DF6198DACBD";
signByDefault = true;
};
extraConfig.init.defaultBranch = "master";
extraConfig.core.autocrlf = false;
package = pkgs.gitAndTools.gitFull;
userName = "willemml";
userEmail = "willem@leit.so";
};
}

17
gpg.nix
View file

@ -1,17 +0,0 @@
{ config, ... }:
{
programs.gpg = {
enable = true;
homedir = "${config.home.homeDirectory}/.gnupg";
settings = {
use-agent = true;
default-key = "860B5C62BF1FCE4272D26BF8C3DE5DF6198DACBD";
};
};
services.gpg-agent = {
enable = false;
enableZshIntegration = true;
pinentryFlavor = "mac";
};
}

22
home.nix
View file

@ -1,15 +1,21 @@
{ pkgs, config, lib, currentSystem, ... }: { pkgs, config, lib, ... }:
let let
inherit (lib.systems.elaborate { system = builtins.currentSystem; }) isLinux isDarwin; inherit (lib.systems.elaborate { system = builtins.currentSystem; }) isLinux isDarwin;
in in
{ rec {
home.stateVersion = "22.05"; home.stateVersion = "22.05";
home.packages = import ./packages.nix { inherit lib config pkgs isDarwin; }; home.packages = import ./packages.nix { inherit lib config pkgs isDarwin; };
imports = [
./emacs.nix programs = import ./programs.nix { inherit lib config pkgs isDarwin; };
./git.nix
./gpg.nix home.file."${programs.gpg.homedir}/gpg-agent.conf" = {
./zsh.nix source = pkgs.writeTextFile {
]; name = "gpg-agent-conf";
text = ''
pinentry-program ${pkgs.pinentry_mac.out}/${pkgs.pinentry_mac.binaryPath}
'';
};
};
} }

32
zsh.nix → programs.nix
View file

@ -1,11 +1,34 @@
{ pkgs, lib, ... }: { lib, config, pkgs, isDarwin, ... }:
{ {
programs.zoxide = { gpg = {
enable = true; enable = true;
enableZshIntegration = true; homedir = "${config.users.users.willem.home}/.gnupg";
settings = {
use-agent = true;
default-key = "860B5C62BF1FCE4272D26BF8C3DE5DF6198DACBD";
};
}; };
programs.zsh = {
git = {
enable = true;
delta = {
enable = true;
};
signing = {
key = "C3DE5DF6198DACBD";
signByDefault = true;
};
extraConfig.init.defaultBranch = "master";
extraConfig.core.autocrlf = false;
package = pkgs.gitAndTools.gitFull;
userName = "willemml";
userEmail = "willem@leit.so";
};
emacs.enable = true;
zsh = {
enable = true; enable = true;
enableCompletion = true; enableCompletion = true;
enableSyntaxHighlighting = true; enableSyntaxHighlighting = true;
@ -38,4 +61,3 @@
]; ];
}; };
} }