diff --git a/modules/hosts/darwin/default.nix b/modules/hosts/darwin/default.nix index 9141006..f2b2b72 100644 --- a/modules/hosts/darwin/default.nix +++ b/modules/hosts/darwin/default.nix @@ -37,12 +37,16 @@ }; taps = [ "homebrew/cask-fonts" + "homebrew-ffmpeg/ffmpeg" #"null-dev/firefox-profile-switcher" "theseal/ssh-askpass" ]; brews = [ "fastfetch" - "ffmpeg" + { + name = "homebrew-ffmpeg/ffmpeg/ffmpeg"; + args = [ "with-srt" ]; + } #"firefox-profile-switcher-connector" # having had this on seems to mean I need to toggle browser.profiles.enabled to true in about:config for the new built in version "mas" "ssh-askpass" diff --git a/modules/shared/home/general/default.nix b/modules/shared/home/general/default.nix index e5a8314..9ff8f69 100644 --- a/modules/shared/home/general/default.nix +++ b/modules/shared/home/general/default.nix @@ -133,9 +133,6 @@ in gh.enable = true; git = { enable = true; - settings = { - diff.sopsdiffer.textconv = "sops --config /dev/null --decrypt"; - }; ignores = [ "*~" "*.swp" @@ -145,9 +142,17 @@ in lfs.enable = true; package = pkgs.gitFull; settings = { + diff.sopsdiffer.textconv = "sops --config /dev/null --decrypt"; + init = { defaultBranch = "main"; }; + commit = { + gpgsign = true; + }; + gpg = { + format = "ssh"; + }; merge = { conflictStyle = "diff3"; tool = "meld"; @@ -157,11 +162,7 @@ in }; user = { name = "Gene Liverman"; - }; - signing = { - format = "ssh"; - key = "${config.home.homeDirectory}/.ssh/id_ed25519"; - signByDefault = true; + signingkey = "${config.home.homeDirectory}/.ssh/id_ed25519.pub"; }; }; }; # end git