diff options
author | lassulus <lass@aidsballs.de> | 2015-10-07 18:09:50 +0200 |
---|---|---|
committer | lassulus <lass@aidsballs.de> | 2015-10-07 18:09:50 +0200 |
commit | 1e9770b09377dfebd6b389cfb6b0f7dca2e80fb3 (patch) | |
tree | 727de1aaae2e1a9ea69008c76e047c316f015c1f | |
parent | 9d2d034542da532a2242d8e407ba0da8fad2fb9a (diff) | |
parent | 36d43bf73f498228ff540e86e6dd6596a353a0da (diff) |
Merge remote-tracking branch 'pnp/master'
-rw-r--r-- | krebs/3modules/realwallpaper.nix | 2 | ||||
-rw-r--r-- | makefu/3modules/tinc_graphs.nix | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/krebs/3modules/realwallpaper.nix b/krebs/3modules/realwallpaper.nix index d5c1aeabd..7e02538f5 100644 --- a/krebs/3modules/realwallpaper.nix +++ b/krebs/3modules/realwallpaper.nix @@ -55,13 +55,13 @@ let imp = { systemd.timers.realwallpaper = { description = "real wallpaper generator timer"; + wantedBy = [ "timers.target" ]; timerConfig = cfg.timerConfig; }; systemd.services.realwallpaper = { description = "real wallpaper generator"; - wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; path = with pkgs; [ diff --git a/makefu/3modules/tinc_graphs.nix b/makefu/3modules/tinc_graphs.nix index 06b3f6263..62d607527 100644 --- a/makefu/3modules/tinc_graphs.nix +++ b/makefu/3modules/tinc_graphs.nix @@ -64,13 +64,11 @@ let environment.systemPackages = [ pkgs.tinc_graphs]; systemd.timers.tinc_graphs = { description = "Build Tinc Graphs via via timer"; - + wantedBy = [ "timers.target"]; timerConfig = cfg.timerConfig; }; systemd.services.tinc_graphs = { description = "Build Tinc Graphs"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; environment = { EXTERNAL_FOLDER = external_dir; INTERNAL_FOLDER = internal_dir; |