From a0d639c71b2e1e7e720d8814db7e7878f23bd3d5 Mon Sep 17 00:00:00 2001 From: oqyude Date: Sun, 3 Aug 2025 14:47:27 +0300 Subject: [PATCH] 123 --- devices/wsl.nix | 9 +++++---- flake.lock | 41 +++++++++++++++++++++++++++++++++++------ flake.nix | 14 +++++++++++--- modules/vds/nginx.nix | 16 ++++++++-------- 4 files changed, 59 insertions(+), 21 deletions(-) diff --git a/devices/wsl.nix b/devices/wsl.nix index 401cb54..5952370 100755 --- a/devices/wsl.nix +++ b/devices/wsl.nix @@ -10,11 +10,12 @@ let }: { - imports = with inputs; [ + imports = with inputs; [ + nixos-wsl.nixosModules.default self.nixosModules.default - ]; + ]; i18n = { defaultLocale = "en_US.UTF-8"; @@ -31,9 +32,9 @@ let SystemMaxUse=512M ''; }; -earlyoom.enable = true; + earlyoom.enable = true; }; - + networking.hostName = "${inputs.zeroq.devices.wsl.hostname}"; wsl = { diff --git a/flake.lock b/flake.lock index 9f89d0a..138cf63 100755 --- a/flake.lock +++ b/flake.lock @@ -280,6 +280,30 @@ "type": "github" } }, + "nixos-wsl": { + "inputs": { + "flake-compat": [ + "flake-compat" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1753704990, + "narHash": "sha256-5E14xuNWy2Un1nFR55k68hgbnD8U2x/rE5DXJtYKusw=", + "owner": "nix-community", + "repo": "NixOS-WSL", + "rev": "58c814cc6d4a789191f9c12e18277107144b0c91", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "main", + "repo": "NixOS-WSL", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1744536153, @@ -517,6 +541,7 @@ "nixos": "nixos", "nixos-facter-modules": "nixos-facter-modules", "nixos-hardware": "nixos-hardware", + "nixos-wsl": "nixos-wsl", "nixpkgs": "nixpkgs_3", "nixpkgs-fingerprint": "nixpkgs-fingerprint", "nixpkgs-last-unstable": "nixpkgs-last-unstable", @@ -602,14 +627,18 @@ }, "zeroq": { "locked": { - "path": "./modules/zeroq", - "type": "path" + "lastModified": 1754220611, + "narHash": "sha256-ZysBpRalunTputyht0PWhjheQGy6zgng9g3Km0edNdE=", + "ref": "refs/heads/master", + "rev": "43c852a7b730e25179a80ff4cc601b7f894294fa", + "revCount": 1, + "type": "git", + "url": "ssh://git@github.com/oqyude/zeroq.git" }, "original": { - "path": "./modules/zeroq", - "type": "path" - }, - "parent": [] + "type": "git", + "url": "ssh://git@github.com/oqyude/zeroq.git" + } }, "zeroq-credentials": { "locked": { diff --git a/flake.nix b/flake.nix index 1e01595..c562032 100755 --- a/flake.nix +++ b/flake.nix @@ -16,9 +16,15 @@ nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.05"; nixpkgs-fingerprint.url = "github:NixOS/nixpkgs/nixos-24.11"; nixos.url = "github:NixOS/nixpkgs/nixos-unstable"; - nixos-wsl.url = "github:nix-community/NixOS-WSL/main"; # nix-community + nixos-wsl = { + url = "github:nix-community/NixOS-WSL/main"; + inputs = { + flake-compat.follows = "flake-compat"; + nixpkgs.follows = "nixpkgs"; + }; + }; nixos-facter-modules.url = "github:numtide/nixos-facter-modules"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; flake-compat.url = "github:edolstra/flake-compat"; @@ -39,8 +45,10 @@ plasma-manager = { # https://github.com/nix-community/plasma-manager url = "github:nix-community/plasma-manager"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.home-manager.follows = "home-manager"; + inputs = { + nixpkgs.follows = "nixpkgs"; + home-manager.follows = "home-manager"; + }; }; nix-index-database = { url = "github:nix-community/nix-index-database"; diff --git a/modules/vds/nginx.nix b/modules/vds/nginx.nix index efb2a4a..b319e82 100755 --- a/modules/vds/nginx.nix +++ b/modules/vds/nginx.nix @@ -22,14 +22,14 @@ proxyWebsockets = true; # Если Immich использует WebSockets }; }; -# "nextcloud.zeroq.ru" = { -# forceSSL = true; -# enableACME = true; -# locations."/" = { -# proxyPass = "http://sapphira.laxta-platy.ts.net:10000"; # Порт Nextcloud -# proxyWebsockets = true; -# }; -# }; + # "nextcloud.zeroq.ru" = { + # forceSSL = true; + # enableACME = true; + # locations."/" = { + # proxyPass = "http://sapphira.laxta-platy.ts.net:10000"; # Порт Nextcloud + # proxyWebsockets = true; + # }; + # }; "llm.zeroq.ru" = { forceSSL = true; enableACME = true;