diff --git a/modules/home/de/tray.nix b/modules/home/de/tray.nix index c5f75eb..573ec84 100644 --- a/modules/home/de/tray.nix +++ b/modules/home/de/tray.nix @@ -6,52 +6,25 @@ }: let cfg = config.myConfig.de; in { - options.myConfig.de = { - tray = { - syncthing.enable = lib.mkEnableOption ""; - networkmanager.enable = lib.mkEnableOption ""; + options.myConfig.de.tray.syncthing.enable = lib.mkEnableOption ""; + + config = lib.mkIf cfg.tray.syncthing.enable { + home.packages = [pkgs.syncthingtray-minimal]; + + systemd.user.services = { + syncthingtray = { + Unit = { + Description = "Syncthingtray"; + Requires = ["tray.target"]; + After = [ + "graphical-session-pre.target" + "tray.target" + ]; + PartOf = ["graphical-session.target"]; + }; + Service.ExecStart = "${lib.getExe' pkgs.syncthingtray-minimal "syncthingtray"} --wait"; + Install.WantedBy = ["graphical-session.target"]; + }; }; }; - - config = lib.mkMerge [ - (lib.mkIf cfg.tray.syncthing.enable { - home.packages = [pkgs.syncthingtray-minimal]; - - systemd.user.services = { - syncthingtray = { - Unit = { - Description = "Syncthingtray"; - Requires = ["tray.target"]; - After = [ - "graphical-session-pre.target" - "tray.target" - ]; - PartOf = ["graphical-session.target"]; - }; - Service.ExecStart = "${lib.getExe' pkgs.syncthingtray-minimal "syncthingtray"} --wait"; - Install.WantedBy = ["graphical-session.target"]; - }; - }; - }) - - (lib.mkIf cfg.tray.networkmanager.enable { - home.packages = [pkgs.networkmanagerapplet]; - - systemd.user.services = { - nm-applet = { - Unit = { - Description = "Networkmanager-applet"; - Requires = ["tray.target"]; - After = [ - "graphical-session-pre.target" - "tray.target" - ]; - PartOf = ["graphical-session.target"]; - }; - Service.ExecStart = "${lib.getExe pkgs.networkmanagerapplet}"; - Install.WantedBy = ["graphical-session.target"]; - }; - }; - }) - ]; } diff --git a/users/seb/home.nix b/users/seb/home.nix index f32b3d8..86c864b 100644 --- a/users/seb/home.nix +++ b/users/seb/home.nix @@ -11,10 +11,7 @@ wallpaper = ./wallpaper; theming.enable = true; - tray = { - syncthing.enable = osConfig.myConfig.syncthing.enable; - networkmanager.enable = osConfig.networking.networkmanager.enable; - }; + tray.syncthing.enable = osConfig.myConfig.syncthing.enable; }; shell = {