diff --git a/modules/programs/i3status.nix b/modules/programs/i3status.nix index f24f8afbf..d717937a3 100644 --- a/modules/programs/i3status.nix +++ b/modules/programs/i3status.nix @@ -229,8 +229,7 @@ in home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; xdg.configFile."i3status/config".text = lib.concatStringsSep "\n" ( - [ ] - ++ lib.optional (cfg.general != { }) (formatModule "general" cfg.general) + lib.optional (cfg.general != { }) (formatModule "general" cfg.general) ++ map formatOrder (sortAttrNamesByPosition lib.lessThan enabledModules) ++ lib.mapAttrsToList formatModule (lib.mapAttrs (n: v: v.settings) enabledModules) ); diff --git a/modules/programs/matplotlib.nix b/modules/programs/matplotlib.nix index d9b3f61ed..cb46b98aa 100644 --- a/modules/programs/matplotlib.nix +++ b/modules/programs/matplotlib.nix @@ -54,8 +54,7 @@ in config = mkIf cfg.enable { xdg.configFile."matplotlib/matplotlibrc".text = lib.concatStringsSep "\n" ( - [ ] - ++ lib.mapAttrsToList (formatLine "") cfg.config + lib.mapAttrsToList (formatLine "") cfg.config ++ lib.optional (cfg.extraConfig != "") cfg.extraConfig ) + "\n"; diff --git a/modules/programs/zathura.nix b/modules/programs/zathura.nix index 268608542..f12c32598 100644 --- a/modules/programs/zathura.nix +++ b/modules/programs/zathura.nix @@ -85,8 +85,7 @@ in xdg.configFile."zathura/zathurarc".text = lib.concatStringsSep "\n" ( - [ ] - ++ lib.optional (cfg.extraConfig != "") cfg.extraConfig + lib.optional (cfg.extraConfig != "") cfg.extraConfig ++ lib.mapAttrsToList formatLine cfg.options ++ lib.mapAttrsToList formatMapLine cfg.mappings ) diff --git a/modules/services/vdirsyncer.nix b/modules/services/vdirsyncer.nix index 86611158f..f58caa5ec 100644 --- a/modules/services/vdirsyncer.nix +++ b/modules/services/vdirsyncer.nix @@ -11,8 +11,7 @@ let cfg = config.services.vdirsyncer; vdirsyncerOptions = - [ ] - ++ optional (cfg.verbosity != null) "--verbosity ${cfg.verbosity}" + optional (cfg.verbosity != null) "--verbosity ${cfg.verbosity}" ++ optional (cfg.configFile != null) "--config ${cfg.configFile}"; in diff --git a/modules/xresources.nix b/modules/xresources.nix index b038bca60..4d43c88f0 100644 --- a/modules/xresources.nix +++ b/modules/xresources.nix @@ -104,8 +104,7 @@ in home.file.${cfg.path} = { text = lib.concatStringsSep "\n" ( - [ ] - ++ lib.optional (cfg.extraConfig != "") cfg.extraConfig + lib.optional (cfg.extraConfig != "") cfg.extraConfig ++ lib.optionals (cfg.properties != null) (lib.mapAttrsToList formatLine cfg.properties) ) + "\n"; diff --git a/statix.toml b/statix.toml index c55989f61..bac459458 100644 --- a/statix.toml +++ b/statix.toml @@ -3,7 +3,6 @@ disabled = [ "bool_simplification", "deprecated_is_null", "deprecated_to_path", - "empty_list_concat", "empty_inherit", "empty_let_in", "empty_pattern",