diff --git a/flake.nix b/flake.nix index 5659c43..27cfdd4 100755 --- a/flake.nix +++ b/flake.nix @@ -126,7 +126,7 @@ config.nixosModules.mantle config.nixosModules.crust inputs.home-manager.nixosModules.home-manager - # inputs.lix-module.nixosModules.default + inputs.lix-module.nixosModules.default inputs.nur.modules.nixos.default inputs.sops-nix.nixosModules.sops ]; diff --git a/modules/home/default.nix b/modules/home/default.nix index e90e271..a719bc3 100755 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -89,7 +89,6 @@ in cli dolphin element - espanso emote feishin flameshot diff --git a/modules/nixos/guests/mastodon/default.nix b/modules/nixos/guests/mastodon/default.nix index 24f0428..35bc7cf 100755 --- a/modules/nixos/guests/mastodon/default.nix +++ b/modules/nixos/guests/mastodon/default.nix @@ -270,22 +270,6 @@ in mastodon-sidekiq-mailers.serviceConfig.PrivateMounts = lib.mkForce false; mastodon-sidekiq-push-pull.serviceConfig.PrivateMounts = lib.mkForce false; - mastodon-elastic-search = { - description = "Recache elastic search"; - after = [ - "network-online.target" - "mastodon-web.service" - ]; - wants = [ "network-online.target" ]; - serviceConfig = { - WorkingDirectory = "/var/lib/${serviceCfg.name}"; - Type = "oneshot"; - }; - script = '' - /run/current-system/sw/bin/mastodon-tootctl search deploy --only=instances accounts tags statuses public_statuses - ''; - }; - mastodon-copy-secrets = { description = "Copy secrets from virtiofs to local filesystem"; before = [ "mastodon-init-dirs.service" ]; @@ -380,27 +364,16 @@ in ''; }; }; - timers = { - mastodon-elastic-search = { - description = "Timer for Mastodon elastic search recaching"; - wantedBy = [ "timers.target" ]; - timerConfig = { - OnBootSec = "10min"; - OnUnitActiveSec = "60min"; - Unit = "mastodon-elastic-search.service"; - }; - }; + timers.fedifetcher = { + description = "Timer for FediFetcher"; + wantedBy = [ "timers.target" ]; - fedifetcher = { - description = "Timer for FediFetcher"; - wantedBy = [ "timers.target" ]; - timerConfig = { - OnBootSec = "10min"; - OnUnitActiveSec = "15min"; - Unit = "fedifetcher.service"; - Persistent = true; - AccuracySec = "1min"; - }; + timerConfig = { + OnBootSec = "10min"; + OnUnitActiveSec = "15min"; + Unit = "fedifetcher.service"; + Persistent = true; + AccuracySec = "1min"; }; }; diff --git a/profiles/user0/default.nix b/profiles/user0/default.nix index dd87de7..1dac1ff 100755 --- a/profiles/user0/default.nix +++ b/profiles/user0/default.nix @@ -37,7 +37,6 @@ in "adbusers" "caddy" "disk" - "input" "jellyfin" "libvirtd" "minecraft"