From 0e4d975dc2c19134436e14484e4f191b3c25c8df Mon Sep 17 00:00:00 2001 From: oqyude Date: Sat, 28 Jun 2025 17:29:05 +0300 Subject: [PATCH] 123 --- devices/hardware/laptop.nix | 0 devices/hardware/logitech.nix | 0 devices/hardware/server.nix | 0 devices/server.nix | 26 ++----------------- flake.nix | 1 + home/modules/dconf.nix | 0 home/modules/default.nix | 0 home/modules/packages.nix | 0 home/modules/plasma-manager.nix | 0 modules/.examples/umport.nix | 0 modules/default.nix | 0 modules/desktop/default.nix | 0 modules/desktop/environment/bspwm.nix | 0 modules/desktop/environment/deepin.nix | 0 modules/desktop/environment/gnome.nix | 0 modules/desktop/environment/kde.nix | 0 modules/desktop/environment/theming.nix | 0 modules/desktop/environment/xfce.nix | 0 modules/essentials/default.nix | 0 modules/essentials/packages.nix | 0 modules/essentials/programs.nix | 0 modules/essentials/services.nix | 0 modules/essentials/settings.nix | 0 modules/essentials/tty.nix | 0 modules/extra/gaming/aagl.nix | 0 modules/extra/gaming/nix-gaming.nix | 0 modules/extra/musnix.nix | 0 modules/extra/self/fingerprint.nix | 0 modules/extra/self/zapret.nix | 0 modules/server/cloudflared.nix | 0 modules/server/immich.nix | 0 modules/server/nextcloud.nix | 0 modules/server/nginx.nix | 34 +++++++++++++++++++++++++ modules/software/beets/default.nix | 0 modules/software/beets/dependencies.nix | 0 modules/software/daw.nix | 0 modules/software/virtual.nix | 0 modules/software/wine.nix | 0 modules/zeroq/flake.nix | 0 39 files changed, 37 insertions(+), 24 deletions(-) mode change 100644 => 100755 devices/hardware/laptop.nix mode change 100644 => 100755 devices/hardware/logitech.nix mode change 100644 => 100755 devices/hardware/server.nix mode change 100644 => 100755 devices/server.nix mode change 100644 => 100755 flake.nix mode change 100644 => 100755 home/modules/dconf.nix mode change 100644 => 100755 home/modules/default.nix mode change 100644 => 100755 home/modules/packages.nix mode change 100644 => 100755 home/modules/plasma-manager.nix mode change 100644 => 100755 modules/.examples/umport.nix mode change 100644 => 100755 modules/default.nix mode change 100644 => 100755 modules/desktop/default.nix mode change 100644 => 100755 modules/desktop/environment/bspwm.nix mode change 100644 => 100755 modules/desktop/environment/deepin.nix mode change 100644 => 100755 modules/desktop/environment/gnome.nix mode change 100644 => 100755 modules/desktop/environment/kde.nix mode change 100644 => 100755 modules/desktop/environment/theming.nix mode change 100644 => 100755 modules/desktop/environment/xfce.nix mode change 100644 => 100755 modules/essentials/default.nix mode change 100644 => 100755 modules/essentials/packages.nix mode change 100644 => 100755 modules/essentials/programs.nix mode change 100644 => 100755 modules/essentials/services.nix mode change 100644 => 100755 modules/essentials/settings.nix mode change 100644 => 100755 modules/essentials/tty.nix mode change 100644 => 100755 modules/extra/gaming/aagl.nix mode change 100644 => 100755 modules/extra/gaming/nix-gaming.nix mode change 100644 => 100755 modules/extra/musnix.nix mode change 100644 => 100755 modules/extra/self/fingerprint.nix mode change 100644 => 100755 modules/extra/self/zapret.nix mode change 100644 => 100755 modules/server/cloudflared.nix mode change 100644 => 100755 modules/server/immich.nix mode change 100644 => 100755 modules/server/nextcloud.nix create mode 100755 modules/server/nginx.nix mode change 100644 => 100755 modules/software/beets/default.nix mode change 100644 => 100755 modules/software/beets/dependencies.nix mode change 100644 => 100755 modules/software/daw.nix mode change 100644 => 100755 modules/software/virtual.nix mode change 100644 => 100755 modules/software/wine.nix mode change 100644 => 100755 modules/zeroq/flake.nix diff --git a/devices/hardware/laptop.nix b/devices/hardware/laptop.nix old mode 100644 new mode 100755 diff --git a/devices/hardware/logitech.nix b/devices/hardware/logitech.nix old mode 100644 new mode 100755 diff --git a/devices/hardware/server.nix b/devices/hardware/server.nix old mode 100644 new mode 100755 diff --git a/devices/server.nix b/devices/server.nix old mode 100644 new mode 100755 index e2e2da0..7f38446 --- a/devices/server.nix +++ b/devices/server.nix @@ -17,13 +17,14 @@ let self.nixosModules.server.immich self.nixosModules.server.nextcloud self.nixosModules.server.cloudflared + self.nixosModules.server.nginx #self.nixosModules.extra.self.zapret self.homeConfigurations.server.nixosModule # home-manager configuration module ]; boot = { - kernelPackages = pkgs.linuxPackages_xanmod_latest; #pkgs.linuxPackages_xanmod_stable + kernelPackages = pkgs.linuxPackages_xanmod_latest; # pkgs.linuxPackages_xanmod_stable hardwareScan = true; loader = { systemd-boot.enable = lib.mkDefault true; @@ -91,29 +92,6 @@ let preload.enable = true; auto-cpufreq.enable = true; throttled.enable = true; - nginx = { - enable = false; - recommendedGzipSettings = true; - recommendedOptimisation = true; - recommendedProxySettings = true; - recommendedTlsSettings = true; - virtualHosts = { - "localhost:2283" = { - forceSSL = false; - enableACME = false; - listen = [ - { - addr = "100.64.0.0"; - port = 10000; - } - { - addr = "192.168.1.18"; - port = 10000; - } - ]; - }; - }; - }; journald = { extraConfig = '' SystemMaxUse=128M diff --git a/flake.nix b/flake.nix old mode 100644 new mode 100755 index ecd3249..56bb8ba --- a/flake.nix +++ b/flake.nix @@ -115,6 +115,7 @@ 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/cloudflared.nix flakeContext; }; }; diff --git a/home/modules/dconf.nix b/home/modules/dconf.nix old mode 100644 new mode 100755 diff --git a/home/modules/default.nix b/home/modules/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/packages.nix b/home/modules/packages.nix old mode 100644 new mode 100755 diff --git a/home/modules/plasma-manager.nix b/home/modules/plasma-manager.nix old mode 100644 new mode 100755 diff --git a/modules/.examples/umport.nix b/modules/.examples/umport.nix old mode 100644 new mode 100755 diff --git a/modules/default.nix b/modules/default.nix old mode 100644 new mode 100755 diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix old mode 100644 new mode 100755 diff --git a/modules/desktop/environment/bspwm.nix b/modules/desktop/environment/bspwm.nix old mode 100644 new mode 100755 diff --git a/modules/desktop/environment/deepin.nix b/modules/desktop/environment/deepin.nix old mode 100644 new mode 100755 diff --git a/modules/desktop/environment/gnome.nix b/modules/desktop/environment/gnome.nix old mode 100644 new mode 100755 diff --git a/modules/desktop/environment/kde.nix b/modules/desktop/environment/kde.nix old mode 100644 new mode 100755 diff --git a/modules/desktop/environment/theming.nix b/modules/desktop/environment/theming.nix old mode 100644 new mode 100755 diff --git a/modules/desktop/environment/xfce.nix b/modules/desktop/environment/xfce.nix old mode 100644 new mode 100755 diff --git a/modules/essentials/default.nix b/modules/essentials/default.nix old mode 100644 new mode 100755 diff --git a/modules/essentials/packages.nix b/modules/essentials/packages.nix old mode 100644 new mode 100755 diff --git a/modules/essentials/programs.nix b/modules/essentials/programs.nix old mode 100644 new mode 100755 diff --git a/modules/essentials/services.nix b/modules/essentials/services.nix old mode 100644 new mode 100755 diff --git a/modules/essentials/settings.nix b/modules/essentials/settings.nix old mode 100644 new mode 100755 diff --git a/modules/essentials/tty.nix b/modules/essentials/tty.nix old mode 100644 new mode 100755 diff --git a/modules/extra/gaming/aagl.nix b/modules/extra/gaming/aagl.nix old mode 100644 new mode 100755 diff --git a/modules/extra/gaming/nix-gaming.nix b/modules/extra/gaming/nix-gaming.nix old mode 100644 new mode 100755 diff --git a/modules/extra/musnix.nix b/modules/extra/musnix.nix old mode 100644 new mode 100755 diff --git a/modules/extra/self/fingerprint.nix b/modules/extra/self/fingerprint.nix old mode 100644 new mode 100755 diff --git a/modules/extra/self/zapret.nix b/modules/extra/self/zapret.nix old mode 100644 new mode 100755 diff --git a/modules/server/cloudflared.nix b/modules/server/cloudflared.nix old mode 100644 new mode 100755 diff --git a/modules/server/immich.nix b/modules/server/immich.nix old mode 100644 new mode 100755 diff --git a/modules/server/nextcloud.nix b/modules/server/nextcloud.nix old mode 100644 new mode 100755 diff --git a/modules/server/nginx.nix b/modules/server/nginx.nix new file mode 100755 index 0000000..7774e4b --- /dev/null +++ b/modules/server/nginx.nix @@ -0,0 +1,34 @@ +{ inputs, ... }@flakeContext: +{ + config, + lib, + pkgs, + ... +}: +{ + services = { + nginx = { + enable = true; + recommendedGzipSettings = true; + recommendedOptimisation = true; + recommendedProxySettings = true; + recommendedTlsSettings = true; + virtualHosts = { + "localhost:2283" = { + forceSSL = false; + enableACME = false; + listen = [ + { + addr = "100.64.0.0"; + port = 10000; + } + { + addr = "192.168.1.18"; + port = 10000; + } + ]; + }; + }; + }; + }; +} diff --git a/modules/software/beets/default.nix b/modules/software/beets/default.nix old mode 100644 new mode 100755 diff --git a/modules/software/beets/dependencies.nix b/modules/software/beets/dependencies.nix old mode 100644 new mode 100755 diff --git a/modules/software/daw.nix b/modules/software/daw.nix old mode 100644 new mode 100755 diff --git a/modules/software/virtual.nix b/modules/software/virtual.nix old mode 100644 new mode 100755 diff --git a/modules/software/wine.nix b/modules/software/wine.nix old mode 100644 new mode 100755 diff --git a/modules/zeroq/flake.nix b/modules/zeroq/flake.nix old mode 100644 new mode 100755