Compare commits
3 Commits
4bc85210f9
...
336ddb13f8
| Author | SHA1 | Date | |
|---|---|---|---|
| 336ddb13f8 | |||
| 8ae96c9b38 | |||
| 5dba628040 |
@@ -90,6 +90,9 @@ in
|
|||||||
};
|
};
|
||||||
|
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
|
# Disable PrivateTmp so unrar can use system /tmp for extraction
|
||||||
|
PrivateTmp = lib.mkForce false;
|
||||||
|
|
||||||
# Bind-mount DNS configuration files into the sandboxed service
|
# Bind-mount DNS configuration files into the sandboxed service
|
||||||
BindReadOnlyPaths = [
|
BindReadOnlyPaths = [
|
||||||
"/etc/resolv.conf"
|
"/etc/resolv.conf"
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ in {
|
|||||||
fontforge
|
fontforge
|
||||||
freecad
|
freecad
|
||||||
firefox
|
firefox
|
||||||
|
handbrake
|
||||||
openscad
|
openscad
|
||||||
orca-slicer
|
orca-slicer
|
||||||
|
|
||||||
|
|||||||
@@ -25,6 +25,10 @@ in {
|
|||||||
glib
|
glib
|
||||||
gnumake
|
gnumake
|
||||||
|
|
||||||
|
# mobile
|
||||||
|
flutter
|
||||||
|
supabase-cli
|
||||||
|
|
||||||
air
|
air
|
||||||
go
|
go
|
||||||
|
|
||||||
@@ -35,6 +39,7 @@ in {
|
|||||||
nix-prefetch-git
|
nix-prefetch-git
|
||||||
nodejs_22
|
nodejs_22
|
||||||
php
|
php
|
||||||
|
postgresql
|
||||||
rbw
|
rbw
|
||||||
sops
|
sops
|
||||||
unzip
|
unzip
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ local config = {
|
|||||||
on_config_done = nil,
|
on_config_done = nil,
|
||||||
-- size can be a number or function which is passed the current terminal
|
-- size can be a number or function which is passed the current terminal
|
||||||
size = 60,
|
size = 60,
|
||||||
open_mapping = [[<M-t>]],
|
open_mapping = nil,
|
||||||
hide_numbers = true, -- hide the number column in toggleterm buffers
|
hide_numbers = true, -- hide the number column in toggleterm buffers
|
||||||
shade_filetypes = {},
|
shade_filetypes = {},
|
||||||
shade_terminals = true,
|
shade_terminals = true,
|
||||||
|
|||||||
@@ -1,11 +1,5 @@
|
|||||||
{ pkgs, config, ... }:
|
{ pkgs, config, ... }:
|
||||||
let
|
let
|
||||||
nextcloud30 = pkgs.nextcloud30.overrideAttrs (oldAttrs: {
|
|
||||||
src = pkgs.fetchurl {
|
|
||||||
url = "https://download.nextcloud.com/server/releases/nextcloud-30.0.2.tar.bz2";
|
|
||||||
sha256 = "sha256-kpu4BF6WIW/iKmXc1mJ55b17oauynZm/QB1CO2RqRF8=";
|
|
||||||
};
|
|
||||||
});
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
sops.secrets.nextcloud-adminpass.owner = "nextcloud";
|
sops.secrets.nextcloud-adminpass.owner = "nextcloud";
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@@ -1,11 +1,21 @@
|
|||||||
{ pkgs, lib, config, ... }:
|
{ pkgs, lib, config, ... }:
|
||||||
let
|
{
|
||||||
domain = "fueltide.cloonar.dev";
|
# SOPS secret for fueltide.io DNS credentials (separate Hetzner API token)
|
||||||
dataDir = "/var/www/${domain}";
|
sops.secrets.fueltide-lego-credentials = { };
|
||||||
in {
|
|
||||||
|
|
||||||
services.webstack.instances."${domain}" = {
|
# Override ACME credentials for fueltide.io domains
|
||||||
|
# These use a separate Hetzner DNS API token from the global default
|
||||||
|
security.acme.certs."app.fueltide.io" = {
|
||||||
|
credentialsFile = config.sops.secrets.fueltide-lego-credentials.path;
|
||||||
|
};
|
||||||
|
|
||||||
|
security.acme.certs."app.stage.fueltide.io" = {
|
||||||
|
credentialsFile = config.sops.secrets.fueltide-lego-credentials.path;
|
||||||
|
};
|
||||||
|
|
||||||
|
services.webstack.instances."fueltide.cloonar.dev" = {
|
||||||
enablePhp = false;
|
enablePhp = false;
|
||||||
|
enableDefaultLocations = false;
|
||||||
|
|
||||||
authorizedKeys = [
|
authorizedKeys = [
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIILf3KpvY3sG/l5w4phV3qxOnahFpb7op/8y6i3oLWXv"
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIILf3KpvY3sG/l5w4phV3qxOnahFpb7op/8y6i3oLWXv"
|
||||||
@@ -13,6 +23,47 @@ in {
|
|||||||
|
|
||||||
locations."/".extraConfig = ''
|
locations."/".extraConfig = ''
|
||||||
index index.html;
|
index index.html;
|
||||||
|
try_files $uri $uri/ /index.html;
|
||||||
|
'';
|
||||||
|
|
||||||
|
locations."~* \.(js|jpg|gif|png|webp|avif|css|woff2)$".extraConfig = ''
|
||||||
|
expires 365d;
|
||||||
|
add_header Pragma "public";
|
||||||
|
add_header Cache-Control "public";
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
services.webstack.instances."app.fueltide.io" = {
|
||||||
|
enablePhp = false;
|
||||||
|
enableDefaultLocations = false;
|
||||||
|
|
||||||
|
authorizedKeys = [
|
||||||
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIILf3KpvY3sG/l5w4phV3qxOnahFpb7op/8y6i3oLWXv"
|
||||||
|
];
|
||||||
|
|
||||||
|
locations."/".extraConfig = ''
|
||||||
|
index index.html;
|
||||||
|
try_files $uri $uri/ /index.html;
|
||||||
|
'';
|
||||||
|
|
||||||
|
locations."~* \.(js|jpg|gif|png|webp|avif|css|woff2)$".extraConfig = ''
|
||||||
|
expires 365d;
|
||||||
|
add_header Pragma "public";
|
||||||
|
add_header Cache-Control "public";
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
services.webstack.instances."app.stage.fueltide.io" = {
|
||||||
|
enablePhp = false;
|
||||||
|
enableDefaultLocations = false;
|
||||||
|
|
||||||
|
authorizedKeys = [
|
||||||
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIILf3KpvY3sG/l5w4phV3qxOnahFpb7op/8y6i3oLWXv"
|
||||||
|
];
|
||||||
|
|
||||||
|
locations."/".extraConfig = ''
|
||||||
|
index index.html;
|
||||||
|
try_files $uri $uri/ /index.html;
|
||||||
'';
|
'';
|
||||||
|
|
||||||
locations."~* \.(js|jpg|gif|png|webp|avif|css|woff2)$".extraConfig = ''
|
locations."~* \.(js|jpg|gif|png|webp|avif|css|woff2)$".extraConfig = ''
|
||||||
|
|||||||
Reference in New Issue
Block a user