Zander671/Waybar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4371 from khaneliman/nixfmt

Browse Source 
fix(flake): fix formatter configuration
This commit is contained in:
Alexis Rouillard
2025-10-01 14:24:23 +02:00
committed by GitHub
parent 5c01ad75f1 d09a4072e5
commit a613cd54b0
2 changed files with 26 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
flake.nix
View File

@ -65,7 +65,7 @@
nativeBuildInputs = nativeBuildInputs =
pkgs.waybar.nativeBuildInputs pkgs.waybar.nativeBuildInputs
++ (with pkgs; [ ++ (with pkgs; [
nixfmt-rfc-style nixfmt
clang-tools clang-tools
gdb gdb
]); ]);
@ -75,28 +75,26 @@
formatter = genSystems ( formatter = genSystems (
pkgs: pkgs:
pkgs.treefmt.withConfig { pkgs.treefmt.withConfig {
settings = [ settings = {
{ formatter = {
formatter = { clang-format = {
clang-format = { options = [ "-i" ];
options = [ "-i" ]; command = lib.getExe' pkgs.clang-tools "clang-format";
command = lib.getExe' pkgs.clang-tools "clang-format"; excludes = [ ];
excludes = [ ]; includes = [
includes = [ "*.c"
"*.c" "*.cpp"
"*.cpp" "*.h"
"*.h" "*.hpp"
"*.hpp" ];
];
};
nixfmt = {
command = lib.getExe pkgs.nixfmt-rfc-style;
includes = [ "*.nix" ];
};
}; };
tree-root-file = ".git/index"; nixfmt = {
} command = lib.getExe pkgs.nixfmt;
]; includes = [ "*.nix" ];
};
};
tree-root-file = ".git/index";
};
} }
); );

13
nix/default.nix
View File

@ -30,13 +30,12 @@ in
# nixpkgs checks version, no need when building locally # nixpkgs checks version, no need when building locally
nativeInstallCheckInputs = [ ]; nativeInstallCheckInputs = [ ];
buildInputs = (builtins.filter (p: buildInputs =
p.pname != "wireplumber" && (builtins.filter (p: p.pname != "wireplumber" && p.pname != "gps") oldAttrs.buildInputs)
p.pname != "gps" ++ [
) oldAttrs.buildInputs) ++ [ pkgs.wireplumber
pkgs.wireplumber pkgs.gpsd
pkgs.gpsd ];
];
postUnpack = '' postUnpack = ''
pushd "$sourceRoot" pushd "$sourceRoot"