From c8b21a4f51513fc0a066842e83843578d2ce7338 Mon Sep 17 00:00:00 2001 From: Jacob Bachmann Date: Sat, 7 Sep 2024 15:23:55 +0200 Subject: [PATCH] fix: regressions --- modules/desktop/applications.nix | 9 ++++----- modules/home-manager/gui/programs/default.nix | 14 ++++++++------ modules/services/default.nix | 1 + modules/services/syncthing.nix | 5 ++--- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/modules/desktop/applications.nix b/modules/desktop/applications.nix index 8f953d7..5722587 100644 --- a/modules/desktop/applications.nix +++ b/modules/desktop/applications.nix @@ -1,8 +1,7 @@ -{ - config, - lib, - pkgs, - ... +{ config +, lib +, pkgs +, ... }: lib.mkIf config.bchmnn.gui.enable { diff --git a/modules/home-manager/gui/programs/default.nix b/modules/home-manager/gui/programs/default.nix index 1cabc44..5808a64 100644 --- a/modules/home-manager/gui/programs/default.nix +++ b/modules/home-manager/gui/programs/default.nix @@ -1,8 +1,7 @@ -{ - pkgs, - lib, - nixosConfig, - ... +{ pkgs +, lib +, nixosConfig +, ... }: { imports = [ @@ -20,7 +19,6 @@ home.packages = with pkgs; [ - firefox # a web browser built from firefox source tree thunderbird # a full-featured e-mail client speechd # common interface to speech synthesis - https://support.mozilla.org/en-us/kb/speechd-setup @@ -58,5 +56,9 @@ ++ lib.optionals nixosConfig.services.ratbagd.enable [ piper # gtk frontend for ratbagd mouse config daemon + ] + ++ lib.optionals nixosConfig.bchmnn.collections.development.enable [ + wireshark # powerful network protocol analyzer + ]; } diff --git a/modules/services/default.nix b/modules/services/default.nix index 3e63e6d..873135c 100644 --- a/modules/services/default.nix +++ b/modules/services/default.nix @@ -2,5 +2,6 @@ imports = [ ./flare-solvarr.nix ./jackett.nix + ./syncthing.nix ]; } diff --git a/modules/services/syncthing.nix b/modules/services/syncthing.nix index 696b990..a8ffcd7 100644 --- a/modules/services/syncthing.nix +++ b/modules/services/syncthing.nix @@ -1,5 +1,4 @@ -{ lib, config, ... }: -lib.mkIf config.bchmnn.sync.enable { +{ lib, config, ... }: { options.bchmnn.services.syncthing = { enable = lib.mkEnableOption "syncthing"; @@ -7,7 +6,7 @@ lib.mkIf config.bchmnn.sync.enable { config = lib.mkIf (config.bchmnn.services.syncthing.enable) { services.syncthing = { - enable = false; + enable = true; openDefaultPorts = true; settings = {