schmittlauch/nixconfigs
2
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Adjustments for 24.11 -> 25.05

Browse source 
package replacements, warnings, deprecations
This commit is contained in:
Trolli Schmittlauch 2025-05-20 18:55:08 +02:00
parent d95c277383
commit 82b0a6cab1
8 changed files with 124 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

6
home/common.nix
View file

@ -51,9 +51,7 @@
merge.tool = "vimdiff";
# provide `git mergetool -t nixfmt`
mergetool.nixfmt = {
cmd = "${
lib.getExe inputs.nixos-unstable.legacyPackages.${system}.nixfmt-rfc-style
} --mergetool \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"";
cmd = "${lib.getExe pkgs.nixfmt-rfc-style} --mergetool \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"";
trustExitCode = true;
};
core.excludesfile = toString (
@ -105,7 +103,7 @@
enable = true;
syntaxHighlighting.enable = true;
history.ignoreSpace = true;
initExtra = ''
initContent = ''
# Uncomment following line if you want red dots to be displayed while waiting for completion
COMPLETION_WAITING_DOTS="true"
### Fix slowness of pastes with zsh-syntax-highlighting.zsh