mirror of
https://github.com/SebastianStork/nixos-config.git
synced 2026-01-21 14:01:34 +01:00
Remove the nm-tray module
This commit is contained in:
parent
e9240076e2
commit
d56f0ad920
2 changed files with 20 additions and 50 deletions
|
|
@ -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"];
|
||||
};
|
||||
};
|
||||
})
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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 = {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue