123

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
   ];
-
+  _module.args = {
-  #server.enable = (config.xlib.device.type == "server");
+    inputs = inputs;
-
+    xlib = config.xlib;
-  _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/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";
-  #   };
-  # };
 }

nixosModules/server.nix

@@ -1,10 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}:
-{
-  imports = [
-    ./server
-  ];
-}

nixosModules/server/default.nix

@@ -6,9 +6,9 @@
 {
   imports = [
     #./cloudflared.nix
-    #./nextcloud.nix
     ../software/beets
     ./immich.nix
+    ./nextcloud.nix
     ./nginx.nix
     ./stirling-pdf.nix
   ];

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";

nixosModules/server/nextcloud.nix

@@ -2,6 +2,7 @@
   config,
   lib,
   pkgs,
+  inputs,
   ...
 }:
 {

nixosModules/software/beets/default.nix

@@ -1,4 +1,3 @@
-{ inputs, ... }@flakeContext:
 {
   config,
   lib,