From 786327f6d2c38f095ac1edb6db4c060f2840209a Mon Sep 17 00:00:00 2001
From: oqyude <oqyude@gmail.com>
Date: Tue, 7 Oct 2025 10:28:31 +0300
Subject: [PATCH] cleaning

---
 nixosModules/default.nix                       |  8 ++------
 nixosModules/options.nix                       | 10 ----------
 nixosModules/server/default.nix                |  2 +-
 nixosModules/server/nextcloud.nix              |  4 ----
 nixosModules/{services => server}/node-red.nix |  2 +-
 5 files changed, 4 insertions(+), 22 deletions(-)
 rename nixosModules/{services => server}/node-red.nix (81%)

diff --git a/nixosModules/default.nix b/nixosModules/default.nix
index 4c4093b..69c9435 100755
--- a/nixosModules/default.nix
+++ b/nixosModules/default.nix
@@ -39,7 +39,6 @@ let
       config,
       lib,
       xlib,
-      deviceType,
       ...
     }:
     {
@@ -47,12 +46,9 @@ let
         ./essentials
         ./users.nix
         ./options.nix
-        (./. + "/${deviceType}") # specific modules
-
-        home-manager.nixosModules.home-manager # home-manager module
-        sops-nix.nixosModules.sops # sops module
-        self.homeConfigurations.default.nixosModule # default homeConfigurations
+        
         disko.nixosModules.disko # disko module
+        sops-nix.nixosModules.sops # sops module
       ];
 
       home-manager = {
diff --git a/nixosModules/options.nix b/nixosModules/options.nix
index 2f75286..6a41ee4 100755
--- a/nixosModules/options.nix
+++ b/nixosModules/options.nix
@@ -106,16 +106,6 @@
           default = "/mnt/services";
           description = "All services folder.";
         };
-        immich-folder = lib.mkOption {
-          type = lib.types.str;
-          default = "${config.xlib.dirs.server-home}/Services/immich";
-          description = "Immich service folder.";
-        };
-        nextcloud-folder = lib.mkOption {
-          type = lib.types.str;
-          default = "${config.xlib.dirs.server-home}/Services/nextcloud";
-          description = "Nextcloud service folder.";
-        };
         postgresql-folder = lib.mkOption {
           type = lib.types.str;
           default = "${config.xlib.dirs.server-home}/Services/postgresql";
diff --git a/nixosModules/server/default.nix b/nixosModules/server/default.nix
index 500a89c..c59f08b 100755
--- a/nixosModules/server/default.nix
+++ b/nixosModules/server/default.nix
@@ -5,7 +5,7 @@
 {
   imports = [
     ../software/beets
-    ../services/node-red.nix
+    ./node-red.nix
     ./uptime-kuma.nix
     ./calibre-web.nix
     ./immich.nix
diff --git a/nixosModules/server/nextcloud.nix b/nixosModules/server/nextcloud.nix
index d1e75cc..15c5b89 100755
--- a/nixosModules/server/nextcloud.nix
+++ b/nixosModules/server/nextcloud.nix
@@ -7,10 +7,6 @@
   ...
 }:
 let
-  stable = import inputs.nixpkgs-stable {
-    system = "x86_64-linux";
-    config.allowUnfree = true;
-  };
   work = import inputs.nixpkgs-stable {
     system = "x86_64-linux";
     config.allowUnfree = true;
diff --git a/nixosModules/services/node-red.nix b/nixosModules/server/node-red.nix
similarity index 81%
rename from nixosModules/services/node-red.nix
rename to nixosModules/server/node-red.nix
index 5c3f397..4a4ddb8 100644
--- a/nixosModules/services/node-red.nix
+++ b/nixosModules/server/node-red.nix
@@ -16,6 +16,6 @@
   };
 
   systemd.tmpfiles.rules = [
-    "z ${xlib.dirs.services-mnt-folder}/node-red 0750 node-red node-red -"
+    "z ${config.services.node-red.userDir} 0750 node-red node-red -"
   ];
 }