diff --git a/flake.nix b/flake.nix index 8085614b..7db6cb09 100644 --- a/flake.nix +++ b/flake.nix @@ -140,17 +140,10 @@ joystick.enable = true; printer.enable = true; sound.enable = true; - prime = - { enable = true; mode = "offload"; busId = { intel = "PCI:0:2:0"; nvidia = "PCI:1:0:0"; };}; + prime = { enable = true; mode = "offload"; busId = { intel = "PCI:0:2:0"; nvidia = "PCI:1:0:0"; }; }; gamemode.drmDevice = 1; }; - packages = - { - packageSet = "workstation"; - extraPrebuildPackages = with inputs.pkgs; [ llvmPackages_git.stdenv ]; - extraPythonPackages = [(pythonPackages: - [ inputs.pkgs.localPackages.upho inputs.pkgs.localPackages.spectral ])]; - }; + packages.packageSet = "workstation"; virtualization = { waydroid.enable = true; @@ -458,6 +451,12 @@ user = "nas"; stcp.hpc = { localIp = "hpc.xmu.edu.cn"; localPort = 22; }; }; + nginx = + { + enable = true; + transparentProxy.externalIp = [ "192.168.82.4" "192.168.1.185" ]; + applications.webdav = { enable = true; hostname = "local.webdav.chn.moe"; }; + }; }; users.users = [ "root" "chn" "xll" "zem" "yjq" "yxy" ]; };}) diff --git a/modules/services/nginx/applications/webdav.nix b/modules/services/nginx/applications/webdav.nix index ab14fe1b..67c0c7d0 100644 --- a/modules/services/nginx/applications/webdav.nix +++ b/modules/services/nginx/applications/webdav.nix @@ -3,6 +3,7 @@ inputs: options.nixos.services.nginx.applications.webdav = let inherit (inputs.lib) mkOption types; in { enable = mkOption { type = types.bool; default = false; }; + hostname = mkOption { type = types.nonEmptyStr; default = "webdav.chn.moe"; }; }; config = let @@ -10,7 +11,7 @@ inputs: inherit (inputs.lib) mkIf; in mkIf webdav.enable { - nixos.services.nginx.https."webdav.chn.moe".location."/".static = + nixos.services.nginx.https."${webdav.hostname}".location."/".static = { root = "/srv/webdav"; index = "auto"; charset = "utf-8"; webdav = true; detectAuth.users = [ "chn" ]; }; systemd = { diff --git a/secrets/nas.yaml b/secrets/nas.yaml index 80a1fee5..e54cc17c 100644 --- a/secrets/nas.yaml +++ b/secrets/nas.yaml @@ -13,6 +13,10 @@ frp: token: ENC[AES256_GCM,data:zYRZoWa3Llv0NiPXtSfhWUn+wt4uIcw8Wa+QBTzn7gLk6UVIA4FD7FLABBKoFbwg62Fo79Nn,iv:YZdOYkJf6BN76Z68nCtetKElJkqKiYmcx6UmLoIXSdo=,tag:5sC2vt3Z21KhgOU9mrfXhg==,type:str] stcp: hpc: ENC[AES256_GCM,data:lkpM4nzt8ymQ+5eV,iv:LvSShCSN8w0VsJYjICG9NWCMiw7NSPpoSZ+I2t7uILs=,tag:LLry5z4KpPdnN75x8dANqg==,type:str] +nginx: + detectAuth: + chn: ENC[AES256_GCM,data:44vsExbVhO3gnD4Gme92eQ==,iv:LyDvZebs1sDL1/hZQiZdHoPBm4hXtBy56jR73zSH6Aw=,tag:w5xPHnK9XOSS0+97q8b5gQ==,type:str] + maxmind-license: ENC[AES256_GCM,data:JbAnFQiDcJGwvb89sG2ro77nwwOWcDnqVcA902jwb2zzZci7PpXROw==,iv:eifkWK0oN73Ekn3oWzy6XbYK2GU+4tlnLPJ+96WOWJY=,tag:35ulsshxtUfOsSQOLgAt0g==,type:str] sops: kms: [] gcp_kms: [] @@ -37,8 +41,8 @@ sops: by9Rd0U0bzNiK21BQTNxN1RuQ09DQVkKJmSlzV5ppEkZFljsS17ZWmoI++fz4tJh kTdoAStG1zsKASHyZTsmdm3RBDO3qV1KhQC2gC7d4EiwNZngxOOZJg== -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-11-06T11:12:54Z" - mac: ENC[AES256_GCM,data:nMnf+BTle1lrYnd87KZVk+W6N5y/P8SusF1Day7lstNxffPzLwaL+r7D9Lklem5nKPVYPA++ZSNpn2xn39rv24uJDmiI0lbkp/5tFK67flGehJr5YFssHSdsqhTs728IvropKuO3ZgTONVT1J0GSfrJVXNtIMsNgBCGceZ7ZHpM=,iv:2dCzL+do61xX57Do+Bw8gBWgdLgY6gIENdjqosOSGg0=,tag:K+fq9OvNDgwKrlo3InlHpg==,type:str] + lastmodified: "2023-11-17T14:11:34Z" + mac: ENC[AES256_GCM,data:8ii7sqkHlhdCAqBoDZEBU7Q6gNe6qyOby2ADyX5uaHu7kKe95+lCa14iqLZV5ekjIiNuTWLjOMmHtuZN5OiRVDIsmNMWKDv7Drt3CVpDv0dLC1Za0gNn7asmNnFh1Esfr1eLJuN09UY4qKN+LFbz4phxLh+f1CZBKTVTH5dHsbo=,iv:vnb/UB6miHo0D7HGGVxnoE0+kS+SRmFijPnlKIAmbuI=,tag:oQ9/JjG5Sn+y/bLxswOGaQ==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.7.3