Add yt-dlp config and fix up git diff style (#8)

* Update git diff method

* Bump flake

* Add yt-dlp
This commit is contained in:
Patrick Stevens
2022-03-17 22:13:13 +00:00
committed by GitHub
parent c9dd6b03ec
commit c45a0d9df6
2 changed files with 20 additions and 12 deletions

View File

@@ -38,6 +38,7 @@ in {
nixpkgs.tmux
nixpkgs.wget
nixpkgs.youtube-dl
nixpkgs.yt-dlp
nixpkgs.cmake
nixpkgs.gnumake
nixpkgs.gcc
@@ -159,6 +160,12 @@ in {
pull = {
twohead = "ort";
};
merge = {
conflictStyle = "zdiff3";
};
diff = {
colorMoved = "default";
};
};
};
@@ -198,6 +205,7 @@ in {
home.file.".ideavimrc".source = ./ideavimrc;
home.file.".config/youtube-dl/config".source = ./youtube-dl.conf;
home.file.".config/yt-dlp/config".source = ./youtube-dl.conf;
programs.emacs = {
enable = true;
package = nixpkgs.emacsGcc;