From beee4e58fe6bcd47cebd158df0443bc828a06040 Mon Sep 17 00:00:00 2001 From: Aria Date: Mon, 10 Aug 2026 19:12:42 +0100 Subject: [PATCH] remove dead code --- nix/modules/default.nix | 2 - nix/modules/services/freshrss.nix | 16 -------- nix/modules/services/soft-serve.nix | 57 ----------------------------- nix/pkgs/default.nix | 19 +--------- 4 files changed, 1 insertion(+), 93 deletions(-) delete mode 100644 nix/modules/services/freshrss.nix delete mode 100644 nix/modules/services/soft-serve.nix diff --git a/nix/modules/default.nix b/nix/modules/default.nix index 31fb2b3..2c8864b 100644 --- a/nix/modules/default.nix +++ b/nix/modules/default.nix @@ -59,7 +59,6 @@ in ./services/caddy.nix ./services/calibre-web.nix ./services/emacs/default.nix - ./services/freshrss.nix ./services/fwupd.nix ./services/gnome-keyring.nix ./services/grafana.nix @@ -70,7 +69,6 @@ in ./services/nginx.nix ./services/postgresql.nix ./services/printing.nix - ./services/soft-serve.nix ./services/ssh.nix ./services/syncthing.nix ./services/tailscale.nix diff --git a/nix/modules/services/freshrss.nix b/nix/modules/services/freshrss.nix deleted file mode 100644 index 7dae3a8..0000000 --- a/nix/modules/services/freshrss.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ config, lib, ... }: -let - inherit (lib) mkIf mkDefault; - cfg = config.services.freshrss; -in -mkIf cfg.enable { - services.freshrss.database.type = mkDefault "sqlite"; - - environment.persistence."/persist".directories = [ - { - directory = cfg.dataDir; - inherit (cfg) user; - mode = "0700"; - } - ]; -} diff --git a/nix/modules/services/soft-serve.nix b/nix/modules/services/soft-serve.nix deleted file mode 100644 index 2375f5d..0000000 --- a/nix/modules/services/soft-serve.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ config, lib, ... }: -let - inherit (lib) - mkIf - mkIfElse - mapAttrs - mkDefault - mkMerge - mkForce - mkEnableOption - ; - cfg = config.services.soft-serve; -in -{ - options.services.soft-serve = { - useStaticUser = mkEnableOption "using a static user instead of dynamic"; - withBorgBackups = mkEnableOption "backing up to central borg server"; - }; - config = mkIf cfg.enable { - services.soft-serve.settings = mapAttrs (_: mkDefault) { - log_format = "text"; - ssh = { - max_timeout = 30; - idle_timeout = 60; - }; - }; - - users = mkIf cfg.useStaticUser { - groups.soft-serve = { }; - users.soft-serve = { - group = "soft-serve"; - isSystemUser = true; - }; - }; - - systemd.services.soft-serve.serviceConfig = - let - capNet = "CAP_NET_BIND_SERVICE"; - in - mkMerge [ - { - AmbientCapabilities = mkForce capNet; - CapabilityBoundingSet = mkForce capNet; - PrivateUsers = mkForce false; - } - (mkIf cfg.useStaticUser { - DynamicUser = mkForce false; - User = "soft-serve"; - Group = "soft-serve"; - }) - ]; - - environment.persistence."/persist".directories = [ - (mkIfElse cfg.useStaticUser "/var/lib/soft-serve" "/var/lib/private/soft-serve") - ]; - }; -} diff --git a/nix/pkgs/default.nix b/nix/pkgs/default.nix index 54167f0..9e850bf 100644 --- a/nix/pkgs/default.nix +++ b/nix/pkgs/default.nix @@ -62,24 +62,7 @@ inputs: final: prev: home-assistant-custom-components = prev.home-assistant-custom-components // { iphonedetect = final.callPackage ./iphonedetect.nix { }; }; - freshrss-extensions = prev.freshrss-extensions // { - youlag = final.freshrss-extensions.buildFreshRssExtension ( - let - version = "4.3.0"; - in - { - FreshRssExtUniqueId = "Youlag"; - pname = "youlag"; - inherit version; - src = final.fetchFromGitHub { - owner = "civilblur"; - repo = "youlag"; - rev = "v${version}"; - hash = "sha256-nO+RElBKHHzySqZ/xoUfHVvlQGytVebkjci3NWtl/vY="; - }; - } - ); - }; + # Vendored a zip file because I can't be bothered building it properly lol organice = final.runCommandLocal "organice" { } '' mkdir -p $out -- 2.51.2