1
0
Fork 0

Users: re-enable Syncthing Tray

This commit is contained in:
Aires 2024-11-15 16:16:22 -05:00
parent 61df793f90
commit b6f6da57e5
4 changed files with 19 additions and 13 deletions

View file

@ -5,7 +5,7 @@
inputs = { inputs = {
# Import the desired Nix channel. Defaults to unstable, which uses a fully tested rolling release model. # Import the desired Nix channel. Defaults to unstable, which uses a fully tested rolling release model.
# You can find a list of channels at https://wiki.nixos.org/wiki/Nix_channels # You can find a list of channels at https://wiki.nixos.org/wiki/Channel_branches
# To follow a different channel, replace `nixos-unstable` with the channel name, e.g. `nixos-24.05`. # To follow a different channel, replace `nixos-unstable` with the channel name, e.g. `nixos-24.05`.
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";

View file

@ -105,11 +105,17 @@ in
users = { users = {
aires = { aires = {
enable = true; enable = true;
services.syncthing.enable = true; services.syncthing = {
enable = true;
enableTray = true;
};
}; };
gremlin = { gremlin = {
enable = true; enable = true;
services.syncthing.enable = true; services.syncthing = {
enable = true;
enableTray = true;
};
}; };
}; };
}; };

View file

@ -122,10 +122,11 @@ in
# Enable Syncthing # Enable Syncthing
(lib.mkIf cfg.services.syncthing.enable { (lib.mkIf cfg.services.syncthing.enable {
users.users.aires.packages = [ users.users.aires.packages = [ pkgs.syncthing ];
pkgs.syncthing
(lib.mkIf cfg.services.syncthing.enableTray pkgs.syncthingtray) services.flatpak.packages = lib.mkIf (
]; config.aux.system.ui.flatpak.enable && cfg.services.syncthing.enableTray
) [ "io.github.martchus.syncthingtray" ];
# Open port 8080 # Open port 8080
networking.firewall.allowedTCPPorts = [ 8080 ]; networking.firewall.allowedTCPPorts = [ 8080 ];

View file

@ -103,12 +103,11 @@ in
# Enable Syncthing # Enable Syncthing
(lib.mkIf cfg.services.syncthing.enable { (lib.mkIf cfg.services.syncthing.enable {
users.users.gremlin = { users.users.gremlin.packages = [ pkgs.syncthing ];
packages = [
pkgs.syncthing services.flatpak.packages = lib.mkIf (
(lib.mkIf cfg.services.syncthing.enableTray pkgs.syncthingtray) config.aux.system.ui.flatpak.enable && cfg.services.syncthing.enableTray
]; ) [ "io.github.martchus.syncthingtray" ];
};
home-manager.users.gremlin = { home-manager.users.gremlin = {
# Syncthing options # Syncthing options