NotAShelf/nvf
1
0
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2024-11-26 15:06:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

modules: fix merge conflicts

Browse source
This commit is contained in:
raf 2024-04-27 16:13:19 +03:00
parent b397dcb430
commit aaf286dce4
No known key found for this signature in database
GPG key ID: 02D1DD3FA08B6B29
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/plugins/languages/css.nix
View file

@ -96,13 +96,13 @@ in {
type = mkOption { type = mkOption {
description = "CSS formatter to use"; description = "CSS formatter to use";
type = with types; enum (attrNames formats); type = enum (attrNames formats);
default = defaultFormat; default = defaultFormat;
}; };
package = mkOption { package = mkOption {
description = "CSS formatter package"; description = "CSS formatter package";
type = types.package; type = package;
default = formats.${cfg.format.type}.package; default = formats.${cfg.format.type}.package;
}; };
}; };

1
modules/utility/telescope/telescope.nix
View file

@ -51,4 +51,3 @@ in {
}; };
}; };
} }