minor cleanup
This commit is contained in:
parent
f9bc07c8ff
commit
7a42b92bd9
1 changed files with 20 additions and 8 deletions
|
@ -1,10 +1,6 @@
|
||||||
{ lib, config, inputs, pkgs, ... }:
|
{ lib, config, inputs, pkgs, ... }:
|
||||||
let
|
let
|
||||||
root_host = "grimmauld.de";
|
root_host = "grimmauld.de";
|
||||||
|
|
||||||
# git add --intent-to-add email.txt ; git update-index --assume-unchanged email.txt
|
|
||||||
root_email = (builtins.elemAt (lib.strings.match "[[:space:]]*([^[:space:]]+)[[:space:]]*" (builtins.readFile ./email.txt)) 0);
|
|
||||||
|
|
||||||
in {
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
|
@ -13,6 +9,22 @@ in {
|
||||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||||
services.logrotate.checkConfig = false; # needed or this explodes
|
services.logrotate.checkConfig = false; # needed or this explodes
|
||||||
|
|
||||||
|
time.timeZone = "Europe/Berlin";
|
||||||
|
# Select internationalisation properties.
|
||||||
|
i18n.defaultLocale = "en_US.UTF-8";
|
||||||
|
|
||||||
|
i18n.extraLocaleSettings = {
|
||||||
|
LC_ADDRESS = "de_DE.UTF-8";
|
||||||
|
LC_IDENTIFICATION = "de_DE.UTF-8";
|
||||||
|
LC_MEASUREMENT = "de_DE.UTF-8";
|
||||||
|
LC_MONETARY = "de_DE.UTF-8";
|
||||||
|
LC_NAME = "de_DE.UTF-8";
|
||||||
|
LC_NUMERIC = "de_DE.UTF-8";
|
||||||
|
LC_PAPER = "de_DE.UTF-8";
|
||||||
|
LC_TELEPHONE = "de_DE.UTF-8";
|
||||||
|
LC_TIME = "de_DE.UTF-8";
|
||||||
|
};
|
||||||
|
|
||||||
users.users.grimmauld = {
|
users.users.grimmauld = {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
description = "grimmauld";
|
description = "grimmauld";
|
||||||
|
@ -39,16 +51,16 @@ in {
|
||||||
gitea
|
gitea
|
||||||
matrix-synapse-tools.synadm
|
matrix-synapse-tools.synadm
|
||||||
matrix-synapse
|
matrix-synapse
|
||||||
# ffmpeg-full
|
|
||||||
|
|
||||||
pufferpanel
|
pufferpanel
|
||||||
(writeShellScriptBin "pufferpanel-nix" "pufferpanel --workDir /var/lib/pufferpanel $@")
|
(writeShellScriptBin "pufferpanel-nix" "pufferpanel --workDir /var/lib/pufferpanel $@")
|
||||||
(writeShellScriptBin "nix-referrers" "nix-store --query --referrers $@")
|
(writeShellScriptBin "nix-referrers" "nix-store --query --referrers $@")
|
||||||
|
(writeShellScriptBin "silent-add" "git add --intent-to-add $@ ; git update-index --assume-unchanged $@")
|
||||||
];
|
];
|
||||||
|
|
||||||
environment.sessionVariables = {
|
environment.sessionVariables = {
|
||||||
NIXPKGS_ALLOW_UNFREE="1";
|
NIXPKGS_ALLOW_UNFREE="1";
|
||||||
OMP_NUM_THREADS = "4";
|
OMP_NUM_THREADS = "8";
|
||||||
};
|
};
|
||||||
|
|
||||||
networking.firewall = {
|
networking.firewall = {
|
||||||
|
@ -69,10 +81,10 @@ in {
|
||||||
|
|
||||||
virtualHosts."${root_host}" = {
|
virtualHosts."${root_host}" = {
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
enableACME = lib.mkForce false; # use the cert above, not some weird one that matrix-synapse module supplies
|
enableACME = lib.mkForce false; # use the correct cert, not some weird one that matrix-synapse module supplies
|
||||||
useACMEHost = root_host;
|
useACMEHost = root_host;
|
||||||
locations."/" = {
|
locations."/" = {
|
||||||
root = "/var/www/grimmauld.duckdns.org";
|
root = "/var/www/${root_host}";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue