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

Compare commits

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

No commits in common. "7b9b6c1cdd2586acdb4c840279e11281a9f62b6f" and "64d5fa9f0438926eb0613a56dd3e97b3f53242e7" have entirely different histories.
7b9b6c1cdd ... 64d5fa9f04

6 changed files with 70 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -16,28 +16,5 @@
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 = false;
enable = true;
};
};
shell = {

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

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

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

@ -21,11 +21,9 @@
};
};
config = {
services =
if config.server.cloud.nextcloud.enable then
{
services = {
nextcloud = {
enable = true;
enable = config.server.cloud.nextcloud.enable;
configureRedis = true;
package = pkgs.nextcloud33;
hostName = "nextcloud-net";
@ -34,7 +32,7 @@
dbuser = "nextcloud";
dbhost = "/run/postgresql"; # nextcloud will add /.s.PGSQL.5432 by itself
dbname = "nextcloud";
adminpassFile = "/home/marty/secrets/nextcloud";
adminpassFile = "/home/${config.user.userName}/secrets/nextcloud";
adminuser = "admin";
};
settings = {
@ -55,7 +53,9 @@
loglevel = 0;
};
};
postgresql = {
postgresql =
if config.server.cloud.nextcloud.enable then
{
enable = true;
ensureDatabases = [ "nextcloud" ];
ensureUsers = [
@ -64,7 +64,9 @@
ensureDBOwnership = true;
}
];
};
}
else
{ };
nginx = {
virtualHosts = {
"nextcloud-net".listen = [
@ -86,18 +88,10 @@
{ };
};
};
}
else
{ };
systemd =
if config.server.cloud.nextcloud.enable then
{
services."nextcloud-setup" = {
};
systemd.services."nextcloud-setup" = {
requires = [ "postgresql.service" ];
after = [ "postgresql.service" ];
};
}
else
{ };
};
}

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

@ -4,9 +4,7 @@
pkgs,
...
}:
let
domain = ${config.server.misc.lauti.subdomain}.${config.networking.domain};
in
{
options = {
server.misc.lauti = {
@ -16,10 +14,6 @@ in
description = "lauti port";
};
public = lib.mkEnableOption "make lauti public";
domain = lib.mkOption {
default = "";
description = "lauti domain";
};
subdomain = lib.mkOption {
default = "lauti";
description = "lauti subdomain";
@ -32,7 +26,7 @@ in
enable = config.server.misc.lauti.enable;
settings = {
LAUTI_ADMIN_EMAIL = "lauti@${config.networking.domain}";
LAUTI_BASE_URL = "https://${domain}";
LAUTI_BASE_URL = "https://${config.server.misc.lauti.subdomain}.${config.networking.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";
@ -42,7 +36,7 @@ in
};
nginx = {
virtualHosts = {
"${domain}" =
"${config.server.misc.lauti.subdomain}.${config.networking.domain}" =
if config.server.misc.lauti.public then
{
enableACME = true;