Cloonar/nixos
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changes

Browse Source
This commit is contained in:
Dominik Polakovics Polakovics
2024-11-05 12:48:30 +01:00
parent d8db7df64e
commit c9a024840b
20 changed files with 301 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
hosts/fw-new/modules/home-assistant/multimedia.nix
View File

@@ -63,6 +63,38 @@
sequence = [ sequence = [
{ {
choose = [ choose = [
{
conditions = [
{
condition = "state";
entity_id = "switch.tv_switch";
state = "off";
}
];
sequence = [
{
service = "switch.turn_on";
target = {
entity_id = "switch.tv_switch";
};
}
{
delay = 10;
}
{
service = "remote.send_command";
target = {
entity_id = "remote.rmproplus";
};
data = {
num_repeats = 1;
delay_secs = 0.4;
hold_secs = 0;
command = "b64:JgBOAJaSFREVNRU2FTUVERURFRAVERURFTUVNhU1FREVERUQFREVERUQFTYVNRURFREVEBURFTYVNRURFRAVNhU1FTYVNRUABfmWkhURFQANBQAAAAAAAAAAAAA=";
};
}
];
}
{ {
conditions = [ conditions = [
{ {
@@ -232,6 +264,13 @@
command = "b64:JgDaAAABKZMUERMSExITEhMSExETEhMSExITEhMSExETNxQ2ExITEhMSEzcTNxM3ExITEhM3ExITNxMSEhITEhM3EzcTEhM3EwAFyAABKJQUERMSEhITEhMSExITEhMSEhITEhMSExITNxM3ExITEhMREzcTNxQ3EhITEhM3ExITNxMSExITEhM3EzcTEhM3EwAFyAABKJQUERMSExETEhMSExITEhMSExETEhMSExITNxM3ExITEhMREzcTOBI4ExETEhM3ExITNxMSExITEhM3EzcTEhM3E5IGAA0FAAAAAAAAAAAAAAAAAAA="; command = "b64:JgDaAAABKZMUERMSExITEhMSExETEhMSExITEhMSExETNxQ2ExITEhMSEzcTNxM3ExITEhM3ExITNxMSEhITEhM3EzcTEhM3EwAFyAABKJQUERMSEhITEhMSExITEhMSEhITEhMSExITNxM3ExITEhMREzcTNxQ3EhITEhM3ExITNxMSExITEhM3EzcTEhM3EwAFyAABKJQUERMSExETEhMSExITEhMSExETEhMSExITNxM3ExITEhMREzcTOBI4ExETEhM3ExITNxMSExITEhM3EzcTEhM3E5IGAA0FAAAAAAAAAAAAAAAAAAA=";
}; };
} }
# turn off tv switch
{
service = "switch.turn_off";
target = {
entity_id = "switch.tv_switch";
};
}
]; ];
}; };
"automation all_multimedia_on" = { "automation all_multimedia_on" = {
@@ -305,6 +344,23 @@
action = [ action = [
{ {
choose = [ choose = [
{
conditions = [
{
condition = "state";
entity_id = "switch.tv_switch";
state = "off";
}
];
sequence = [
{
service = "script.turn_on";
target = {
entity_id = "script.turn_on_tv";
};
}
];
}
{ {
conditions = [ conditions = [
{ {

1
hosts/fw-new/modules/home-assistant/shelly.nix
View File

@@ -22,6 +22,7 @@ let
{ name = "Hallway Circuit"; id = "shellypro3-c8f09e894448"; relay = "0"; } { name = "Hallway Circuit"; id = "shellypro3-c8f09e894448"; relay = "0"; }
{ name = "Bathroom Circuit"; id = "shellypro3-c8f09e894448"; relay = "1"; } { name = "Bathroom Circuit"; id = "shellypro3-c8f09e894448"; relay = "1"; }
{ name = "Kitchen Circuit"; id = "shellypro3-c8f09e894448"; relay = "2"; } { name = "Kitchen Circuit"; id = "shellypro3-c8f09e894448"; relay = "2"; }
{ name = "TV Switch"; id = "shelly1pmminig3-34b7da8b64c8"; relay = "0"; }
]; ];
in { in {
services.home-assistant.extraComponents = [ services.home-assistant.extraComponents = [

1
hosts/fw.cloonar.com/modules/ddclient.nix
View File

@@ -14,6 +14,7 @@
"git.cloonar.com" "git.cloonar.com"
"palworld.cloonar.com" "palworld.cloonar.com"
"matrix.cloonar.com" "matrix.cloonar.com"
"element.cloonar.com"
]; ];
}; };

1
hosts/fw.cloonar.com/modules/home-assistant/default.nix
View File

@@ -87,6 +87,7 @@ in
./music.nix ./music.nix
./notify.nix ./notify.nix
./pc.nix ./pc.nix
./power-saving.nix
./pushover.nix ./pushover.nix
./presense.nix ./presense.nix
./roborock.nix ./roborock.nix

6
hosts/fw.cloonar.com/modules/home-assistant/locks.nix
View File

@@ -16,6 +16,12 @@
to = "home"; to = "home";
}; };
action = [ action = [
{
service = "script.turn_on";
target = {
entity_id = "script.turn_on_circuits";
};
}
{ {
service = "lock.unlock"; service = "lock.unlock";
target = { target = {

61
hosts/fw.cloonar.com/modules/home-assistant/multimedia.nix
View File

@@ -63,6 +63,38 @@
sequence = [ sequence = [
{ {
choose = [ choose = [
{
conditions = [
{
condition = "state";
entity_id = "switch.tv_switch";
state = "off";
}
];
sequence = [
{
service = "switch.turn_on";
target = {
entity_id = "switch.tv_switch";
};
}
{
delay = 10;
}
{
service = "remote.send_command";
target = {
entity_id = "remote.rmproplus";
};
data = {
num_repeats = 1;
delay_secs = 0.4;
hold_secs = 0;
command = "b64:JgBOAJaSFREVNRU2FTUVERURFRAVERURFTUVNhU1FREVERUQFREVERUQFTYVNRURFREVEBURFTYVNRURFRAVNhU1FTYVNRUABfmWkhURFQANBQAAAAAAAAAAAAA=";
};
}
];
}
{ {
conditions = [ conditions = [
{ {
@@ -232,6 +264,13 @@
command = "b64:JgDaAAABKZMUERMSExITEhMSExETEhMSExITEhMSExETNxQ2ExITEhMSEzcTNxM3ExITEhM3ExITNxMSEhITEhM3EzcTEhM3EwAFyAABKJQUERMSEhITEhMSExITEhMSEhITEhMSExITNxM3ExITEhMREzcTNxQ3EhITEhM3ExITNxMSExITEhM3EzcTEhM3EwAFyAABKJQUERMSExETEhMSExITEhMSExETEhMSExITNxM3ExITEhMREzcTOBI4ExETEhM3ExITNxMSExITEhM3EzcTEhM3E5IGAA0FAAAAAAAAAAAAAAAAAAA="; command = "b64:JgDaAAABKZMUERMSExITEhMSExETEhMSExITEhMSExETNxQ2ExITEhMSEzcTNxM3ExITEhM3ExITNxMSEhITEhM3EzcTEhM3EwAFyAABKJQUERMSEhITEhMSExITEhMSEhITEhMSExITNxM3ExITEhMREzcTNxQ3EhITEhM3ExITNxMSExITEhM3EzcTEhM3EwAFyAABKJQUERMSExETEhMSExITEhMSExETEhMSExITNxM3ExITEhMREzcTOBI4ExETEhM3ExITNxMSExITEhM3EzcTEhM3E5IGAA0FAAAAAAAAAAAAAAAAAAA=";
}; };
} }
# turn off tv switch
{
service = "switch.turn_off";
target = {
entity_id = "switch.tv_switch";
};
}
]; ];
}; };
"automation all_multimedia_on" = { "automation all_multimedia_on" = {
@@ -297,14 +336,26 @@
}; };
} }
]; ];
condition = {
condition = "state";
entity_id = "binary_sensor.multimedia_device_on";
state = "on";
};
action = [ action = [
{ {
choose = [ choose = [
{
conditions = [
{
condition = "state";
entity_id = "switch.tv_switch";
state = "off";
}
];
sequence = [
{
service = "script.turn_on";
target = {
entity_id = "script.turn_on_tv";
};
}
];
}
{ {
conditions = [ conditions = [
{ {

47
hosts/fw.cloonar.com/modules/home-assistant/power-saving.nix Normal file
View File

@@ -0,0 +1,47 @@
{
services.home-assistant.extraComponents = [
"nuki"
];
services.home-assistant.config = {
"automation power leave home" = {
alias = "leave house power";
mode = "restart";
trigger = {
platform = "state";
entity_id = [
"device_tracker.dominiks_iphone"
];
from = "home";
to = "not_home";
};
action = [
{
service = "script.turn_on";
target = {
entity_id = "script.turn_off_circuits";
};
}
];
};
"automation arrive home power" = {
alias = "arrive home power";
trigger = {
platform = "state";
entity_id = [
"device_tracker.dominiks_iphone"
];
from = "not_home";
to = "home";
};
action = [
{
service = "script.turn_on";
target = {
entity_id = "script.turn_on_circuits";
};
}
];
};
};
}

1
hosts/fw.cloonar.com/modules/home-assistant/shelly.nix
View File

@@ -23,6 +23,7 @@ let
{ name = "Hallway Circuit"; id = "shellypro3-c8f09e894448"; relay = "0"; } { name = "Hallway Circuit"; id = "shellypro3-c8f09e894448"; relay = "0"; }
{ name = "Bathroom Circuit"; id = "shellypro3-c8f09e894448"; relay = "1"; } { name = "Bathroom Circuit"; id = "shellypro3-c8f09e894448"; relay = "1"; }
{ name = "Kitchen Circuit"; id = "shellypro3-c8f09e894448"; relay = "2"; } { name = "Kitchen Circuit"; id = "shellypro3-c8f09e894448"; relay = "2"; }
{ name = "TV Switch"; id = "shelly1pmminig3-34b7da8b64c8"; relay = "0"; }
]; ];
in { in {
services.home-assistant.extraComponents = [ services.home-assistant.extraComponents = [

66
hosts/fw.cloonar.com/modules/home-assistant/sleep.nix
View File

@@ -15,26 +15,10 @@
delay = 1700; delay = 1700;
} }
{ {
service = "switch.turn_on"; service = "script.turn_on";
entity_id = "switch.78_8c_b5_fe_41_62_port_2_poe"; # livingroom target = {
} entity_id = "script.turn_on_circuits";
{ };
service = "switch.turn_on";
entity_id = "switch.78_8c_b5_fe_41_62_port_3_poe"; # garden
}
{
delay = 10;
}
{
service = "switch.turn_on";
entity_id = "switch.hallway_circuit";
}
{
delay = 10;
}
{
service = "switch.turn_on";
entity_id = "switch.bathroom_circuit";
} }
]; ];
}; };
@@ -61,6 +45,21 @@
choose = [ choose = [
{ {
conditions = [ "{{ trigger.event.data.click_type == \"long\" }}" ]; conditions = [ "{{ trigger.event.data.click_type == \"long\" }}" ];
sequence = [
{
service = "script.turn_on";
target = {
entity_id = "script.turn_off_everything";
};
}
];
}
];
}
];
};
script = {
turn_off_everything = {
sequence = [ sequence = [
{ {
service = "light.turn_off"; service = "light.turn_off";
@@ -82,15 +81,36 @@
service = "switch.turn_off"; service = "switch.turn_off";
entity_id = "switch.hallway_circuit"; entity_id = "switch.hallway_circuit";
} }
# TODO: needs to stay on because phone is not loading otherwise
# {
# service = "switch.turn_off";
# entity_id = "switch.bathroom_circuit";
# }
];
};
turn_on_circuits = {
sequence = [
{ {
service = "switch.turn_off"; service = "switch.turn_on";
entity_id = "switch.bathroom_circuit"; entity_id = "switch.bathroom_circuit";
} }
]; {
delay = 60;
} }
]; {
service = "switch.turn_on";
entity_id = "switch.hallway_circuit";
}
{
service = "switch.turn_on";
entity_id = "switch.78_8c_b5_fe_41_62_port_2_poe";
}
{
service = "switch.turn_on";
entity_id = "switch.78_8c_b5_fe_41_62_port_3_poe";
} }
]; ];
}; };
}; };
};
} }

1
hosts/fw.cloonar.com/modules/unbound.nix
View File

@@ -57,6 +57,7 @@ let
"\"home-assistant.cloonar.com IN A 10.42.97.20\"" "\"home-assistant.cloonar.com IN A 10.42.97.20\""
"\"web-02.cloonar.com IN A 10.42.97.5\"" "\"web-02.cloonar.com IN A 10.42.97.5\""
"\"matrix.cloonar.com IN A 10.42.97.5\"" "\"matrix.cloonar.com IN A 10.42.97.5\""
"\"element.cloonar.com IN A 10.42.97.5\""
"\"support.cloonar.com IN A 10.42.97.5\"" "\"support.cloonar.com IN A 10.42.97.5\""
"\"git.cloonar.com IN A 10.42.97.50\"" "\"git.cloonar.com IN A 10.42.97.50\""
"\"sync.cloonar.com IN A 10.42.97.51\"" "\"sync.cloonar.com IN A 10.42.97.51\""

23
hosts/fw.cloonar.com/modules/web/matrix.nix
View File

@@ -2,7 +2,7 @@
let let
hostname = "matrix"; hostname = "matrix";
fqdn = "${hostname}.cloonar.com"; fqdn = "${hostname}.cloonar.com";
baseUrl = "https://matrix.cloonar.com"; baseUrl = "https://${fqdn}";
clientConfig."m.homeserver".base_url = baseUrl; clientConfig."m.homeserver".base_url = baseUrl;
serverConfig."m.server" = "${fqdn}:443"; serverConfig."m.server" = "${fqdn}:443";
mkWellKnown = data: '' mkWellKnown = data: ''
@@ -25,6 +25,27 @@ in {
} }
]; ];
}; };
services.nginx.virtualHosts."element.cloonar.com" = {
forceSSL = true;
enableACME = true;
acmeRoot = null;
root = pkgs.element-web.override {
conf = {
default_theme = "dark";
default_server_config = {
"m.homeserver" = {
base_url = "https://matrix.cloonar.com";
server_name = "cloonar.com";
};
};
disable_custom_urls = true;
disable_3pid_login = true;
default_country_code = "AT";
};
};
};
services.postgresqlBackup.enable = true; services.postgresqlBackup.enable = true;
services.postgresqlBackup.databases = [ "dendrite" ]; services.postgresqlBackup.databases = [ "dendrite" ];

3
hosts/nb-new.cloonar.com/configuration.nix
View File

@@ -62,6 +62,9 @@ in {
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;
hardware.bluetooth.powerOnBoot = true; hardware.bluetooth.powerOnBoot = true;
hardware.bluetooth.settings = {
General = { ControllerMode = "bredr"; };
};
services.tlp = { services.tlp = {
enable = true; enable = true;

2
hosts/nb-new.cloonar.com/modules/sway/foot.ini
View File

@@ -20,7 +20,7 @@
# underline-offset=<font metrics> # underline-offset=<font metrics>
# underline-thickness=<font underline thickness> # underline-thickness=<font underline thickness>
# box-drawings-uses-font-glyphs=no # box-drawings-uses-font-glyphs=no
dpi-aware=yes # dpi-aware=yes
# initial-window-size-pixels=700x500 # Or, # initial-window-size-pixels=700x500 # Or,
# initial-window-size-chars=<COLSxROWS> # initial-window-size-chars=<COLSxROWS>

5
hosts/nb-new.cloonar.com/modules/sway/sway.conf
View File

@@ -288,9 +288,6 @@ gaps inner 12
gaps outer 0 gaps outer 0
# startup applications # startup applications
exec_always {
gsettings set org.gnome.desktop.interface text-scaling-factor 1.5
}
exec /run/wrappers/bin/gnome-keyring-daemon --start --daemonize exec /run/wrappers/bin/gnome-keyring-daemon --start --daemonize
exec dbus-sway-environment exec dbus-sway-environment
exec configure-gtk exec configure-gtk
@@ -314,7 +311,7 @@ exec 'sleep 2; swaymsg workspace "$ws8"; swaymsg layout tabbed'
exec mako --default-timeout=5000 exec mako --default-timeout=5000
# wallpaper # wallpaper
output eDP-1 scale 1.5 scale_filter linear output eDP-1 scale 2 scale_filter linear
output eDP-1 bg #282a36 solid_color output eDP-1 bg #282a36 solid_color
output eDP-1 bg ~/.wallpaper.png center output eDP-1 bg ~/.wallpaper.png center
output DP-4 bg #282a36 solid_color output DP-4 bg #282a36 solid_color

7
hosts/nb-new.cloonar.com/modules/sway/sway.nix
View File

@@ -38,7 +38,7 @@ in {
imports = [ imports = [
./social.nix ./social.nix
./signal-work.nix ./signal-work.nix
./parsec.nix # ./parsec.nix
./rustdesk.nix ./rustdesk.nix
./thunderbird.nix ./thunderbird.nix
]; ];
@@ -92,7 +92,6 @@ in {
# unstable.cura # unstable.cura
freecad freecad
openscad openscad
orca-slicer
(unstable.where-is-my-sddm-theme.override { (unstable.where-is-my-sddm-theme.override {
themeConfig.General = { themeConfig.General = {
@@ -110,8 +109,6 @@ in {
variants = ["qt5"]; variants = ["qt5"];
}) })
# kdePackages.neochat
dbus-sway-environment dbus-sway-environment
ddev-pin.ddev ddev-pin.ddev
dracula-theme dracula-theme
@@ -128,8 +125,10 @@ in {
hunspell hunspell
hunspellDicts.de_DE hunspellDicts.de_DE
hunspellDicts.en_US hunspellDicts.en_US
inkscape
jmeter jmeter
libreoffice libreoffice
libsForQt5.qtgraphicaleffects
mako mako
mqttui mqttui
moonlight-qt moonlight-qt

2
hosts/nb-new.cloonar.com/users/configs/project_history
View File

@@ -14,6 +14,7 @@
/home/dominik/projects/cloonar/amz/amz-frontend /home/dominik/projects/cloonar/amz/amz-frontend
/home/dominik/projects/cloonar/hilgenberg-website /home/dominik/projects/cloonar/hilgenberg-website
/home/dominik/projects/cloonar/korean-skin.care /home/dominik/projects/cloonar/korean-skin.care
/home/dominik/projects/cloonar/soundscape-sync
/home/dominik/projects/myhidden.life/myhidden.life-web /home/dominik/projects/myhidden.life/myhidden.life-web
/home/dominik/projects/socialgrow.tech/sgt-api /home/dominik/projects/socialgrow.tech/sgt-api
/home/dominik/projects/epicenter.works/ewcampaign /home/dominik/projects/epicenter.works/ewcampaign
@@ -22,3 +23,4 @@
/home/dominik/projects/epicenter.works/epicenter-nixos /home/dominik/projects/epicenter.works/epicenter-nixos
/home/dominik/projects/epicenter.works/spenden.akvorrat.at /home/dominik/projects/epicenter.works/spenden.akvorrat.at
/home/dominik/projects/epicenter.works/dearmep-website /home/dominik/projects/epicenter.works/dearmep-website
/home/dominik/projects/epicenter.works/padexporter

4
hosts/nb-new.cloonar.com/users/dominik.nix
View File

@@ -8,7 +8,7 @@ let
"browser.theme.content-theme" = 0; "browser.theme.content-theme" = 0;
"browser.theme.toolbar-theme" = 0; "browser.theme.toolbar-theme" = 0;
"calendar.alarms.showmissed" = false; "calendar.alarms.showmissed" = false;
"mail.uidensity" = 2; "mail.uidensity" = 1;
"mail.inline_attachments" = false; "mail.inline_attachments" = false;
"mail.folder.views.version" = 1; "calendar.list.sortOrder" = "cloonar-personal"; "mail.folder.views.version" = 1; "calendar.list.sortOrder" = "cloonar-personal";
"calendar.ui.version" = 3; "calendar.ui.version" = 3;
@@ -480,6 +480,7 @@ in
git clone gitea@git.cloonar.com:hilgenberg/website.git ${persistHome}/projects/cloonar/hilgenberg-website 2>/dev/null git clone gitea@git.cloonar.com:hilgenberg/website.git ${persistHome}/projects/cloonar/hilgenberg-website 2>/dev/null
git clone gitea@git.cloonar.com:Cloonar/korean-skin.care.git ${persistHome}/projects/cloonar/korean-skin.care 2>/dev/null git clone gitea@git.cloonar.com:Cloonar/korean-skin.care.git ${persistHome}/projects/cloonar/korean-skin.care 2>/dev/null
git clone gitea@git.cloonar.com:myhidden.life/web.git ${persistHome}/projects/myhidden.life/myhidden.life-web 2>/dev/null git clone gitea@git.cloonar.com:myhidden.life/web.git ${persistHome}/projects/myhidden.life/myhidden.life-web 2>/dev/null
git clone gitea@git.cloonar.com:Cloonar/soundscape-sync.git ${persistHome}/projects/cloonar/soundscape-sync 2>/dev/null
git clone gitea@git.cloonar.com:socialgrow.tech/sgt-api.git ${persistHome}/projects/socialgrow.tech/sgt-api 2>/dev/null git clone gitea@git.cloonar.com:socialgrow.tech/sgt-api.git ${persistHome}/projects/socialgrow.tech/sgt-api 2>/dev/null
@@ -491,6 +492,7 @@ in
git clone git@gitlab.epicenter.works:epicenter.works/nixos.git ${persistHome}/projects/epicenter.works/epicenter-nixos 2>/dev/null git clone git@gitlab.epicenter.works:epicenter.works/nixos.git ${persistHome}/projects/epicenter.works/epicenter-nixos 2>/dev/null
git clone git@github.com:AKVorrat/spenden.akvorrat.at.git ${persistHome}/projects/epicenter.works/spenden.akvorrat.at 2>/dev/null git clone git@github.com:AKVorrat/spenden.akvorrat.at.git ${persistHome}/projects/epicenter.works/spenden.akvorrat.at 2>/dev/null
git clone git@github.com:AKVorrat/dearmep-website.git ${persistHome}/projects/epicenter.works/dearmep-website 2>/dev/null git clone git@github.com:AKVorrat/dearmep-website.git ${persistHome}/projects/epicenter.works/dearmep-website 2>/dev/null
git clone git@github.com:AKVorrat/padexporter.git ${persistHome}/projects/epicenter.works/padexporter 2>/dev/null
set -eu set -eu
''; '';

1
hosts/web-arm/configuration.nix
View File

@@ -74,6 +74,7 @@
boot.tmp.cleanOnBoot = true; boot.tmp.cleanOnBoot = true;
zramSwap.enable = true; zramSwap.enable = true;
networking.hostName = "web-arm"; networking.hostName = "web-arm";
networking.domain = "cloonar.com";
services.openssh.enable = true; services.openssh.enable = true;
users.users.root.openssh.authorizedKeys.keys = [ users.users.root.openssh.authorizedKeys.keys = [
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDN/2SAFm50kraB1fepAizox/QRXxB7WbqVbH+5OPalDT47VIJGNKOKhixQoqhABHxEoLxdf/C83wxlCVlPV9poLfDgVkA3Lyt5r3tSFQ6QjjOJAgchWamMsxxyGBedhKvhiEzcr/Lxytnoz3kjDG8fqQJwEpdqMmJoMUfyL2Rqp16u+FQ7d5aJtwO8EUqovhMaNO7rggjPpV/uMOg+tBxxmscliN7DLuP4EMTA/FwXVzcFNbOx3K9BdpMRAaSJt4SWcJO2cS2KHA5n/H+PQI7nz5KN3Yr/upJN5fROhi/SHvK39QOx12Pv7FCuWlc+oR68vLaoCKYhnkl3DnCfc7A7" "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDN/2SAFm50kraB1fepAizox/QRXxB7WbqVbH+5OPalDT47VIJGNKOKhixQoqhABHxEoLxdf/C83wxlCVlPV9poLfDgVkA3Lyt5r3tSFQ6QjjOJAgchWamMsxxyGBedhKvhiEzcr/Lxytnoz3kjDG8fqQJwEpdqMmJoMUfyL2Rqp16u+FQ7d5aJtwO8EUqovhMaNO7rggjPpV/uMOg+tBxxmscliN7DLuP4EMTA/FwXVzcFNbOx3K9BdpMRAaSJt4SWcJO2cS2KHA5n/H+PQI7nz5KN3Yr/upJN5fROhi/SHvK39QOx12Pv7FCuWlc+oR68vLaoCKYhnkl3DnCfc7A7"

11
hosts/web-arm/sites/cloonar.com.nix
View File

@@ -1,7 +1,12 @@
{ pkgs, lib, config, ... }: { pkgs, lib, config, ... }:
let let
domain = "cloonar.com"; domain = config.networking.domain;
dataDir = "/var/www/${domain}"; dataDir = "/var/www/${domain}";
mkWellKnown = data: ''
default_type application/json;
add_header Access-Control-Allow-Origin *;
return 200 '${builtins.toJSON data}';
'';
in { in {
services.nginx.virtualHosts."${domain}" = { services.nginx.virtualHosts."${domain}" = {
forceSSL = true; forceSSL = true;
@@ -44,6 +49,10 @@ in {
locations."~ [^/]\.php(/|$)".extraConfig = '' locations."~ [^/]\.php(/|$)".extraConfig = ''
deny all; deny all;
''; '';
# matrix
locations."= /.well-known/matrix/server".extraConfig = mkWellKnown { "m.server" = "matrix.cloonar.com:443"; };
locations."= /.well-known/matrix/client".extraConfig = mkWellKnown { "m.homeserver".base_url = "https://matrix.cloonar.com"; };
}; };
users.users."${domain}" = { users.users."${domain}" = {
isNormalUser = true; isNormalUser = true;

20
hosts/web-arm/sites/feeds.cloonar.com.nix
View File

@@ -37,18 +37,30 @@ in {
error_page 404 /index.php; error_page 404 /index.php;
''; '';
locations."/favicon.ico".extraConfig = ''
locations = {
"/favicon.ico".extraConfig = ''
log_not_found off; log_not_found off;
access_log off; access_log off;
''; '';
locations."/robots.txt".extraConfig = '' "/robots.txt".extraConfig = ''
access_log off; access_log off;
log_not_found off; log_not_found off;
''; '';
locations."/".extraConfig = '' "~ ^/[^/]+/".extraConfig = ''
try_files $uri $uri/ /index.php$is_args$args; try_files $uri $uri/index.php /index.php;
''; '';
# "/".extraConfig = ''
# try_files $uri $uri/index.php;
# '';
#
# "~ /$".extraConfig = ''
# try_files $uri $uri/index.php /index.php;
# '';
};
phpPackage = pkgs.php82; phpPackage = pkgs.php82;
}; };
} }