From b55b12ff7e224d88b3da5b1704a7d2e38eed4f4f Mon Sep 17 00:00:00 2001
From: oqyude <oqyude@gmail.com>
Date: Thu, 7 Aug 2025 02:02:51 +0300
Subject: [PATCH] i...

---
 flake.nix                            | 72 ++++++++++++++--------------
 nixosConfigurations/hosts/server.nix |  8 ++--
 nixosModules/base.nix                | 29 +++++++++++
 nixosModules/default.nix             | 31 ++----------
 nixosModules/server/default.nix      |  5 +-
 nixosModules/server/nextcloud.nix    |  1 -
 nixosModules/server/nginx.nix        |  1 -
 7 files changed, 77 insertions(+), 70 deletions(-)
 create mode 100755 nixosModules/base.nix

diff --git a/flake.nix b/flake.nix
index 62768fe..a82777e 100755
--- a/flake.nix
+++ b/flake.nix
@@ -94,42 +94,42 @@
       flakeContext = { inherit inputs; };
     in
     {
-      nixosModules = {
-        default = import ./modules/default.nix flakeContext;
-        desktop = import ./modules/desktop/default.nix flakeContext;
-        software = {
-          ai = import ./modules/software/ai.nix flakeContext;
-          beets = import ./modules/software/beets/default.nix flakeContext;
-          daw = import ./modules/software/daw.nix flakeContext;
-          virtual = import ./modules/software/virtual.nix flakeContext;
-          wine = import ./modules/software/wine.nix flakeContext;
-        };
-        extra = {
-          self = {
-            fingerprint = import ./modules/extra/self/fingerprint.nix flakeContext;
-            zapret = import ./modules/extra/self/zapret.nix flakeContext;
-          };
-          musnix = import ./modules/extra/musnix.nix flakeContext; # https://github.com/musnix/musnix
-          gaming = {
-            aagl = import ./modules/extra/gaming/aagl.nix flakeContext; # https://github.com/ezKEa/aagl-gtk-on-nix
-            nix-gaming = import ./modules/extra/gaming/nix-gaming.nix flakeContext; # https://github.com/fufexan/nix-gaming
-          };
-        };
-        server = {
-          cloudflared = import ./modules/server/cloudflared.nix flakeContext;
-          immich = import ./modules/server/immich.nix flakeContext;
-          nextcloud = import ./modules/server/nextcloud.nix flakeContext;
-          nginx = import ./modules/server/nginx.nix flakeContext;
-          open-webui = import ./modules/server/open-webui.nix flakeContext;
-          zerotier = import ./modules/server/zerotier.nix flakeContext;
-        };
-        vds = {
-          cloudflared = import ./modules/vds/cloudflared.nix flakeContext;
-          netbird = import ./modules/vds/netbird.nix flakeContext;
-          nginx = import ./modules/vds/nginx.nix flakeContext;
-          xray = import ./modules/vds/xray.nix flakeContext;
-        };
-      };
+      # nixosModules = {
+      #   default = import ./modules/default.nix flakeContext;
+      #   desktop = import ./modules/desktop/default.nix flakeContext;
+      #   software = {
+      #     ai = import ./modules/software/ai.nix flakeContext;
+      #     beets = import ./modules/software/beets/default.nix flakeContext;
+      #     daw = import ./modules/software/daw.nix flakeContext;
+      #     virtual = import ./modules/software/virtual.nix flakeContext;
+      #     wine = import ./modules/software/wine.nix flakeContext;
+      #   };
+      #   extra = {
+      #     self = {
+      #       fingerprint = import ./modules/extra/self/fingerprint.nix flakeContext;
+      #       zapret = import ./modules/extra/self/zapret.nix flakeContext;
+      #     };
+      #     musnix = import ./modules/extra/musnix.nix flakeContext; # https://github.com/musnix/musnix
+      #     gaming = {
+      #       aagl = import ./modules/extra/gaming/aagl.nix flakeContext; # https://github.com/ezKEa/aagl-gtk-on-nix
+      #       nix-gaming = import ./modules/extra/gaming/nix-gaming.nix flakeContext; # https://github.com/fufexan/nix-gaming
+      #     };
+      #   };
+      #   server = {
+      #     cloudflared = import ./modules/server/cloudflared.nix flakeContext;
+      #     immich = import ./modules/server/immich.nix flakeContext;
+      #     nextcloud = import ./modules/server/nextcloud.nix flakeContext;
+      #     nginx = import ./modules/server/nginx.nix flakeContext;
+      #     open-webui = import ./modules/server/open-webui.nix flakeContext;
+      #     zerotier = import ./modules/server/zerotier.nix flakeContext;
+      #   };
+      #   vds = {
+      #     cloudflared = import ./modules/vds/cloudflared.nix flakeContext;
+      #     netbird = import ./modules/vds/netbird.nix flakeContext;
+      #     nginx = import ./modules/vds/nginx.nix flakeContext;
+      #     xray = import ./modules/vds/xray.nix flakeContext;
+      #   };
+      # };
     }
     // (import ./homeConfigurations flakeContext)
     // (import ./nixosConfigurations flakeContext)
