mirror of
https://github.com/gensokyo-zone/infrastructure.git
synced 2026-02-09 04:19:19 -08:00
Further nixfmting.
This commit is contained in:
kat witch
kat
parent
0b4801cfcc
commit
6934230103
12 changed files with 307 additions and 301 deletions
|
|
@ -1,6 +1,7 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
let secrets = ( import ../secrets.nix ); in {
|
||||
let secrets = (import ../secrets.nix);
|
||||
in {
|
||||
bitwarden_rs = {
|
||||
enable = true;
|
||||
config = {
|
||||
|
|
|
|||
|
|
@ -1,24 +1,21 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
let secrets = ( import ../secrets.nix ); in {
|
||||
let secrets = (import ../secrets.nix);
|
||||
in {
|
||||
matrix-synapse = {
|
||||
enable = true;
|
||||
registration_shared_secret = secrets.matrix.secret;
|
||||
server_name = "dork.dev";
|
||||
listeners = [
|
||||
{
|
||||
listeners = [{
|
||||
port = 8008;
|
||||
bind_address = "::1";
|
||||
type = "http";
|
||||
tls = false;
|
||||
x_forwarded = true;
|
||||
resources = [
|
||||
{
|
||||
resources = [{
|
||||
names = [ "client" "federation" ];
|
||||
compress = false;
|
||||
}
|
||||
];
|
||||
}
|
||||
];
|
||||
}];
|
||||
}];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
{
|
||||
systemd.services."nextcloud-setup" = {
|
||||
requires = ["postgresql.service"];
|
||||
after = ["postgresql.service"];
|
||||
requires = [ "postgresql.service" ];
|
||||
after = [ "postgresql.service" ];
|
||||
};
|
||||
|
||||
services.nextcloud = {
|
||||
|
|
@ -16,7 +16,8 @@
|
|||
dbuser = "nextcloud";
|
||||
dbhost = "/run/postgresql";
|
||||
dbname = "nextcloud";
|
||||
adminpassFile = "/var/lib/nextcloud/admin_pass"; # TODO replace this with proper secrets management
|
||||
adminpassFile =
|
||||
"/var/lib/nextcloud/admin_pass"; # TODO replace this with proper secrets management
|
||||
adminuser = "root";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,9 +1,12 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
let common = {
|
||||
let
|
||||
common = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
}; secrets = import ../secrets.nix; in {
|
||||
};
|
||||
secrets = import ../secrets.nix;
|
||||
in {
|
||||
services.nginx = {
|
||||
enable = true;
|
||||
recommendedGzipSettings = true;
|
||||
|
|
@ -24,12 +27,10 @@ let common = {
|
|||
'';
|
||||
|
||||
virtualHosts = {
|
||||
"beltane.dork.dev" = {
|
||||
root = "/var/www/beltane";
|
||||
} // common;
|
||||
"beltane.dork.dev" = { root = "/var/www/beltane"; } // common;
|
||||
"dork.dev" = {
|
||||
root = "/var/www/dork";
|
||||
/*locations = {
|
||||
/* locations = {
|
||||
"/_matrix" = {
|
||||
proxyPass = "http://[::1]:8008";
|
||||
};
|
||||
|
|
@ -47,9 +48,10 @@ let common = {
|
|||
add_header Access-Control-Allow-Origin *;
|
||||
return 200 '${builtins.toJSON client}';
|
||||
'';
|
||||
};*/
|
||||
};
|
||||
*/
|
||||
} // common;
|
||||
/*"pw.dork.dev" = {
|
||||
/* "pw.dork.dev" = {
|
||||
locations = {
|
||||
"/".proxyPass = "http://127.0.0.1:4000";
|
||||
"/notifications/hub".proxyPass = "http://127.0.0.1:3012";
|
||||
|
|
@ -60,17 +62,14 @@ let common = {
|
|||
locations = {
|
||||
"/".proxyPass = "http://127.0.0.1:3000";
|
||||
};
|
||||
} // common;*/
|
||||
} // common;
|
||||
*/
|
||||
"znc.dork.dev" = {
|
||||
locations = {
|
||||
"/".proxyPass = "http://127.0.0.1:5000";
|
||||
};
|
||||
locations = { "/".proxyPass = "http://127.0.0.1:5000"; };
|
||||
} // common;
|
||||
"irc.dork.dev" = {
|
||||
locations = {
|
||||
"/" = {
|
||||
root = pkgs.glowing-bear;
|
||||
};
|
||||
"/" = { root = pkgs.glowing-bear; };
|
||||
"^~ /weechat" = {
|
||||
proxyPass = "http://127.0.0.1:9000";
|
||||
proxyWebsockets = true;
|
||||
|
|
|
|||
|
|
@ -10,10 +10,8 @@
|
|||
LC_CTYPE = "C";
|
||||
'';
|
||||
services.postgresql.ensureDatabases = [ "nextcloud" ];
|
||||
services.postgresql.ensureUsers = [
|
||||
{
|
||||
services.postgresql.ensureUsers = [{
|
||||
name = "nextcloud";
|
||||
ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES";
|
||||
}
|
||||
];
|
||||
}];
|
||||
}
|
||||
|
|
@ -2,11 +2,18 @@
|
|||
|
||||
{
|
||||
services.weechat = {
|
||||
binary = let new-weechat = pkgs.wrapWeechat pkgs.weechat-unwrapped {
|
||||
binary = let
|
||||
new-weechat = pkgs.wrapWeechat pkgs.weechat-unwrapped {
|
||||
configure = { availablePlugins, ... }: {
|
||||
scripts = [ pkgs.weechatScripts.weechat-matrix ];
|
||||
plugins = [ availablePlugins.perl ( availablePlugins.python.withPackages (ps: [ ps.potr pkgs.weechatScripts.weechat-matrix ])) ]; };
|
||||
}; in "${new-weechat}/bin/weechat";
|
||||
plugins = [
|
||||
availablePlugins.perl
|
||||
(availablePlugins.python.withPackages
|
||||
(ps: [ ps.potr pkgs.weechatScripts.weechat-matrix ]))
|
||||
];
|
||||
};
|
||||
};
|
||||
in "${new-weechat}/bin/weechat";
|
||||
enable = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
let secrets = import ../secrets.nix; in {
|
||||
let secrets = import ../secrets.nix;
|
||||
in {
|
||||
services.znc = {
|
||||
enable = true;
|
||||
mutable = false;
|
||||
|
|
@ -23,10 +24,7 @@ let secrets = import ../secrets.nix; in {
|
|||
Nick = secrets.znc.freenode.nick;
|
||||
AltNick = secrets.znc.freenode.altNick;
|
||||
JoinDelay = 2;
|
||||
LoadModule = [
|
||||
"simple_away"
|
||||
"nickserv"
|
||||
];
|
||||
LoadModule = [ "simple_away" "nickserv" ];
|
||||
};
|
||||
Network.espernet = {
|
||||
Server = "anarchy.esper.net +6697 ${secrets.znc.espernet.password}";
|
||||
|
|
@ -34,10 +32,7 @@ let secrets = import ../secrets.nix; in {
|
|||
Nick = secrets.znc.espernet.nick;
|
||||
AltNick = secrets.znc.espernet.altNick;
|
||||
JoinDelay = 2;
|
||||
LoadModule = [
|
||||
"simple_away"
|
||||
"nickserv"
|
||||
];
|
||||
LoadModule = [ "simple_away" "nickserv" ];
|
||||
};
|
||||
Pass.password = {
|
||||
Method = secrets.znc.password.method;
|
||||
|
|
|
|||
|
|
@ -8,9 +8,12 @@
|
|||
};
|
||||
systemd = {
|
||||
services = {
|
||||
kaede-thermals = let kaede-thermals-script = pkgs.writeScriptBin "script" (builtins.readFile ./kaede-thermals.sh); in {
|
||||
kaede-thermals = let
|
||||
kaede-thermals-script =
|
||||
pkgs.writeScriptBin "script" (builtins.readFile ./kaede-thermals.sh);
|
||||
in {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
path = [pkgs.bash pkgs.coreutils-full];
|
||||
path = [ pkgs.bash pkgs.coreutils-full ];
|
||||
serviceConfig = {
|
||||
RemainAfterExit = "no";
|
||||
Type = "simple";
|
||||
|
|
@ -19,9 +22,12 @@
|
|||
User = "root";
|
||||
};
|
||||
};
|
||||
kaede-power = let kaede-power-script = pkgs.writeScriptBin "script" (builtins.readFile ./kaede-power.sh); in {
|
||||
kaede-power = let
|
||||
kaede-power-script =
|
||||
pkgs.writeScriptBin "script" (builtins.readFile ./kaede-power.sh);
|
||||
in {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
path = [pkgs.bash pkgs.linuxPackages.cpupower];
|
||||
path = [ pkgs.bash pkgs.linuxPackages.cpupower ];
|
||||
serviceConfig = {
|
||||
RemainAfterExit = "yes";
|
||||
Type = "oneshot";
|
||||
|
|
@ -32,10 +38,12 @@
|
|||
};
|
||||
};
|
||||
};
|
||||
services.thermald = let cfg_file = pkgs.writeTextFile {
|
||||
services.thermald = let
|
||||
cfg_file = pkgs.writeTextFile {
|
||||
name = "cfg";
|
||||
text = (builtins.readFile ./kaede-thermald.xml);
|
||||
}; in {
|
||||
};
|
||||
in {
|
||||
enable = true;
|
||||
configFile = "${cfg_file}";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
services.transmission = let transmission-done-script = pkgs.writeScriptBin "script" ''
|
||||
services.transmission = let
|
||||
transmission-done-script = pkgs.writeScriptBin "script" ''
|
||||
#!${pkgs.bash}/bin/bash
|
||||
set -e
|
||||
if [ "$TR_TORRENT_DIR"/"$TR_TORRENT_NAME" != "/" ]; then
|
||||
|
|
|
|||
|
|
@ -1,16 +1,15 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
environment.systemPackages = let python-env = python-packages: with pkgs.python38Packages; [
|
||||
environment.systemPackages = let
|
||||
python-env = python-packages:
|
||||
with pkgs.python38Packages; [
|
||||
pip
|
||||
setuptools
|
||||
psutil
|
||||
]; python-with-env = pkgs.python3.withPackages python-env;
|
||||
in [
|
||||
pkgs.php
|
||||
pkgs.php74Packages.composer2
|
||||
python-with-env
|
||||
];
|
||||
python-with-env = pkgs.python3.withPackages python-env;
|
||||
in [ pkgs.php pkgs.php74Packages.composer2 python-with-env ];
|
||||
|
||||
home-manager.users.kat = {
|
||||
programs.go.enable = true;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue