Merge branch 'main' of github.com:bloxx12/nichts

This commit is contained in:
vali 2024-04-12 02:07:58 +02:00
commit c7928ae6b9
8 changed files with 197 additions and 3 deletions

View file

@ -46,9 +46,9 @@ in {
push.autoSetupRemote = true;
commit = {
verbose = true;
gpgsign = true;
# gpgsign = true;
};
gpg.format = "ssh";
# gpg.format = "ssh";
# user.signingkey = "key::${cfg.signingKey}";
merge.conflictstyle = "zdiff3";
interactive.diffFilter = "${pkgs.delta}/bin/delta --color-only";

View file

@ -41,7 +41,7 @@ in {
cd = "z";
nv = "nvim";
#TODO fix hardcoding of git repo path and profile name
update = "sudo -p 'password: ' echo 'Your daughter is just a fork of your wife.' && sudo nixos-rebuild switch --flake \"$HOME/Git/nichts#${username}\" --log-format internal-json |& nom --json";
update = "sudo -p 'password: ' echo 'Your daughter is just a fork of your wife.' && sudo nixos-rebuild switch --flake \"$HOME/nichts#${config.myOptions.other.system.hostname}\" --log-format internal-json |& nom --json";
} // cfg.extraAliases;
initExtraFirst = mkIf cfg.profiling "zmodload zsh/zprof";