Compare commits

..

No commits in common. "7dd119992fb4fec1ccb9653e47c925cf2749229e" and "fe661455fe6ec9eae451d2ca076b342e10a0e99c" have entirely different histories.

3 changed files with 3 additions and 5 deletions

View file

@ -4,7 +4,7 @@
userName = "Callum Leslie"; userName = "Callum Leslie";
userEmail = "git@cleslie.uk"; userEmail = "git@cleslie.uk";
signing.key = "03B01F427831BCFD!"; signing.key = "D382C4AFEECEAA90";
signing.signByDefault = true; signing.signByDefault = true;
ignores = [".direnv/"]; ignores = [".direnv/"];
@ -15,7 +15,7 @@
contents = { contents = {
user = { user = {
email = "psycl6@nottingham.ac.uk"; email = "psycl6@nottingham.ac.uk";
signingKey = "14861F1282EFB5C8!"; signingKey = "5A944DF89B6F65AC";
}; };
credential = {helper = "store";}; credential = {helper = "store";};
}; };

View file

@ -1,4 +1,4 @@
{pkgs, ...}: { {...}: {
imports = [./mako ./kanshi]; imports = [./mako ./kanshi];
services = { services = {
network-manager-applet.enable = true; network-manager-applet.enable = true;
@ -6,7 +6,6 @@
gpg-agent = { gpg-agent = {
enable = true; enable = true;
enableSshSupport = true; enableSshSupport = true;
pinentryPackage = pkgs.pinentry-gnome3;
}; };
}; };
} }

View file

@ -31,7 +31,6 @@
vim vim
gnome.adwaita-icon-theme gnome.adwaita-icon-theme
wget wget
pinentry
fzf fzf
nil nil
killall killall