mirror of
https://github.com/Superredstone/nixos.git
synced 2026-06-17 15:24:39 +02:00
Compare commits
4 Commits
ee1baa5a86
...
0a68c42251
| Author | SHA1 | Date | |
|---|---|---|---|
|
0a68c42251
|
|||
|
3c7f5750b9
|
|||
|
36974581fd
|
|||
|
54af41d9ef
|
Generated
+15
-15
@@ -113,11 +113,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1779507042,
|
"lastModified": 1779627636,
|
||||||
"narHash": "sha256-7wOwi8B6D0BYsieZCnHZZj2sNUzgJhLoIVSfkwB7lxQ=",
|
"narHash": "sha256-J6JGf42zNzLo/CrRdKb5dNznpLI+eGxN/5KTLG1Mo5s=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "509ed3c603349a9d43de9e2ae6613baea6bd5b34",
|
"rev": "044c30c19550c0557997dece4ce9e54d2fa77ba1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -206,11 +206,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs-25-11": {
|
"nixpkgs-25-11": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1779102034,
|
"lastModified": 1779467186,
|
||||||
"narHash": "sha256-vZJZjLo513IeI8hjzHFc6TDezUd4uCE2Eq4SNO3DNNg=",
|
"narHash": "sha256-nOesoDCiXcUftqbRBMz9tt4blI5PvljMWbm3kuCA+0s=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "687f05a9184cad4eaf905c48b63649e3a86f5433",
|
"rev": "b77b3de8775677f84492abe84635f87b0e153f0f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -237,11 +237,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1779357205,
|
"lastModified": 1779508470,
|
||||||
"narHash": "sha256-cCO8aTqss5x9Ky8GWkpY0Hy5fyTZEbtifSUV8QjSzic=",
|
"narHash": "sha256-Ap9KJX+5xHIn3bPIpfNgT6MEXdAECECwo4/rmlQD74M=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "f83fc3c307e74bc5fd5adb7eb6b8b13ffd2a36e1",
|
"rev": "29916453413845e54a65b8a1cf996842300cd299",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -329,11 +329,11 @@
|
|||||||
"noctalia-qs": "noctalia-qs"
|
"noctalia-qs": "noctalia-qs"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1779504029,
|
"lastModified": 1779591140,
|
||||||
"narHash": "sha256-f8u9DV9Qk8KJh7DVvk4UgUFTN0NDJeFxgrffTSwPkpA=",
|
"narHash": "sha256-G54zkslNueiiYDtg8QbAkPTv0/vfLzdjDsaUljlRQAE=",
|
||||||
"owner": "noctalia-dev",
|
"owner": "noctalia-dev",
|
||||||
"repo": "noctalia-shell",
|
"repo": "noctalia-shell",
|
||||||
"rev": "b99b7a7f06ff749df9ac43181ff7889ff90c5599",
|
"rev": "052f533186e6ad8e60541760cfe3123f14108c1e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -352,11 +352,11 @@
|
|||||||
"treefmt-nix": "treefmt-nix_2"
|
"treefmt-nix": "treefmt-nix_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1778983195,
|
"lastModified": 1779588472,
|
||||||
"narHash": "sha256-hE3EFK5GoSdbO5WHZ8bZDUVYkofbDLQN/KK25z7IOOI=",
|
"narHash": "sha256-CVonDVo41DqdqS/kNeXFatwEuTltyXcppm9zkVOnrsM=",
|
||||||
"owner": "noctalia-dev",
|
"owner": "noctalia-dev",
|
||||||
"repo": "noctalia-qs",
|
"repo": "noctalia-qs",
|
||||||
"rev": "4116b41cdc89e186be7cb8b24a9b6022af95d742",
|
"rev": "70fea8a39a908e395de63024a4dfdb829bff1ffe",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -1,8 +1,37 @@
|
|||||||
{ config, ... }:
|
|
||||||
{
|
{
|
||||||
services.caddy = {
|
pkgs,
|
||||||
|
config,
|
||||||
|
currentSystemUser,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
{
|
||||||
|
services.caddy =
|
||||||
|
let
|
||||||
|
basicAuth = ''
|
||||||
|
basicauth {
|
||||||
|
${currentSystemUser} $2a$14$L6SBwu.0FhGBYwH2LWa6uOrBSeRHo8Lo95Vkle/g5uB7kZl7nmJPO
|
||||||
|
}
|
||||||
|
'';
|
||||||
|
in
|
||||||
|
{
|
||||||
enable = true;
|
enable = true;
|
||||||
virtualHosts = {
|
virtualHosts = {
|
||||||
|
"patrickcanal.it".extraConfig = ''
|
||||||
|
root /var/www/patrickcanal.it/public
|
||||||
|
file_server
|
||||||
|
'';
|
||||||
|
"novnc.patrickcanal.it".extraConfig = ''
|
||||||
|
handle {
|
||||||
|
${basicAuth}
|
||||||
|
root ${pkgs.novnc}/share/webapps/novnc
|
||||||
|
file_server browse
|
||||||
|
}
|
||||||
|
|
||||||
|
handle /websockify {
|
||||||
|
${basicAuth}
|
||||||
|
reverse_proxy 127.0.0.1:6080
|
||||||
|
}
|
||||||
|
'';
|
||||||
"vaultwarden.patrickcanal.it".extraConfig = ''
|
"vaultwarden.patrickcanal.it".extraConfig = ''
|
||||||
encode zstd gzip
|
encode zstd gzip
|
||||||
reverse_proxy :${toString config.services.vaultwarden.config.ROCKET_PORT} {
|
reverse_proxy :${toString config.services.vaultwarden.config.ROCKET_PORT} {
|
||||||
@@ -41,4 +70,19 @@
|
|||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
systemd.services.websockify = {
|
||||||
|
description = "Websockify for noVNC";
|
||||||
|
after = [ "network.target" ];
|
||||||
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
serviceConfig = {
|
||||||
|
Restart = "always";
|
||||||
|
DynamicUser = true;
|
||||||
|
ExecStart = ''
|
||||||
|
${pkgs.python3Packages.websockify}/bin/websockify \
|
||||||
|
--web ${pkgs.novnc}/share/webapps/novnc \
|
||||||
|
6080 127.0.0.1:5900
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -86,6 +86,7 @@
|
|||||||
piper
|
piper
|
||||||
qbittorrent
|
qbittorrent
|
||||||
seahorse
|
seahorse
|
||||||
|
spotiflac
|
||||||
telegram-desktop
|
telegram-desktop
|
||||||
thunderbird
|
thunderbird
|
||||||
vlc
|
vlc
|
||||||
|
|||||||
Reference in New Issue
Block a user