foodogsquared/nixos-config
1
0
Fork 0
mirror of https://github.com/foo-dogsquared/nixos-config.git synced 2025-01-31 10:58:02 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

users/foo-dogsquared: fix config errors

Browse Source
This commit is contained in:
Gabriel Arazas 2023-12-19 18:00:22 +08:00
parent 8ec51bff48
commit 543cb31a20
No known key found for this signature in database
GPG Key ID: ADE0C41DAB221FCC
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
users/home-manager/foo-dogsquared/modules/programs/vs-code.nix
View File

@ -28,7 +28,7 @@ in
editorconfig.editorconfig editorconfig.editorconfig
]; ];
settings = { userSettings = {
"extensions.ignoreRecommendations" = true; "extensions.ignoreRecommendations" = true;
}; };
}; };

8
users/home-manager/foo-dogsquared/modules/setups/development.nix
View File

@ -38,17 +38,17 @@ in
diffoscope diffoscope
]; ];
programs.git.settings = { programs.git.extraConfig = {
config.difftool.prompt = false; difftool.prompt = false;
# Yeah, let's use this oversized diff tool, shall we? # Yeah, let's use this oversized diff tool, shall we?
# Also, this config is based from this tip. # Also, this config is based from this tip.
# https://lists.reproducible-builds.org/pipermail/diffoscope/2016-April/000193.html # https://lists.reproducible-builds.org/pipermail/diffoscope/2016-April/000193.html
config.difftool."diffoscope".cmd = '' difftool."diffoscope".cmd = ''
"if [ $LOCAL = /dev/null ]; then diffoscope --new-file $REMOTE; else diffoscope $LOCAL $REMOTE; fi" "if [ $LOCAL = /dev/null ]; then diffoscope --new-file $REMOTE; else diffoscope $LOCAL $REMOTE; fi"
''; '';
config.difftool."diffoscope-html".cmd = '' difftool."diffoscope-html".cmd = ''
"if [ $LOCAL = /dev/null ]; then diffoscope --new-file $REMOTE --html - | cat; else diffoscope $LOCAL $REMOTE --html - | cat; fi" "if [ $LOCAL = /dev/null ]; then diffoscope --new-file $REMOTE --html - | cat; else diffoscope $LOCAL $REMOTE --html - | cat; fi"
''; '';
}; };