mirror of
https://github.com/Smaug123/nix-dotfiles
synced 2025-10-11 17:38:41 +00:00
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:
8
home.nix
8
home.nix
@@ -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;
|
||||
|
Reference in New Issue
Block a user