patrick/nix-dotfiles
1
0
Fork 0
mirror of https://github.com/Smaug123/nix-dotfiles synced 2025-10-08 16:08:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

24
flake.lock generated
View File

@@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1645007752, "lastModified": 1645293039,
"narHash": "sha256-FQZMiVP/1vgR7x+TWonMf0NZczrZ4ZjhSTj3rM+kglY=", "narHash": "sha256-PwdDu+SkX8dreeuJ/4av1sEluNZdrpdXv8JsRKKg1Yc=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "c944b5ee82a829ddf7fa6bd9300bc2fe3d005fa1", "rev": "1df878b6f8351795a3bebfbe4fd2d02e1e8b29d6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -23,11 +23,11 @@
}, },
"emacs": { "emacs": {
"locked": { "locked": {
"lastModified": 1644143491, "lastModified": 1646559142,
"narHash": "sha256-ld5MzYesjOE8Ml5uvjFUFaxAozJEl48svwWQ3i7oggc=", "narHash": "sha256-8PClYIjlkBKsl4hYWMtCGRrbaF127XJB6dtfS8gxTGc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "4c7e0980a5f23684ca3ea772d4f62b0da4f55e3c", "rev": "0949bcda488e28eab931e7be99400ad5f0094128",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -43,11 +43,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1645140957, "lastModified": 1646559628,
"narHash": "sha256-WTJzLSCDLBI537o2L/3kRyqEV5YRT7+1QSGryeKReHE=", "narHash": "sha256-WDoqxH/IPTV8CkI15wwzvXYgXq9UPr8xd8WKziuaynw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "4f4165a8b9108818ab0193bbd1a252106870b2a2", "rev": "afe96e7433c513bf82375d41473c57d1f66b4e68",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -58,11 +58,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1644972330, "lastModified": 1646470760,
"narHash": "sha256-hEDWZcTDopnz4jRDhCmnH9VztdKSfR6mrudSM8+Jfco", "narHash": "sha256-dQISyucVCCPaFioUhy5ZgfBz8rOMKGI8k13aPDFTqEs=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1a5ff5ea0297dc8ec5a33b87dfb4fc78687068e6", "rev": "1fc7212a2c3992eedc6eedf498955c321ad81cc2",
"type": "github" "type": "github"
}, },
"original": { "original": {

8
home.nix
View File

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