tree-wide: format with nixfmt

Another saturday another useless formatter change.
It's my dotfiles, after all

alejandra doesn't handle c-style inline comments well.
This commit is contained in:
Primrose 2025-11-08 10:15:58 +08:00
parent ec704b5272
commit ebf8468807
Signed by: primrose
GPG key ID: 4E887A4CA9714ADA
116 changed files with 1895 additions and 1689 deletions

View file

@ -1,7 +1,7 @@
let
sources = import ../../npins;
in
final: _: {
# Use flake so the package inputs is pinned
agenix = sources.agenix.asFlake.packages.${final.system}.default;
}
final: _: {
# Use flake so the package inputs is pinned
agenix = sources.agenix.asFlake.packages.${final.system}.default;
}

View file

@ -2,8 +2,8 @@
final: prev: {
calibre = final.symlinkJoin {
name = "calibre";
paths = [prev.calibre];
buildInputs = [final.makeWrapper];
paths = [ prev.calibre ];
buildInputs = [ final.makeWrapper ];
postBuild = ''
rm -r $out/share/mime
'';

View file

@ -1,6 +1,6 @@
let
sources = import ../../npins;
in
final: _: {
disko = sources.disko.asFlake.packages.${final.system}.default;
}
final: _: {
disko = sources.disko.asFlake.packages.${final.system}.default;
}

View file

@ -1,6 +1,6 @@
let
sources = import ../../npins;
in
final: _: {
dix = sources.dix.asFlake.packages.${final.system}.default;
}
final: _: {
dix = sources.dix.asFlake.packages.${final.system}.default;
}

View file

@ -1,6 +1,6 @@
let
sources = import ../../npins;
in
final: _: {
eepy = sources.eepy.asFlake.packages.${final.system}.default;
}
final: _: {
eepy = sources.eepy.asFlake.packages.${final.system}.default;
}

View file

@ -1,18 +1,14 @@
let
sources = import ../../npins;
in
final: prev: {
fcitx5-table-extra = prev.fcitx5-table-extra.overrideAttrs (oldAttrs: {
src = sources.fcitx5-table-extra;
nativeBuildInputs =
oldAttrs.nativeBuildInputs or []
++ [
final.python3
];
preConfigure =
oldAttrs.preConfigure or ""
+ ''
python3 ./generate.py
'';
});
}
final: prev: {
fcitx5-table-extra = prev.fcitx5-table-extra.overrideAttrs (oldAttrs: {
src = sources.fcitx5-table-extra;
nativeBuildInputs = oldAttrs.nativeBuildInputs or [ ] ++ [
final.python3
];
preConfigure = oldAttrs.preConfigure or "" + ''
python3 ./generate.py
'';
});
}

View file

@ -1,7 +1,8 @@
final: prev: rec {
nerd-fonts = let
mkNerdFont = final.callPackage ../lib/mkNerdFont.nix {};
in
nerd-fonts =
let
mkNerdFont = final.callPackage ../lib/mkNerdFont.nix { };
in
prev.nerd-fonts
// {
iosevka = mkNerdFont {

View file

@ -2,21 +2,18 @@
let
sources = import ../../npins;
in
final: _: {
nil = let
final: _: {
nil =
let
pkg = sources.nil.asFlake.packages.${final.system}.default;
in
pkg.overrideAttrs (
oldAttrs: {
patches =
oldAttrs.patches or []
++ [
(final.fetchpatch {
name = "fix-handling-inherit-and-patfield-in-inline-assist";
url = "https://github.com/oxalica/nil/pull/178.patch";
hash = "sha256-4f7DeWJtt63IyOjqlwzz0f05rv1NBYZO4JWEkFeDimk=";
})
];
}
);
}
pkg.overrideAttrs (oldAttrs: {
patches = oldAttrs.patches or [ ] ++ [
(final.fetchpatch {
name = "fix-handling-inherit-and-patfield-in-inline-assist";
url = "https://github.com/oxalica/nil/pull/178.patch";
hash = "sha256-4f7DeWJtt63IyOjqlwzz0f05rv1NBYZO4JWEkFeDimk=";
})
];
});
}

View file

@ -1,12 +1,10 @@
let
sources = import ../../npins;
in
# The final nix is lix in this case
final: prev: {
nix-monitored =
sources.nix-monitored.asFlake.packages.${final.system}.default
.override {
inherit (final) nix;
withNotify = false; # noisy, spams "command completed" even for nix shells
};
}
# The final nix is lix in this case
final: prev: {
nix-monitored = sources.nix-monitored.asFlake.packages.${final.system}.default.override {
inherit (final) nix;
withNotify = false; # noisy, spams "command completed" even for nix shells
};
}

View file

@ -3,6 +3,6 @@
let
sources = import ../../npins;
in
final: _: {
nix-tree = (import sources.nix-tree).packages.${final.system}.default;
}
final: _: {
nix-tree = (import sources.nix-tree).packages.${final.system}.default;
}

View file

@ -1,4 +1,4 @@
let
sources = import ../../npins;
in
sources.nur.asFlake.overlays.default
sources.nur.asFlake.overlays.default

View file

@ -1,6 +1,6 @@
let
sources = import ../../npins;
in
_: _: {
unsafe-emacs28 = (import sources.pin-emacs28 {}).emacs;
}
_: _: {
unsafe-emacs28 = (import sources.pin-emacs28 { }).emacs;
}

View file

@ -1,7 +1,7 @@
let
sources = import ../../npins;
in
_: _: {
# Isabelle version 2023
isabelle-2023 = (import sources.pin-isabelle {}).isabelle;
}
_: _: {
# Isabelle version 2023
isabelle-2023 = (import sources.pin-isabelle { }).isabelle;
}

View file

@ -1,8 +1,8 @@
let
sources = import ../../npins;
in
_: _: {
# Wireshark bug
# https://gitlab.com/wireshark/wireshark/-/issues/19574
inherit (import sources.pin-wireshark {}) wireshark;
}
_: _: {
# Wireshark bug
# https://gitlab.com/wireshark/wireshark/-/issues/19574
inherit (import sources.pin-wireshark { }) wireshark;
}

View file

@ -1,7 +1,7 @@
let
sources = import ../../npins;
in
_: _: rec {
wallpapers_source = sources.wallpapers;
wallpapers = import wallpapers_source {};
}
_: _: rec {
wallpapers_source = sources.wallpapers;
wallpapers = import wallpapers_source { };
}

View file

@ -1,4 +1,4 @@
let
sources = import ../../npins;
in
(import sources.wired-notify).overlays.default
(import sources.wired-notify).overlays.default