nixfmt changes

This commit is contained in:
Gerg-L 2023-12-03 21:59:58 -05:00
parent 36176f647c
commit f25c8638ee
Signed by: gerg-l
SSH key fingerprint: SHA256:FPYDHIkvMocr4wdmZXpgpJjsb2Tw6rASs2ISPbOb0KI
36 changed files with 133 additions and 135 deletions

View file

@ -1,7 +1,7 @@
_:
{ config, pkgs, ... }:
{config, pkgs, ...}:
{
sops.secrets.cloudflare = { };
sops.secrets.cloudflare = {};
systemd.services.ddns = {
reloadIfChanged = false;
@ -11,9 +11,9 @@ _:
Type = "oneshot";
RemainAfterExit = true;
};
wantedBy = [ "multi-user.target" ];
wants = [ "network-online.target" ];
after = [ "network-online.target" ];
wantedBy = ["multi-user.target"];
wants = ["network-online.target"];
after = ["network-online.target"];
startAt = "*:0/30";
serviceConfig = {

View file

@ -1,12 +1,12 @@
_:
{ config, ... }:
{config, ...}:
{
users.users = {
${config.services.gitea.user} = {
openssh.authorizedKeys.keys = [ config.local.keys.gerg_gerg-desktop ];
extraGroups = [ "postgres" ];
openssh.authorizedKeys.keys = [config.local.keys.gerg_gerg-desktop];
extraGroups = ["postgres"];
};
${config.services.nginx.user}.extraGroups = [ config.services.gitea.group ];
${config.services.nginx.user}.extraGroups = [config.services.gitea.group];
};
services.gitea = {
enable = true;

View file

@ -1,9 +1,9 @@
{ self, ... }:
{ lib, ... }:
{self, ...}:
{lib, ...}:
{
# I manually switch this sometimes
config = lib.mkIf false {
networking.firewall.allowedTCPPorts = [ 25565 ];
networking.firewall.allowedTCPPorts = [25565];
users.users.minecraft = {
description = "Minecraft server service user";
@ -12,10 +12,10 @@
isSystemUser = true;
group = "minecraft";
};
users.groups.minecraft = { };
users.groups.minecraft = {};
systemd.sockets.minecraft-server = {
bindsTo = [ "minecraft-server.service" ];
bindsTo = ["minecraft-server.service"];
socketConfig = {
ListenFIFO = "/run/minecraft-server.stdin";
SocketMode = "0660";
@ -29,13 +29,13 @@
systemd.services.minecraft-server = {
enable = true;
description = "Minecraft Server Service";
wantedBy = [ "multi-user.target" ];
requires = [ "minecraft-server.socket" ];
wantedBy = ["multi-user.target"];
requires = ["minecraft-server.socket"];
after = [
"network.target"
"minecraft-server.socket"
];
path = [ self.packages.papermc ];
path = [self.packages.papermc];
script = ''
minecraft-server \
-Xms8G \
@ -71,8 +71,8 @@
StandardError = "journal";
# Hardening
CapabilityBoundingSet = [ "" ];
DeviceAllow = [ "" ];
CapabilityBoundingSet = [""];
DeviceAllow = [""];
LockPersonality = true;
PrivateDevices = true;
PrivateTmp = true;

View file

@ -6,13 +6,13 @@ _:
...
}:
{
sops.secrets.minifluxenv = { };
sops.secrets.minifluxenv = {};
systemd.services = {
miniflux = {
description = "Miniflux service";
wantedBy = [ "multi-user.target" ];
requires = [ "miniflux-dbsetup.service" ];
wantedBy = ["multi-user.target"];
requires = ["miniflux-dbsetup.service"];
after = [
"network.target"
"postgresql.service"
@ -26,8 +26,8 @@ _:
RuntimeDirectoryMode = "0770";
EnvironmentFile = config.sops.secrets.minifluxenv.path;
# Hardening
CapabilityBoundingSet = [ "" ];
DeviceAllow = [ "" ];
CapabilityBoundingSet = [""];
DeviceAllow = [""];
LockPersonality = true;
MemoryDenyWriteExecute = true;
PrivateDevices = true;
@ -67,15 +67,13 @@ _:
};
miniflux-dbsetup = {
description = "Miniflux database setup";
requires = [ "postgresql.service" ];
requires = ["postgresql.service"];
after = [
"network.target"
"postgresql.service"
];
script = ''
${
lib.getExe' config.services.postgresql.package "psql"
} "miniflux" -c "CREATE EXTENSION IF NOT EXISTS hstore"
${lib.getExe' config.services.postgresql.package "psql"} "miniflux" -c "CREATE EXTENSION IF NOT EXISTS hstore"
'';
serviceConfig = {
Type = "oneshot";
@ -90,11 +88,11 @@ _:
users = {
miniflux = {
group = "miniflux";
extraGroups = [ "postgres" ];
extraGroups = ["postgres"];
isSystemUser = true;
uid = 377;
};
${config.services.nginx.user}.extraGroups = [ "miniflux" ];
${config.services.nginx.user}.extraGroups = ["miniflux"];
};
};
}

View file

@ -1,9 +1,9 @@
_:
{ pkgs, config, ... }:
{pkgs, config, ...}:
{
sops.secrets.nextcloud.owner = "nextcloud";
users.users.nextcloud.extraGroups = [ "postgres" ];
users.users.nextcloud.extraGroups = ["postgres"];
services.nextcloud = {
enable = true;

View file

@ -1,5 +1,5 @@
_:
{ config, lib, ... }:
{config, lib, ...}:
{
sops.secrets =
lib.genAttrs
@ -34,7 +34,7 @@ _:
forceSSL = true;
sslCertificate = config.sops.secrets.nixfu_ssl_cert.path;
sslCertificateKey = config.sops.secrets.nixfu_ssl_key.path;
serverAliases = [ "www.nix-fu.com" ];
serverAliases = ["www.nix-fu.com"];
globalRedirect = "github.com/Gerg-L";
};
"search.gerg-l.com" = {

View file

@ -6,12 +6,12 @@ _:
...
}:
{
sops.secrets.discordenv = { };
sops.secrets.discordenv = {};
systemd.services.parrot = {
enable = true;
wantedBy = [ "multi-user.target" ];
wants = [ "network-online.target" ];
after = [ "network-online.target" ];
wantedBy = ["multi-user.target"];
wants = ["network-online.target"];
after = ["network-online.target"];
script = lib.getExe pkgs.parrot;
serviceConfig = {
EnvironmentFile = config.sops.secrets.discordenv.path;

View file

@ -1,5 +1,5 @@
_:
{ config, pkgs, ... }:
{config, pkgs, ...}:
{
services.postgresql = {
enable = true;

View file

@ -1,8 +1,8 @@
_:
{ config, pkgs, ... }:
{config, pkgs, ...}:
{
sops.secrets.searxngenv = { };
users.users.${config.services.nginx.user}.extraGroups = [ "searx" ];
sops.secrets.searxngenv = {};
users.users.${config.services.nginx.user}.extraGroups = ["searx"];
services.searx = {
enable = true;
package = pkgs.searxng;