From 7636a5c4c5fcf72dabf8574043f1a192290cdd0f Mon Sep 17 00:00:00 2001
From: oqyude <oqyude@gmail.com>
Date: Thu, 7 Aug 2025 02:14:25 +0300
Subject: [PATCH] 123

---
 nixosModules/base.nix                   | 13 ++++---------
 nixosModules/options.nix                | 19 -------------------
 nixosModules/server.nix                 | 10 ----------
 nixosModules/server/default.nix         |  2 +-
 nixosModules/server/immich.nix          |  3 ++-
 nixosModules/server/nextcloud.nix       |  1 +
 nixosModules/software/beets/default.nix |  1 -
 7 files changed, 8 insertions(+), 41 deletions(-)
 delete mode 100644 nixosModules/server.nix

diff --git a/nixosModules/base.nix b/nixosModules/base.nix
index 6a6cabf..b6490aa 100755
--- a/nixosModules/base.nix
+++ b/nixosModules/base.nix
@@ -11,19 +11,14 @@
     ./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;
+  _module.args = {
+    inputs = inputs;
+    xlib = config.xlib;
+  };
 }
diff --git a/nixosModules/options.nix b/nixosModules/options.nix
index 19da64a..c2a2459 100644
--- a/nixosModules/options.nix
+++ b/nixosModules/options.nix
@@ -1,5 +1,4 @@
 {
-  config,
   lib,
   ...
 }:
@@ -108,22 +107,4 @@
       };
     };
   };
-  # config = {
-  #   xlib.dirs = {
-  #     user-home = "/home/${config.xlib.device.username}";
-  #     user-storage = "${config.xlib.dirs.user-home}/Storage";
-  #     therima-drive = "/mnt/therima";
-  #     vetymae-drive = "/mnt/vetymae";
-  #     wsl-home = "/mnt/c/Users/${config.xlib.device.username}";
-  #     wsl-storage = "${config.xlib.dirs.wsl-home}/Storage";
-  #     server-home = "/home/${config.xlib.device.username}/External";
-  #     server-credentials = "${config.xlib.dirs.server-home}/Credentials/server";
-  #     storage = "${config.xlib.dirs.server-home}/Storage";
-  #     calibre-library = "${config.xlib.dirs.server-home}/Books-Library";
-  #     music-library = "${config.xlib.dirs.user-home}/Music";
-  #     immich-folder = "${config.xlib.dirs.server-home}/Services/immich";
-  #     nextcloud-folder = "${config.xlib.dirs.server-home}/Services/nextcloud";
-  #     postgresql-folder = "${config.xlib.dirs.server-home}/Services/postgresql";
-  #   };
-  # };
 }
diff --git a/nixosModules/server.nix b/nixosModules/server.nix
deleted file mode 100644
index f2d5750..0000000
--- a/nixosModules/server.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}:
-{
-  imports = [
-    ./server
-  ];
-}
diff --git a/nixosModules/server/default.nix b/nixosModules/server/default.nix
index fa4ee2e..b58ba71 100755
--- a/nixosModules/server/default.nix
+++ b/nixosModules/server/default.nix
@@ -6,9 +6,9 @@
 {
   imports = [
     #./cloudflared.nix
-    #./nextcloud.nix
     ../software/beets
     ./immich.nix
+    ./nextcloud.nix
     ./nginx.nix
     ./stirling-pdf.nix
   ];
diff --git a/nixosModules/server/immich.nix b/nixosModules/server/immich.nix
index bc1bff0..63a8965 100755
--- a/nixosModules/server/immich.nix
+++ b/nixosModules/server/immich.nix
@@ -2,12 +2,13 @@
   config,
   lib,
   pkgs,
+  inputs,
   ...
 }:
 {
   services = {
     immich = {
-      #package = pkgs-src.immich;
+      package = inputs.self.packages.x86_64-linux.immich;
       enable = true;
       port = 2283;
       host = "0.0.0.0";
diff --git a/nixosModules/server/nextcloud.nix b/nixosModules/server/nextcloud.nix
index 8f504f8..d015ec5 100755
--- a/nixosModules/server/nextcloud.nix
+++ b/nixosModules/server/nextcloud.nix
@@ -2,6 +2,7 @@
   config,
   lib,
   pkgs,
+  inputs,
   ...
 }:
 {
diff --git a/nixosModules/software/beets/default.nix b/nixosModules/software/beets/default.nix
index a9cfdc6..4e36f0a 100755
--- a/nixosModules/software/beets/default.nix
+++ b/nixosModules/software/beets/default.nix
@@ -1,4 +1,3 @@
-{ inputs, ... }@flakeContext:
 {
   config,
   lib,