This commit is contained in:
2025-08-07 02:02:51 +03:00
parent de44801150
commit b55b12ff7e
7 changed files with 77 additions and 70 deletions
+36 -36
View File
@@ -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)
+4 -4
View File
@@ -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 = {
+29
View File
@@ -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;
}
+4 -27
View File
@@ -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;
};
}
+4 -1
View File
@@ -5,8 +5,11 @@
}:
{
imports = [
./stirling-pdf.nix
#./cloudflared.nix
#./nextcloud.nix
../software/beets
./immich.nix
./nginx.nix
./stirling-pdf.nix
];
}
-1
View File
@@ -1,4 +1,3 @@
{ inputs, ... }@flakeContext:
{
config,
lib,
-1
View File
@@ -1,4 +1,3 @@
{ inputs, ... }@flakeContext:
{
config,
lib,