mirror of
https://github.com/SebastianStork/nixos-config.git
synced 2026-01-22 00:21: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 "";
|
||||
|
||||
config = lib.mkIf config.custom.programs.libreoffice.enable {
|
||||
home.packages = with pkgs; [
|
||||
libreoffice
|
||||
hunspell
|
||||
hunspellDicts.de_DE
|
||||
hunspellDicts.en_US
|
||||
home.packages = [
|
||||
pkgs.libreoffice
|
||||
pkgs.hunspell
|
||||
pkgs.hunspellDicts.de_DE
|
||||
pkgs.hunspellDicts.en_US
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -113,9 +113,14 @@ in
|
|||
};
|
||||
|
||||
declarativePlugins =
|
||||
with pkgs.grafanaPlugins;
|
||||
(lib.optional cfg.datasources.victoriametrics.enable victoriametrics-metrics-datasource)
|
||||
++ (lib.optional cfg.datasources.victorialogs.enable victoriametrics-logs-datasource);
|
||||
let
|
||||
plugins = pkgs.grafanaPlugins;
|
||||
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 = {
|
||||
|
|
|
|||
|
|
@ -71,10 +71,14 @@ in
|
|||
custom = {
|
||||
services.resticBackups.hedgedoc = lib.mkIf cfg.doBackups {
|
||||
conflictingService = "hedgedoc.service";
|
||||
paths = with config.services.hedgedoc.settings; [
|
||||
uploadsPath
|
||||
db.storage
|
||||
];
|
||||
paths =
|
||||
let
|
||||
inherit (config.services.hedgedoc) settings;
|
||||
in
|
||||
[
|
||||
settings.uploadsPath
|
||||
settings.db.storage
|
||||
];
|
||||
};
|
||||
|
||||
persist.directories = [ dataDir ];
|
||||
|
|
|
|||
|
|
@ -53,12 +53,10 @@ in
|
|||
runtimeInputs = [
|
||||
pkgs.git
|
||||
pkgs.gawk
|
||||
(pkgs.python3.withPackages (
|
||||
python-pkgs: with python-pkgs; [
|
||||
dateutil
|
||||
vobject
|
||||
]
|
||||
))
|
||||
(pkgs.python3.withPackages (python-pkgs: [
|
||||
python-pkgs.dateutil
|
||||
python-pkgs.vobject
|
||||
]))
|
||||
];
|
||||
text = ''
|
||||
username="$1"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue