Several changes:

- gpg working in darwin
- new git full package
- git settings for darwin (using different account)
- updaded techinque to detect host platform
This commit is contained in:
Andrea Ciceri 2021-11-03 18:29:40 +01:00
parent 8fe4fdfcbc
commit 4d356b3a06
No known key found for this signature in database
GPG key ID: AAFD2423608B645B
4 changed files with 27 additions and 6 deletions

View file

@ -4,12 +4,19 @@
../profiles/bat
../profiles/fzf
../profiles/zsh
../profiles/git
../profiles/direnv
../profiles/exa
../profiles/emacs
];
home.packages = with pkgs; [
yarn
pinentry_mac
];
programs.gpg = {
homedir = "/Users/andreaciceri/.gnupg";
enable = true;
};
};
}

View file

@ -13,7 +13,7 @@
# For some reason Hunspell dictionaries paths must be specified on Darwin
home.sessionVariables =
if pkgs.system == "x86_64-darwin" then {
if pkgs.stdenv.hostPlatform.isDarwin then {
DICPATH = "${pkgs.hunspellDicts.it_IT}/share/hunspell:${pkgs.hunspellDicts.en_US}/share/hunspell";
} else { };

View file

@ -1,19 +1,33 @@
{ pkgs, ... }:
let
config =
if pkgs.stdenv.hostPlatform.isDarwin then {
name = "Andrea Ciceri";
email = "andrea.ciceri@beatdata.it";
} else {
name = "Andrea Ciceri";
email = "andrea.ciceri@autistici.org";
};
in
{
programs.git = {
enable = true;
package = pkgs.gitAndTools.gitFull;
extraConfig = {
pull.rebase = false;
};
userName = "aciceri";
userEmail = "andrea.ciceri@autistici.org";
userName = config.name;
userEmail = config.email;
signing = {
signByDefault = true;
key = "andrea.ciceri@autistici.org";
key = config.email;
};
extraConfig = {
url = {
url = if pkgs.stdenv.hostPlatform.isDarwin then { } else {
"ssh://git@github.com/" = { insteadOf = https://github.com/; };
};
};

View file

@ -55,7 +55,7 @@
};
loginExtra = "[[ -z $DISPLAY && $TTY = /dev/tty1 ]] && exec sway";
initExtra =
if pkgs.system == "x86_64-darwin"
if pkgs.stdenv.hostPlatform.isDarwin
then "if test -e /etc/static/bashrc; then source /etc/static/bashrc > /dev/null 2>&1; fi"
else "";
};