From 0b92e733aaaf1207a3b219e4e103ac50b54ec815 Mon Sep 17 00:00:00 2001 From: oqyude Date: Wed, 6 Aug 2025 23:11:59 +0300 Subject: [PATCH] 1 --- modules/default.nix | 9 +++++++-- modules/server/default.nix | 8 -------- modules/server/mealie.nix | 11 +++++++++++ modules/server/miniflux.nix | 13 +++++++++++++ nixosModules/server/default.nix | 10 ++++++++++ {modules => nixosModules}/server/stirling-pdf.nix | 5 ++++- 6 files changed, 45 insertions(+), 11 deletions(-) delete mode 100644 modules/server/default.nix create mode 100755 modules/server/mealie.nix create mode 100755 modules/server/miniflux.nix create mode 100644 nixosModules/server/default.nix rename {modules => nixosModules}/server/stirling-pdf.nix (90%) diff --git a/modules/default.nix b/modules/default.nix index 78d0554..1239dd7 100755 --- a/modules/default.nix +++ b/modules/default.nix @@ -4,19 +4,24 @@ lib, ... }: +# let +# isServer = config.xlib.device.type == "server"; +# in { imports = with inputs; [ ./essentials - ./server ./users.nix ./options.nix #./overlays.nix ./temp.nix - #(lib.mkIf (config.xlib.device.type == "server") (import ./server { inherit inputs config lib pkgs ; })) + ../nixosModules/server home-manager.nixosModules.home-manager # home-manager module nix-index-database.nixosModules.nix-index # nix-index module ]; + + server.enable = (config.xlib.device.type == "server"); + _module.args.inputs = inputs; services.immich.package = lib.mkIf ( config.xlib.device.type == "server" diff --git a/modules/server/default.nix b/modules/server/default.nix deleted file mode 100644 index 074b42f..0000000 --- a/modules/server/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - config, - lib, - ... -}: -{ - imports = [ ./stirling-pdf.nix ]; -} diff --git a/modules/server/mealie.nix b/modules/server/mealie.nix new file mode 100755 index 0000000..5c3a92e --- /dev/null +++ b/modules/server/mealie.nix @@ -0,0 +1,11 @@ +{ + config, + ... +}: +{ + services.mealie = { + enable = false; + listenAddress = "0.0.0.0"; + port = 9000; + }; +} diff --git a/modules/server/miniflux.nix b/modules/server/miniflux.nix new file mode 100755 index 0000000..93b1937 --- /dev/null +++ b/modules/server/miniflux.nix @@ -0,0 +1,13 @@ +{ + config, + ... +}: +{ + services.miniflux = { + enable = false; + config = { + CLEANUP_FREQUENCY = 48; + LISTEN_ADDR = "localhost:6061"; + }; + }; +} diff --git a/nixosModules/server/default.nix b/nixosModules/server/default.nix new file mode 100644 index 0000000..e09155d --- /dev/null +++ b/nixosModules/server/default.nix @@ -0,0 +1,10 @@ +{ + config, + lib, + ... +}: +{ + imports = [ + ./stirling-pdf.nix + ]; +} diff --git a/modules/server/stirling-pdf.nix b/nixosModules/server/stirling-pdf.nix similarity index 90% rename from modules/server/stirling-pdf.nix rename to nixosModules/server/stirling-pdf.nix index 3804d8e..0fa3f07 100644 --- a/modules/server/stirling-pdf.nix +++ b/nixosModules/server/stirling-pdf.nix @@ -15,7 +15,10 @@ # version = "1.1.1"; # }); # in -lib.mkIf (config.xlib.device.type == "server") { + +# lib.mkIf (config.xlib.device.type == "server") + +{ services.stirling-pdf = { enable = true; #package = customPackage;