forked from fabian/nix_config
hotfixes
This commit is contained in:
parent
a2849b213f
commit
d41d67a858
9 changed files with 29 additions and 93 deletions
|
@ -33,7 +33,8 @@ in {
|
|||
vim
|
||||
zip
|
||||
];
|
||||
keyboard = { #TODO switch to normal people variant
|
||||
keyboard = {
|
||||
#TODO switch to normal people variant
|
||||
layout = "us";
|
||||
variant = "altgr-intl";
|
||||
};
|
||||
|
|
|
@ -9,14 +9,10 @@
|
|||
./neovim.nix
|
||||
./baseline.nix
|
||||
./gaming.nix
|
||||
./yubikey.nix
|
||||
./firefox.nix
|
||||
./gui
|
||||
./zsh
|
||||
./defaultDesktopPack.nix
|
||||
./accounts.nix
|
||||
./syncthing.nix
|
||||
./deepState.nix
|
||||
./mapping.nix
|
||||
];
|
||||
}
|
||||
|
|
|
@ -1,61 +0,0 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.local.services.gpg;
|
||||
in {
|
||||
options.local.services.gpg = {
|
||||
enable = mkEnableOption "gpg settings";
|
||||
defaultKey = mkOption {
|
||||
type = types.str;
|
||||
description = "fingerprint of default public key to be used in gpg, git, email, etc.";
|
||||
example = "7AA277E604A4173916BBB4E91FFAC35E1798174F";
|
||||
};
|
||||
};
|
||||
config = mkIf cfg.enable {
|
||||
programs.gpg = {
|
||||
enable = true;
|
||||
settings = {
|
||||
default-key = config.local.services.gpg.defaultKey;
|
||||
};
|
||||
};
|
||||
|
||||
services.gpg-agent = {
|
||||
enable = true;
|
||||
|
||||
enableZshIntegration = true;
|
||||
enableBashIntegration = true;
|
||||
|
||||
enableExtraSocket = true;
|
||||
enableSshSupport = true;
|
||||
|
||||
defaultCacheTtl = 3600 * 3;
|
||||
defaultCacheTtlSsh = 3600 * 3;
|
||||
|
||||
maxCacheTtl = 3600 * 6;
|
||||
maxCacheTtlSsh = 3600 * 6;
|
||||
|
||||
pinentry.package = pkgs.pinentry-emacs;
|
||||
};
|
||||
|
||||
accounts.email.accounts = {
|
||||
"fabian@posixlycorrect.com" = {
|
||||
gpg = {
|
||||
encryptByDefault = true;
|
||||
signByDefault = true;
|
||||
key = config.local.services.gpg.defaultKey;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
programs.git = {
|
||||
signing = {
|
||||
key = config.local.services.gpg.defaultKey;
|
||||
signByDefault = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
|
@ -5,7 +5,7 @@
|
|||
italic_font JetBrains Mono Italic
|
||||
bold_italic_font JetBrains Mono Bold Italic
|
||||
|
||||
font_size 10
|
||||
font_size 15
|
||||
disable_ligatures cursor
|
||||
|
||||
initial_window_width 1200
|
||||
|
|
|
@ -28,10 +28,6 @@
|
|||
enable = true;
|
||||
prompt = "%B[%~] \${vcs_info_msg_0_}%b";
|
||||
};
|
||||
gpg = { #TODO finish setup gpg
|
||||
enable = false;
|
||||
defaultKey = "7AA277E604A4173916BBB4E91FFAC35E1798174F";
|
||||
};
|
||||
};
|
||||
|
||||
apps = {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue