marty/config.nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: marty:64d5fa9f0438926eb0613a56dd3e97b3f53242e7
Branches Tags
marty:main
..
compare: marty:7b9b6c1cdd2586acdb4c840279e11281a9f62b6f
Branches Tags
marty:main

4 commits
64d5fa9f04 ... 7b9b6c1cdd

Author SHA1 Message Date
martyTF
7b9b6c1cdd Merge branch 'main' of https://git.marty.tf/marty/config.nix 2026-04-14 17:58:45 +02:00
martyTF
98f576b2c3 h 2026-04-14 17:57:25 +02:00
martyTF
540ac42eac Merge branch 'main' of https://git.marty.tf/marty/config.nix 2026-04-11 17:37:29 +02:00
martyTF
77afca4525 commit message 2026-04-11 17:30:53 +02:00
6 changed files with 105 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

23
hosts/marty-pc/home.nix
View file

@ -16,5 +16,28 @@
imports = [
./../../home
];
desktop.hyprland = {
numlock = true;
monitors = [
"desc:AOC Q27G2WG4 0x00005F45, 2560x1440@144, 3840x0, 1 # main monitor"
"desc:Samsung Electric Company S24D330 0x5A5A5131, 1920x1080@60, 3840x1440, 1 # side monitor"
"desc:Panasonic Industry Company Panasonic-TV, 3840x2160@30, 0x0, 1 # tv"
"desc:Valve Corporation Index HMD 0x3DEBE38D, preffered, auto, 1"
];
workspaces.workspaces = [
"1, monitor:DP-1, persistent:true"
"2, monitor:DP-1, persistent:true"
"3, monitor:DP-1, persistent:true"
"4, monitor:DP-1, persistent:true"
"5, monitor:HDMI-A-1, persistent:true"
"6, monitor:HDMI-A-1, persistent:true"
"7, monitor:HDMI-A-1, persistent:true"
"8, monitor:HDMI-A-1, persistent:true"
"9, monitor:DP-3, persistent:true"
"special:magic"
];
};
programs.home-manager.enable = true;
}

2
hosts/marty-pc/options.nix
View file

@ -125,7 +125,7 @@
enable = true;
};
sway = {
enable = true;
enable = false;
};
};
shell = {

2
hosts/marty-thinkpad/options.nix
View file

@ -125,7 +125,7 @@
enable = true;
};
sway = {
enable = false;
enable = true;
};
};
shell = {

134
modules/server/cloud/nextcloud.nix
View file

@ -21,41 +21,41 @@
};
};
config = {
services = {
nextcloud = {
enable = config.server.cloud.nextcloud.enable;
configureRedis = true;
package = pkgs.nextcloud33;
hostName = "nextcloud-net";
config = {
dbtype = "pgsql";
dbuser = "nextcloud";
dbhost = "/run/postgresql"; # nextcloud will add /.s.PGSQL.5432 by itself
dbname = "nextcloud";
adminpassFile = "/home/${config.user.userName}/secrets/nextcloud";
adminuser = "admin";
};
settings = {
trusted_proxies = [
"localhost"
"127.0.0.1"
"${config.server.cloud.nextcloud.subdomain}.${config.networking.domain}"
config.networking.hostName
];
trusted_domains = [
"${config.server.cloud.nextcloud.subdomain}.${config.networking.domain}"
config.networking.hostName
];
skeletondirectory = "";
preview_ffmpeg_path = "${pkgs.ffmpeg}/bin/ffmpeg";
log_type = "file";
logfile = "nextcloud.log";
loglevel = 0;
};
};
postgresql =
if config.server.cloud.nextcloud.enable then
{
services =
if config.server.cloud.nextcloud.enable then
{
nextcloud = {
enable = true;
configureRedis = true;
package = pkgs.nextcloud33;
hostName = "nextcloud-net";
config = {
dbtype = "pgsql";
dbuser = "nextcloud";
dbhost = "/run/postgresql"; # nextcloud will add /.s.PGSQL.5432 by itself
dbname = "nextcloud";
adminpassFile = "/home/marty/secrets/nextcloud";
adminuser = "admin";
};
settings = {
trusted_proxies = [
"localhost"
"127.0.0.1"
"${config.server.cloud.nextcloud.subdomain}.${config.networking.domain}"
config.networking.hostName
];
trusted_domains = [
"${config.server.cloud.nextcloud.subdomain}.${config.networking.domain}"
config.networking.hostName
];
skeletondirectory = "";
preview_ffmpeg_path = "${pkgs.ffmpeg}/bin/ffmpeg";
log_type = "file";
logfile = "nextcloud.log";
loglevel = 0;
};
};
postgresql = {
enable = true;
ensureDatabases = [ "nextcloud" ];
ensureUsers = [
@ -64,34 +64,40 @@
ensureDBOwnership = true;
}
];
}
else
{ };
nginx = {
virtualHosts = {
"nextcloud-net".listen = [
{
addr = "0.0.0.0";
port = config.server.cloud.nextcloud.port;
}
];
"${config.server.cloud.nextcloud.subdomain}.${config.networking.domain}" =
if config.server.cloud.nextcloud.public then
{
enableACME = true;
forceSSL = true;
locations."/" = {
proxyPass = "http://127.0.0.1:${toString config.server.cloud.nextcloud.port}";
};
}
else
{ };
};
};
};
systemd.services."nextcloud-setup" = {
requires = [ "postgresql.service" ];
after = [ "postgresql.service" ];
};
};
nginx = {
virtualHosts = {
"nextcloud-net".listen = [
{
addr = "0.0.0.0";
port = config.server.cloud.nextcloud.port;
}
];
"${config.server.cloud.nextcloud.subdomain}.${config.networking.domain}" =
if config.server.cloud.nextcloud.public then
{
enableACME = true;
forceSSL = true;
locations."/" = {
proxyPass = "http://127.0.0.1:${toString config.server.cloud.nextcloud.port}";
};
}
else
{ };
};
};
}
else
{ };
systemd =
if config.server.cloud.nextcloud.enable then
{
services."nextcloud-setup" = {
requires = [ "postgresql.service" ];
after = [ "postgresql.service" ];
};
}
else
{ };
};
}

12
modules/server/misc/lauti.nix
View file

@ -4,7 +4,9 @@
pkgs,
...
}:
let
domain = ${config.server.misc.lauti.subdomain}.${config.networking.domain};
in
{
options = {
server.misc.lauti = {
@ -14,6 +16,10 @@
description = "lauti port";
};
public = lib.mkEnableOption "make lauti public";
domain = lib.mkOption {
default = "";
description = "lauti domain";
};
subdomain = lib.mkOption {
default = "lauti";
description = "lauti subdomain";
@ -26,7 +32,7 @@
enable = config.server.misc.lauti.enable;
settings = {
LAUTI_ADMIN_EMAIL = "lauti@${config.networking.domain}";
LAUTI_BASE_URL = "https://${config.server.misc.lauti.subdomain}.${config.networking.domain}";
LAUTI_BASE_URL = "https://${domain}";
LAUTI_OSM_TILE_CACHE_DIR = "/var/lib/lauti/osm";
LAUTI_OSM_TILE_SERVER = "https://tile.openstreetmap.org/{z}/{x}/{y}.png";
LAUTI_TIMEZONE = "Europe/Berlin";
@ -36,7 +42,7 @@
};
nginx = {
virtualHosts = {
"${config.server.misc.lauti.subdomain}.${config.networking.domain}" =
"${domain}" =
if config.server.misc.lauti.public then
{
enableACME = true;

2
modules/system/networking.nix
View file

@ -7,7 +7,7 @@
{
options = {
system.hostname = lib.mkOption {
system.hostname = lib.mkOption {
default = "${config.user.userName}-device";
description = "hostname";
};