From 6185dd48a8f1fb35d8b8758f59f65b06cd10c7cb Mon Sep 17 00:00:00 2001 From: Asaki Yuki Date: Mon, 13 Apr 2026 22:25:43 +0700 Subject: [PATCH] add services.nix --- home/asakiyuki/modules/programs.nix | 45 ++++++++++++----------- host/server/default.nix | 6 +-- host/server/programs.nix | 1 + host/server/service.nix | 3 ++ modules/features/services/adguardhome.nix | 8 ++++ 5 files changed, 36 insertions(+), 27 deletions(-) create mode 100644 host/server/service.nix create mode 100644 modules/features/services/adguardhome.nix diff --git a/home/asakiyuki/modules/programs.nix b/home/asakiyuki/modules/programs.nix index 342d885..24a81f7 100644 --- a/home/asakiyuki/modules/programs.nix +++ b/home/asakiyuki/modules/programs.nix @@ -1,23 +1,24 @@ -{ lib, osconfig, ... }: { - imports = [ - (../../../modules/features/home/ghostty.nix) - (../../../modules/features/home/kitty.nix) - (../../../modules/features/home/browsers.nix) - # (../../../modules/features/home/neovide.nix) - - (../../../modules/features/home/bash.nix) - (../../../modules/features/home/starship.nix) - (../../../modules/features/home/tmux.nix) - (../../../modules/features/home/fastfetch.nix) - (../../../modules/features/home/vscode.nix) - (../../../modules/features/home/obs-studio.nix) - (../../../modules/features/home/xdg.nix) - (../../../modules/features/home/packages.nix) - (../../../modules/features/home/git.nix) +{ ... }: +{ + imports = [ + (../../../modules/features/home/ghostty.nix) + (../../../modules/features/home/kitty.nix) + (../../../modules/features/home/browsers.nix) + # (../../../modules/features/home/neovide.nix) - (../../../modules/programs/nixvim/_nixvim.nix) - (../../../modules/programs/nixcord/default.nix) - (../../../modules/features/home/niri.nix) - (../../../modules/programs/hyprland/default.nix) - ]; -} \ No newline at end of file + (../../../modules/features/home/bash.nix) + (../../../modules/features/home/starship.nix) + (../../../modules/features/home/tmux.nix) + (../../../modules/features/home/fastfetch.nix) + (../../../modules/features/home/vscode.nix) + (../../../modules/features/home/obs-studio.nix) + (../../../modules/features/home/xdg.nix) + (../../../modules/features/home/packages.nix) + (../../../modules/features/home/git.nix) + + (../../../modules/programs/nixvim/_nixvim.nix) + (../../../modules/programs/nixcord/default.nix) + (../../../modules/features/home/niri.nix) + (../../../modules/programs/hyprland/default.nix) + ]; +} diff --git a/host/server/default.nix b/host/server/default.nix index b5012c3..a098139 100644 --- a/host/server/default.nix +++ b/host/server/default.nix @@ -2,6 +2,7 @@ { imports = [ ./programs.nix + ./service.nix (libs.root "/modules/features/system/docker.nix") (libs.root "/modules/features/system/packages.nix") @@ -20,11 +21,6 @@ }; services = { - adguardhome = { - enable = true; - port = 34778; - openFirewall = true; - }; fail2ban = { enable = true; diff --git a/host/server/programs.nix b/host/server/programs.nix index a32ca87..38219b4 100644 --- a/host/server/programs.nix +++ b/host/server/programs.nix @@ -1,5 +1,6 @@ { ... }: { programs = { + }; } diff --git a/host/server/service.nix b/host/server/service.nix new file mode 100644 index 0000000..8cd23a0 --- /dev/null +++ b/host/server/service.nix @@ -0,0 +1,3 @@ +{ ... }: [ + imports = []; +] \ No newline at end of file diff --git a/modules/features/services/adguardhome.nix b/modules/features/services/adguardhome.nix new file mode 100644 index 0000000..9b2d2ae --- /dev/null +++ b/modules/features/services/adguardhome.nix @@ -0,0 +1,8 @@ +{ ... }: +{ + services.adguardhome = { + enable = true; + port = 34778; + openFirewall = true; + }; +}