chore: statix fix
This commit is contained in:
parent
8ec7cb7794
commit
6d0186eadb
35 changed files with 39 additions and 46 deletions
|
|
@ -1,6 +1,4 @@
|
|||
{
|
||||
...
|
||||
}:
|
||||
_:
|
||||
{
|
||||
defaultSSHKeys = [
|
||||
"sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIDsb/Tr69YN5MQLweWPuJaRGm+h2kOyxfD6sqKEDTIwoAAAABHNzaDo= harald@fedora.fritz.box"
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ in
|
|||
];
|
||||
in
|
||||
{
|
||||
package = cfg.package;
|
||||
inherit (cfg) package;
|
||||
|
||||
settings = {
|
||||
experimental-features = "nix-command flakes";
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ let
|
|||
inherit (lib.metacfg) mkOpt enabled;
|
||||
|
||||
cfg = config.metacfg.tools.git;
|
||||
user = config.metacfg.user;
|
||||
inherit (config.metacfg) user;
|
||||
in
|
||||
{
|
||||
options.metacfg.tools.git = {
|
||||
|
|
|
|||
|
|
@ -54,10 +54,10 @@ in
|
|||
config.metacfg.user.name
|
||||
]
|
||||
++ optional config.services.hydra.enable "hydra";
|
||||
extra-substituters = cfg.extra-substituters;
|
||||
inherit (cfg) extra-substituters;
|
||||
in
|
||||
{
|
||||
package = cfg.package;
|
||||
inherit (cfg) package;
|
||||
|
||||
settings = {
|
||||
experimental-features = "nix-command flakes";
|
||||
|
|
|
|||
|
|
@ -32,8 +32,8 @@ in
|
|||
security.acme = {
|
||||
acceptTerms = true;
|
||||
defaults = {
|
||||
email = cfg.email;
|
||||
dnsProvider = cfg.dnsProvider;
|
||||
inherit (cfg) email;
|
||||
inherit (cfg) dnsProvider;
|
||||
credentialsFile = mkIf (cfg.credentialsFile != null) cfg.credentialsFile;
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -71,8 +71,7 @@ in
|
|||
enable = true;
|
||||
|
||||
extraPackages =
|
||||
[ ]
|
||||
++ lib.optionals pkgs.stdenv.targetPlatform.isx86_64 (
|
||||
lib.optionals pkgs.stdenv.targetPlatform.isx86_64 (
|
||||
with pkgs;
|
||||
[
|
||||
vpl-gpu-rt
|
||||
|
|
@ -90,8 +89,7 @@ in
|
|||
rocmEnv = pkgs.symlinkJoin {
|
||||
name = "rocm-combined";
|
||||
paths =
|
||||
[ ]
|
||||
++ lib.optionals pkgs.stdenv.targetPlatform.isx86_64 (
|
||||
lib.optionals pkgs.stdenv.targetPlatform.isx86_64 (
|
||||
with pkgs.rocmPackages;
|
||||
[
|
||||
rocblas
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ in
|
|||
|
||||
services.nginx = {
|
||||
enable = true;
|
||||
clientMaxBodySize = cfg.clientMaxBodySize;
|
||||
inherit (cfg) clientMaxBodySize;
|
||||
recommendedGzipSettings = true;
|
||||
recommendedOptimisation = true;
|
||||
recommendedProxySettings = true;
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ in
|
|||
|
||||
config = {
|
||||
services.xremap = {
|
||||
enable = cfg.enable;
|
||||
inherit (cfg) enable;
|
||||
userName = mkIf cfg.enable cfg.userName;
|
||||
serviceMode = mkIf cfg.enable "user";
|
||||
withGnome = mkIf cfg.enable cfg.withGnome;
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@ with lib;
|
|||
with lib.metacfg;
|
||||
let
|
||||
cfg = config.metacfg.tools.git;
|
||||
gpg = config.metacfg.security.gpg;
|
||||
user = config.metacfg.user;
|
||||
inherit (config.metacfg.security) gpg;
|
||||
inherit (config.metacfg) user;
|
||||
in
|
||||
{
|
||||
options.metacfg.tools.git = with types; {
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ let
|
|||
pkgs.runCommandNoCC "propagated-icon"
|
||||
{
|
||||
passthru = {
|
||||
fileName = cfg.icon.fileName;
|
||||
inherit (cfg.icon) fileName;
|
||||
};
|
||||
}
|
||||
''
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue