mirror of
https://github.com/SebastianStork/nixos-config.git
synced 2026-01-21 18:41:34 +01:00
Remove all uses of with
I decided once again that I don't like `with`
This commit is contained in:
parent
e72397e3e1
commit
72d4580779
4 changed files with 25 additions and 18 deletions
|
|
@ -8,11 +8,11 @@
|
||||||
options.custom.programs.libreoffice.enable = lib.mkEnableOption "";
|
options.custom.programs.libreoffice.enable = lib.mkEnableOption "";
|
||||||
|
|
||||||
config = lib.mkIf config.custom.programs.libreoffice.enable {
|
config = lib.mkIf config.custom.programs.libreoffice.enable {
|
||||||
home.packages = with pkgs; [
|
home.packages = [
|
||||||
libreoffice
|
pkgs.libreoffice
|
||||||
hunspell
|
pkgs.hunspell
|
||||||
hunspellDicts.de_DE
|
pkgs.hunspellDicts.de_DE
|
||||||
hunspellDicts.en_US
|
pkgs.hunspellDicts.en_US
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -113,9 +113,14 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
declarativePlugins =
|
declarativePlugins =
|
||||||
with pkgs.grafanaPlugins;
|
let
|
||||||
(lib.optional cfg.datasources.victoriametrics.enable victoriametrics-metrics-datasource)
|
plugins = pkgs.grafanaPlugins;
|
||||||
++ (lib.optional cfg.datasources.victorialogs.enable victoriametrics-logs-datasource);
|
in
|
||||||
|
[
|
||||||
|
(lib.optional cfg.datasources.victoriametrics.enable plugins.victoriametrics-metrics-datasource)
|
||||||
|
(lib.optional cfg.datasources.victorialogs.enable plugins.victoriametrics-logs-datasource)
|
||||||
|
]
|
||||||
|
|> lib.concatLists;
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.etc = {
|
environment.etc = {
|
||||||
|
|
|
||||||
|
|
@ -71,10 +71,14 @@ in
|
||||||
custom = {
|
custom = {
|
||||||
services.resticBackups.hedgedoc = lib.mkIf cfg.doBackups {
|
services.resticBackups.hedgedoc = lib.mkIf cfg.doBackups {
|
||||||
conflictingService = "hedgedoc.service";
|
conflictingService = "hedgedoc.service";
|
||||||
paths = with config.services.hedgedoc.settings; [
|
paths =
|
||||||
uploadsPath
|
let
|
||||||
db.storage
|
inherit (config.services.hedgedoc) settings;
|
||||||
];
|
in
|
||||||
|
[
|
||||||
|
settings.uploadsPath
|
||||||
|
settings.db.storage
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
persist.directories = [ dataDir ];
|
persist.directories = [ dataDir ];
|
||||||
|
|
|
||||||
|
|
@ -53,12 +53,10 @@ in
|
||||||
runtimeInputs = [
|
runtimeInputs = [
|
||||||
pkgs.git
|
pkgs.git
|
||||||
pkgs.gawk
|
pkgs.gawk
|
||||||
(pkgs.python3.withPackages (
|
(pkgs.python3.withPackages (python-pkgs: [
|
||||||
python-pkgs: with python-pkgs; [
|
python-pkgs.dateutil
|
||||||
dateutil
|
python-pkgs.vobject
|
||||||
vobject
|
]))
|
||||||
]
|
|
||||||
))
|
|
||||||
];
|
];
|
||||||
text = ''
|
text = ''
|
||||||
username="$1"
|
username="$1"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue