all repos — nix-packages @ 92456098343eb24e8da08776788b7fc6f4ecdf40

My personal collection of packages for nix

cleanup modules

Alin
commit

92456098343eb24e8da08776788b7fc6f4ecdf40

parent

0df9fd08fa2bac1649dae9fc68f96099a4e8f1f3

2 files changed, 5 insertions(+), 5 deletions(-)

changed files
M modules/darwin/caddy/default.nix → modules/darwin/caddy/default.nix
@@ -156,7 +156,7 @@ };
 
     adapter = mkOption {
       default =
-        if ((cfg.configFile != configFile) || (builtins.baseNameOf cfg.configFile) == "Caddyfile") then
+        if ((cfg.configFile != configFile) || (baseNameOf cfg.configFile) == "Caddyfile") then
           "caddyfile"
         else
           null;

@@ -331,12 +331,12 @@ '';
 
     launchd.daemons.caddy =
       let
-        runOptions = ''--config ${configFile} ${
+        runOptions = "--config ${configFile} ${
           optionalString (cfg.adapter != null) "--adapter ${cfg.adapter}"
-        }'';
+        }";
       in
       {
-        command = ''${cfg.package}/bin/caddy run ${runOptions} ${optionalString cfg.resume "--resume"}'';
+        command = "${cfg.package}/bin/caddy run ${runOptions} ${optionalString cfg.resume "--resume"}";
         serviceConfig = {
           UserName = cfg.user;
           GroupName = cfg.group;
M modules/nixos/goaccess.nix → modules/nixos/goaccess.nix
@@ -41,7 +41,7 @@ type =
         with types;
         attrsOf (
           submodule (
-            { config, name, ... }:
+            { name, ... }:
             {
               options = {
                 enable = lib.mkEnableOption "goaccess web log analyzer service";