diff --git a/flake.nix b/flake.nix index d51d22c..62768fe 100755 --- a/flake.nix +++ b/flake.nix @@ -133,5 +133,6 @@ } // (import ./homeConfigurations flakeContext) // (import ./nixosConfigurations flakeContext) + // (import ./nixosModules flakeContext) // (import ./pkgs flakeContext); } diff --git a/modules/server/default.nix b/modules/server/default.nix deleted file mode 100755 index e09155d..0000000 --- a/modules/server/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ - config, - lib, - ... -}: -{ - imports = [ - ./stirling-pdf.nix - ]; -} diff --git a/modules/server/stirling-pdf.nix b/modules/server/stirling-pdf.nix deleted file mode 100755 index 0fa3f07..0000000 --- a/modules/server/stirling-pdf.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -# let -# customPackage = pkgs.stirling-pdf.overrideAttrs (oldAttrs: { -# src = pkgs.fetchFromGitHub { -# owner = "Stirling-Tools"; -# repo = "Stirling-PDF"; -# rev = "v1.1.1"; -# sha256 = "0sphh65fdccnajdby9idy5w4zhcnxzzppv2d7zdz203d0lqs6hky"; -# }; -# version = "1.1.1"; -# }); -# in - -# lib.mkIf (config.xlib.device.type == "server") - -{ - services.stirling-pdf = { - enable = true; - #package = customPackage; - environment = { - SERVER_PORT = 6060; - }; - }; -} diff --git a/nixosConfigurations/hosts/server.nix b/nixosConfigurations/hosts/server.nix index aca1fba..97c972f 100755 --- a/nixosConfigurations/hosts/server.nix +++ b/nixosConfigurations/hosts/server.nix @@ -13,7 +13,7 @@ let hostname = "sapphira"; }; - imports = with inputs; [ + imports = [ ./hardware/server.nix self.nixosModules.server.immich diff --git a/modules/default.nix b/nixosModules/default.nix similarity index 100% rename from modules/default.nix rename to nixosModules/default.nix diff --git a/modules/desktop/default.nix b/nixosModules/desktop/default.nix similarity index 100% rename from modules/desktop/default.nix rename to nixosModules/desktop/default.nix diff --git a/modules/desktop/environment/bspwm.nix b/nixosModules/desktop/environment/bspwm.nix similarity index 100% rename from modules/desktop/environment/bspwm.nix rename to nixosModules/desktop/environment/bspwm.nix diff --git a/modules/desktop/environment/deepin.nix b/nixosModules/desktop/environment/deepin.nix similarity index 100% rename from modules/desktop/environment/deepin.nix rename to nixosModules/desktop/environment/deepin.nix diff --git a/modules/desktop/environment/default.nix b/nixosModules/desktop/environment/default.nix similarity index 100% rename from modules/desktop/environment/default.nix rename to nixosModules/desktop/environment/default.nix diff --git a/modules/desktop/environment/gnome.nix b/nixosModules/desktop/environment/gnome.nix similarity index 100% rename from modules/desktop/environment/gnome.nix rename to nixosModules/desktop/environment/gnome.nix diff --git a/modules/desktop/environment/kde.nix b/nixosModules/desktop/environment/kde.nix similarity index 100% rename from modules/desktop/environment/kde.nix rename to nixosModules/desktop/environment/kde.nix diff --git a/modules/desktop/environment/xfce.nix b/nixosModules/desktop/environment/xfce.nix similarity index 100% rename from modules/desktop/environment/xfce.nix rename to nixosModules/desktop/environment/xfce.nix diff --git a/modules/desktop/theming.nix b/nixosModules/desktop/theming.nix similarity index 100% rename from modules/desktop/theming.nix rename to nixosModules/desktop/theming.nix diff --git a/modules/essentials/default.nix b/nixosModules/essentials/default.nix similarity index 100% rename from modules/essentials/default.nix rename to nixosModules/essentials/default.nix diff --git a/modules/essentials/packages.nix b/nixosModules/essentials/packages.nix similarity index 100% rename from modules/essentials/packages.nix rename to nixosModules/essentials/packages.nix diff --git a/modules/essentials/services.nix b/nixosModules/essentials/services.nix similarity index 100% rename from modules/essentials/services.nix rename to nixosModules/essentials/services.nix diff --git a/modules/essentials/settings.nix b/nixosModules/essentials/settings.nix similarity index 100% rename from modules/essentials/settings.nix rename to nixosModules/essentials/settings.nix diff --git a/modules/essentials/tty.nix b/nixosModules/essentials/tty.nix similarity index 100% rename from modules/essentials/tty.nix rename to nixosModules/essentials/tty.nix diff --git a/modules/extra/gaming/aagl.nix b/nixosModules/extra/gaming/aagl.nix similarity index 100% rename from modules/extra/gaming/aagl.nix rename to nixosModules/extra/gaming/aagl.nix diff --git a/modules/extra/gaming/nix-gaming.nix b/nixosModules/extra/gaming/nix-gaming.nix similarity index 100% rename from modules/extra/gaming/nix-gaming.nix rename to nixosModules/extra/gaming/nix-gaming.nix diff --git a/modules/extra/musnix.nix b/nixosModules/extra/musnix.nix similarity index 100% rename from modules/extra/musnix.nix rename to nixosModules/extra/musnix.nix diff --git a/modules/extra/self/fingerprint.nix b/nixosModules/extra/self/fingerprint.nix similarity index 100% rename from modules/extra/self/fingerprint.nix rename to nixosModules/extra/self/fingerprint.nix diff --git a/modules/extra/self/zapret.nix b/nixosModules/extra/self/zapret.nix similarity index 100% rename from modules/extra/self/zapret.nix rename to nixosModules/extra/self/zapret.nix diff --git a/modules/options.nix b/nixosModules/options.nix similarity index 100% rename from modules/options.nix rename to nixosModules/options.nix diff --git a/modules/server/cloudflared.nix b/nixosModules/server/cloudflared.nix similarity index 100% rename from modules/server/cloudflared.nix rename to nixosModules/server/cloudflared.nix diff --git a/nixosModules/server/default.nix b/nixosModules/server/default.nix index e09155d..6bcdfdf 100755 --- a/nixosModules/server/default.nix +++ b/nixosModules/server/default.nix @@ -6,5 +6,7 @@ { imports = [ ./stirling-pdf.nix + #./cloudflared.nix + ./immich.nix ]; } diff --git a/modules/server/immich.nix b/nixosModules/server/immich.nix similarity index 95% rename from modules/server/immich.nix rename to nixosModules/server/immich.nix index 4a74bf3..bc1bff0 100755 --- a/modules/server/immich.nix +++ b/nixosModules/server/immich.nix @@ -1,9 +1,7 @@ -{ inputs, ... }@flakeContext: { config, lib, pkgs, - #pkgs-src, ... }: { diff --git a/modules/server/mealie.nix b/nixosModules/server/mealie.nix similarity index 100% rename from modules/server/mealie.nix rename to nixosModules/server/mealie.nix diff --git a/modules/server/miniflux.nix b/nixosModules/server/miniflux.nix similarity index 100% rename from modules/server/miniflux.nix rename to nixosModules/server/miniflux.nix diff --git a/modules/server/nextcloud.nix b/nixosModules/server/nextcloud.nix similarity index 100% rename from modules/server/nextcloud.nix rename to nixosModules/server/nextcloud.nix diff --git a/modules/server/nginx.nix b/nixosModules/server/nginx.nix similarity index 100% rename from modules/server/nginx.nix rename to nixosModules/server/nginx.nix diff --git a/modules/server/open-webui.nix b/nixosModules/server/open-webui.nix similarity index 100% rename from modules/server/open-webui.nix rename to nixosModules/server/open-webui.nix diff --git a/modules/server/zerotier.nix b/nixosModules/server/zerotier.nix similarity index 100% rename from modules/server/zerotier.nix rename to nixosModules/server/zerotier.nix diff --git a/modules/software/ai.nix b/nixosModules/software/ai.nix similarity index 100% rename from modules/software/ai.nix rename to nixosModules/software/ai.nix diff --git a/modules/software/beets/default.nix b/nixosModules/software/beets/default.nix similarity index 100% rename from modules/software/beets/default.nix rename to nixosModules/software/beets/default.nix diff --git a/modules/software/beets/dependencies.nix b/nixosModules/software/beets/dependencies.nix similarity index 100% rename from modules/software/beets/dependencies.nix rename to nixosModules/software/beets/dependencies.nix diff --git a/modules/software/beets/other/default.nix b/nixosModules/software/beets/other/default.nix similarity index 100% rename from modules/software/beets/other/default.nix rename to nixosModules/software/beets/other/default.nix diff --git a/modules/software/beets/other/dependencies-back.nix b/nixosModules/software/beets/other/dependencies-back.nix similarity index 100% rename from modules/software/beets/other/dependencies-back.nix rename to nixosModules/software/beets/other/dependencies-back.nix diff --git a/modules/software/beets/other/dependencies-cut.nix b/nixosModules/software/beets/other/dependencies-cut.nix similarity index 100% rename from modules/software/beets/other/dependencies-cut.nix rename to nixosModules/software/beets/other/dependencies-cut.nix diff --git a/modules/software/daw.nix b/nixosModules/software/daw.nix similarity index 100% rename from modules/software/daw.nix rename to nixosModules/software/daw.nix diff --git a/modules/software/virtual.nix b/nixosModules/software/virtual.nix similarity index 100% rename from modules/software/virtual.nix rename to nixosModules/software/virtual.nix diff --git a/modules/software/wine.nix b/nixosModules/software/wine.nix similarity index 100% rename from modules/software/wine.nix rename to nixosModules/software/wine.nix diff --git a/modules/temp.nix b/nixosModules/temp.nix similarity index 100% rename from modules/temp.nix rename to nixosModules/temp.nix diff --git a/modules/users.nix b/nixosModules/users.nix similarity index 100% rename from modules/users.nix rename to nixosModules/users.nix diff --git a/modules/vds/cloudflared.nix b/nixosModules/vds/cloudflared.nix similarity index 100% rename from modules/vds/cloudflared.nix rename to nixosModules/vds/cloudflared.nix diff --git a/modules/vds/netbird.nix b/nixosModules/vds/netbird.nix similarity index 100% rename from modules/vds/netbird.nix rename to nixosModules/vds/netbird.nix diff --git a/modules/vds/nginx.nix b/nixosModules/vds/nginx.nix similarity index 100% rename from modules/vds/nginx.nix rename to nixosModules/vds/nginx.nix diff --git a/modules/vds/xray.nix b/nixosModules/vds/xray.nix similarity index 100% rename from modules/vds/xray.nix rename to nixosModules/vds/xray.nix diff --git a/devices/disko/server.nix b/old/devices/disko/server.nix similarity index 100% rename from devices/disko/server.nix rename to old/devices/disko/server.nix diff --git a/devices/disko/vds.nix b/old/devices/disko/vds.nix similarity index 100% rename from devices/disko/vds.nix rename to old/devices/disko/vds.nix diff --git a/devices/hardware/laptop.nix b/old/devices/hardware/laptop.nix similarity index 100% rename from devices/hardware/laptop.nix rename to old/devices/hardware/laptop.nix diff --git a/devices/hardware/logitech.nix b/old/devices/hardware/logitech.nix similarity index 100% rename from devices/hardware/logitech.nix rename to old/devices/hardware/logitech.nix diff --git a/devices/hardware/mini-pc.nix b/old/devices/hardware/mini-pc.nix similarity index 100% rename from devices/hardware/mini-pc.nix rename to old/devices/hardware/mini-pc.nix diff --git a/devices/hardware/server.nix b/old/devices/hardware/server.nix similarity index 100% rename from devices/hardware/server.nix rename to old/devices/hardware/server.nix diff --git a/devices/hardware/vds.nix b/old/devices/hardware/vds.nix similarity index 100% rename from devices/hardware/vds.nix rename to old/devices/hardware/vds.nix diff --git a/devices/laptop.nix b/old/devices/laptop.nix similarity index 100% rename from devices/laptop.nix rename to old/devices/laptop.nix diff --git a/devices/mini-laptop.nix b/old/devices/mini-laptop.nix similarity index 100% rename from devices/mini-laptop.nix rename to old/devices/mini-laptop.nix diff --git a/devices/mini-pc.nix b/old/devices/mini-pc.nix similarity index 100% rename from devices/mini-pc.nix rename to old/devices/mini-pc.nix diff --git a/devices/server.nix b/old/devices/server.nix similarity index 100% rename from devices/server.nix rename to old/devices/server.nix diff --git a/devices/vds.nix b/old/devices/vds.nix similarity index 100% rename from devices/vds.nix rename to old/devices/vds.nix diff --git a/devices/wsl.nix b/old/devices/wsl.nix similarity index 100% rename from devices/wsl.nix rename to old/devices/wsl.nix diff --git a/pkgs/default.nix b/pkgs/default.nix index a8cb11a..903fc48 100755 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -4,6 +4,6 @@ let in { packages."x86_64-linux" = { - immich = pkgs.callPackage ./immich/package.nix {}; + immich = pkgs.callPackage ./immich/package.nix { }; }; }