diff --git a/nixosConfigurations/hosts/server.nix b/nixosConfigurations/hosts/server.nix
index 97c972f..b817f50 100755
--- a/nixosConfigurations/hosts/server.nix
+++ b/nixosConfigurations/hosts/server.nix
@@ -16,10 +16,10 @@ let
       imports = [
         ./hardware/server.nix
 
-        self.nixosModules.server.immich
-        self.nixosModules.server.nextcloud
-        self.nixosModules.server.nginx
-        self.nixosModules.software.beets
+        # self.nixosModules.server.immich
+        # self.nixosModules.server.nextcloud
+        # self.nixosModules.server.nginx
+        # self.nixosModules.software.beets
       ];
 
       home-manager = {
diff --git a/nixosModules/base.nix b/nixosModules/base.nix
new file mode 100755
index 0000000..6a6cabf
--- /dev/null
+++ b/nixosModules/base.nix
@@ -0,0 +1,29 @@
+{ inputs, ... }@flakeContext:
+{
+  config,
+  lib,
+  xlib,
+  deviceType,
+  ...
+}:
+{
+  imports = with inputs; [
+    ./essentials
+    ./users.nix
+    ./options.nix
+    #./overlays.nix
+    ./temp.nix
+    (./. + "/${deviceType}") # specific modules
+
+    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;
+  _module.args.xlib = config.xlib;
+  services.immich.package = lib.mkIf (
+    config.xlib.device.type == "server"
+  ) inputs.self.packages.x86_64-linux.immich;
+}
diff --git a/nixosModules/default.nix b/nixosModules/default.nix
index 6a6cabf..97339a9 100755
--- a/nixosModules/default.nix
+++ b/nixosModules/default.nix
@@ -1,29 +1,6 @@
-{ inputs, ... }@flakeContext:
+{ ... }@flakeContext:
 {
-  config,
-  lib,
-  xlib,
-  deviceType,
-  ...
-}:
-{
-  imports = with inputs; [
-    ./essentials
-    ./users.nix
-    ./options.nix
-    #./overlays.nix
-    ./temp.nix
-    (./. + "/${deviceType}") # specific modules
-
-    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;
-  _module.args.xlib = config.xlib;
-  services.immich.package = lib.mkIf (
-    config.xlib.device.type == "server"
-  ) inputs.self.packages.x86_64-linux.immich;
+  nixosModules = {
+    default = import ./base.nix flakeContext;
+  };
 }
diff --git a/nixosModules/server/default.nix b/nixosModules/server/default.nix
index 6bcdfdf..fa4ee2e 100755
--- a/nixosModules/server/default.nix
+++ b/nixosModules/server/default.nix
@@ -5,8 +5,11 @@
 }:
 {
   imports = [
-    ./stirling-pdf.nix
     #./cloudflared.nix
+    #./nextcloud.nix
+    ../software/beets
     ./immich.nix
+    ./nginx.nix
+    ./stirling-pdf.nix
   ];
 }
diff --git a/nixosModules/server/nextcloud.nix b/nixosModules/server/nextcloud.nix
index 67384c3..8f504f8 100755
--- a/nixosModules/server/nextcloud.nix
+++ b/nixosModules/server/nextcloud.nix
@@ -1,4 +1,3 @@
-{ inputs, ... }@flakeContext:
 {
   config,
   lib,
diff --git a/nixosModules/server/nginx.nix b/nixosModules/server/nginx.nix
index 7bb3f23..441c09e 100755
--- a/nixosModules/server/nginx.nix
+++ b/nixosModules/server/nginx.nix
@@ -1,4 +1,3 @@
-{ inputs, ... }@flakeContext:
 {
   config,
   lib,