From 11e51030e0d639ddddba99cadff1fc5784021cb9 Mon Sep 17 00:00:00 2001 From: Nick Date: Tue, 2 Dec 2025 13:59:40 -0600 Subject: [PATCH 1/5] fix: espanso finally works --- flake.nix | 2 +- modules/home/default.nix | 1 + profiles/user0/default.nix | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 27cfdd4..5659c43 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 a719bc3..e90e271 100755 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -89,6 +89,7 @@ in cli dolphin element + espanso emote feishin flameshot diff --git a/profiles/user0/default.nix b/profiles/user0/default.nix index 1dac1ff..dd87de7 100755 --- a/profiles/user0/default.nix +++ b/profiles/user0/default.nix @@ -37,6 +37,7 @@ in "adbusers" "caddy" "disk" + "input" "jellyfin" "libvirtd" "minecraft" From 2d551d716c700820e1932bc818da013bc136ad57 Mon Sep 17 00:00:00 2001 From: Nick Date: Tue, 2 Dec 2025 15:30:13 -0600 Subject: [PATCH 2/5] feat: added elastic search script to mastodon --- modules/nixos/guests/mastodon/default.nix | 46 ++++++++++++++++++----- 1 file changed, 37 insertions(+), 9 deletions(-) diff --git a/modules/nixos/guests/mastodon/default.nix b/modules/nixos/guests/mastodon/default.nix index 35bc7cf..b279932 100755 --- a/modules/nixos/guests/mastodon/default.nix +++ b/modules/nixos/guests/mastodon/default.nix @@ -270,6 +270,23 @@ 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"; + # Remove RemainAfterExit for recurring tasks + }; + script = '' + mastodon-tootctl search deploy --only-mapping --only=instances accounts tags statuses public_statuses + ''; + }; + mastodon-copy-secrets = { description = "Copy secrets from virtiofs to local filesystem"; before = [ "mastodon-init-dirs.service" ]; @@ -364,16 +381,27 @@ in ''; }; }; - timers.fedifetcher = { - description = "Timer for FediFetcher"; - wantedBy = [ "timers.target" ]; + timers = { + mastodon-elastic-search = { + description = "Timer for Mastodon elastic search recaching"; + wantedBy = [ "timers.target" ]; + timerConfig = { + OnBootSec = "10min"; + OnUnitActiveSec = "60min"; + Unit = "mastodon-elastic-search.service"; + }; + }; - timerConfig = { - OnBootSec = "10min"; - OnUnitActiveSec = "15min"; - Unit = "fedifetcher.service"; - Persistent = true; - AccuracySec = "1min"; + fedifetcher = { + description = "Timer for FediFetcher"; + wantedBy = [ "timers.target" ]; + timerConfig = { + OnBootSec = "10min"; + OnUnitActiveSec = "15min"; + Unit = "fedifetcher.service"; + Persistent = true; + AccuracySec = "1min"; + }; }; }; From cc35c13e2db058960c624a6ef2a2df1b03a8d287 Mon Sep 17 00:00:00 2001 From: Nick Date: Tue, 2 Dec 2025 16:48:55 -0600 Subject: [PATCH 3/5] feat: added elastic search script to mastodon --- modules/nixos/guests/mastodon/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/nixos/guests/mastodon/default.nix b/modules/nixos/guests/mastodon/default.nix index b279932..a59dda4 100755 --- a/modules/nixos/guests/mastodon/default.nix +++ b/modules/nixos/guests/mastodon/default.nix @@ -280,10 +280,9 @@ in serviceConfig = { WorkingDirectory = "/var/lib/${serviceCfg.name}"; Type = "oneshot"; - # Remove RemainAfterExit for recurring tasks }; script = '' - mastodon-tootctl search deploy --only-mapping --only=instances accounts tags statuses public_statuses + ${pkgs.mastodon}/bin/mastodon-tootctl search deploy --only-mapping --only=instances accounts tags statuses public_statuses ''; }; From bf57fefa3e0daddeee28c03d71093b09e9716a99 Mon Sep 17 00:00:00 2001 From: Nick Date: Tue, 2 Dec 2025 16:57:57 -0600 Subject: [PATCH 4/5] feat: added elastic search script to mastodon --- modules/nixos/guests/mastodon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/nixos/guests/mastodon/default.nix b/modules/nixos/guests/mastodon/default.nix index a59dda4..74f2cd7 100755 --- a/modules/nixos/guests/mastodon/default.nix +++ b/modules/nixos/guests/mastodon/default.nix @@ -270,7 +270,7 @@ in mastodon-sidekiq-mailers.serviceConfig.PrivateMounts = lib.mkForce false; mastodon-sidekiq-push-pull.serviceConfig.PrivateMounts = lib.mkForce false; - mastodon-elastic-search = { + systemd.services.mastodon-elastic-search = { description = "Recache elastic search"; after = [ "network-online.target" @@ -282,7 +282,7 @@ in Type = "oneshot"; }; script = '' - ${pkgs.mastodon}/bin/mastodon-tootctl search deploy --only-mapping --only=instances accounts tags statuses public_statuses + /run/current-system/sw/bin/mastodon-tootctl search deploy --only-mapping --only=instances accounts tags statuses public_statuses ''; }; From d48c3ce4e526a605065e09f3a4ef4d674db6084b Mon Sep 17 00:00:00 2001 From: Nick Date: Tue, 2 Dec 2025 17:19:49 -0600 Subject: [PATCH 5/5] feat: added elastic search script to mastodon --- modules/nixos/guests/mastodon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/nixos/guests/mastodon/default.nix b/modules/nixos/guests/mastodon/default.nix index 74f2cd7..24f0428 100755 --- a/modules/nixos/guests/mastodon/default.nix +++ b/modules/nixos/guests/mastodon/default.nix @@ -270,7 +270,7 @@ in mastodon-sidekiq-mailers.serviceConfig.PrivateMounts = lib.mkForce false; mastodon-sidekiq-push-pull.serviceConfig.PrivateMounts = lib.mkForce false; - systemd.services.mastodon-elastic-search = { + mastodon-elastic-search = { description = "Recache elastic search"; after = [ "network-online.target" @@ -282,7 +282,7 @@ in Type = "oneshot"; }; script = '' - /run/current-system/sw/bin/mastodon-tootctl search deploy --only-mapping --only=instances accounts tags statuses public_statuses + /run/current-system/sw/bin/mastodon-tootctl search deploy --only=instances accounts tags statuses public_statuses ''; };