gensokyo-zone/infrastructure
1
0
Fork 0
mirror of https://github.com/gensokyo-zone/infrastructure.git synced 2026-02-09 12:29:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Further nixfmting.

Browse source
This commit is contained in:
kat witch 2020-12-08 15:10:03 +00:00 • committed by kat
parent 0b4801cfcc
commit 6934230103
12 changed files with 307 additions and 301 deletions
Download patch file Download diff file Expand all files Collapse all files

3
configuration/hosts/beltane/services/bitwarden.nix
View file

@ -1,6 +1,7 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
let secrets = ( import ../secrets.nix ); in { let secrets = (import ../secrets.nix);
in {
bitwarden_rs = { bitwarden_rs = {
enable = true; enable = true;
config = { config = {

15
configuration/hosts/beltane/services/matrix.nix
View file

@ -1,24 +1,21 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
let secrets = ( import ../secrets.nix ); in { let secrets = (import ../secrets.nix);
in {
matrix-synapse = { matrix-synapse = {
enable = true; enable = true;
registration_shared_secret = secrets.matrix.secret; registration_shared_secret = secrets.matrix.secret;
server_name = "dork.dev"; server_name = "dork.dev";
listeners = [ listeners = [{
{
port = 8008; port = 8008;
bind_address = "::1"; bind_address = "::1";
type = "http"; type = "http";
tls = false; tls = false;
x_forwarded = true; x_forwarded = true;
resources = [ resources = [{
{
names = [ "client" "federation" ]; names = [ "client" "federation" ];
compress = false; compress = false;
} }];
]; }];
}
];
}; };
} }

7
configuration/hosts/beltane/services/nextcloud.nix
View file

@ -2,8 +2,8 @@
{ {
systemd.services."nextcloud-setup" = { systemd.services."nextcloud-setup" = {
requires = ["postgresql.service"]; requires = [ "postgresql.service" ];
after = ["postgresql.service"]; after = [ "postgresql.service" ];
}; };
services.nextcloud = { services.nextcloud = {
@ -16,7 +16,8 @@
dbuser = "nextcloud"; dbuser = "nextcloud";
dbhost = "/run/postgresql"; dbhost = "/run/postgresql";
dbname = "nextcloud"; 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"; adminuser = "root";
}; };
}; };

29
configuration/hosts/beltane/services/nginx.nix
View file

@ -1,9 +1,12 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
let common = { let
common = {
enableACME = true; enableACME = true;
forceSSL = true; forceSSL = true;
}; secrets = import ../secrets.nix; in { };
secrets = import ../secrets.nix;
in {
services.nginx = { services.nginx = {
enable = true; enable = true;
recommendedGzipSettings = true; recommendedGzipSettings = true;
@ -24,12 +27,10 @@ let common = {
''; '';
virtualHosts = { virtualHosts = {
"beltane.dork.dev" = { "beltane.dork.dev" = { root = "/var/www/beltane"; } // common;
root = "/var/www/beltane";
} // common;
"dork.dev" = { "dork.dev" = {
root = "/var/www/dork"; root = "/var/www/dork";
/*locations = { /* locations = {
"/_matrix" = { "/_matrix" = {
proxyPass = "http://[::1]:8008"; proxyPass = "http://[::1]:8008";
}; };
@ -47,9 +48,10 @@ let common = {
add_header Access-Control-Allow-Origin *; add_header Access-Control-Allow-Origin *;
return 200 '${builtins.toJSON client}'; return 200 '${builtins.toJSON client}';
''; '';
};*/ };
*/
} // common; } // common;
/*"pw.dork.dev" = { /* "pw.dork.dev" = {
locations = { locations = {
"/".proxyPass = "http://127.0.0.1:4000"; "/".proxyPass = "http://127.0.0.1:4000";
"/notifications/hub".proxyPass = "http://127.0.0.1:3012"; "/notifications/hub".proxyPass = "http://127.0.0.1:3012";
@ -60,17 +62,14 @@ let common = {
locations = { locations = {
"/".proxyPass = "http://127.0.0.1:3000"; "/".proxyPass = "http://127.0.0.1:3000";
}; };
} // common;*/ } // common;
*/
"znc.dork.dev" = { "znc.dork.dev" = {
locations = { locations = { "/".proxyPass = "http://127.0.0.1:5000"; };
"/".proxyPass = "http://127.0.0.1:5000";
};
} // common; } // common;
"irc.dork.dev" = { "irc.dork.dev" = {
locations = { locations = {
"/" = { "/" = { root = pkgs.glowing-bear; };
root = pkgs.glowing-bear;
};
"^~ /weechat" = { "^~ /weechat" = {
proxyPass = "http://127.0.0.1:9000"; proxyPass = "http://127.0.0.1:9000";
proxyWebsockets = true; proxyWebsockets = true;

6
configuration/hosts/beltane/services/postgres.nix
View file

@ -10,10 +10,8 @@
LC_CTYPE = "C"; LC_CTYPE = "C";
''; '';
services.postgresql.ensureDatabases = [ "nextcloud" ]; services.postgresql.ensureDatabases = [ "nextcloud" ];
services.postgresql.ensureUsers = [ services.postgresql.ensureUsers = [{
{
name = "nextcloud"; name = "nextcloud";
ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES"; ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES";
} }];
];
} }

13
configuration/hosts/beltane/services/weechat.nix
View file

@ -2,11 +2,18 @@
{ {
services.weechat = { services.weechat = {
binary = let new-weechat = pkgs.wrapWeechat pkgs.weechat-unwrapped { binary = let
new-weechat = pkgs.wrapWeechat pkgs.weechat-unwrapped {
configure = { availablePlugins, ... }: { configure = { availablePlugins, ... }: {
scripts = [ pkgs.weechatScripts.weechat-matrix ]; scripts = [ pkgs.weechatScripts.weechat-matrix ];
plugins = [ availablePlugins.perl ( availablePlugins.python.withPackages (ps: [ ps.potr pkgs.weechatScripts.weechat-matrix ])) ]; }; plugins = [
}; in "${new-weechat}/bin/weechat"; availablePlugins.perl
(availablePlugins.python.withPackages
(ps: [ ps.potr pkgs.weechatScripts.weechat-matrix ]))
];
};
};
in "${new-weechat}/bin/weechat";
enable = true; enable = true;
}; };

13
configuration/hosts/beltane/services/znc.nix
View file

@ -1,6 +1,7 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
let secrets = import ../secrets.nix; in { let secrets = import ../secrets.nix;
in {
services.znc = { services.znc = {
enable = true; enable = true;
mutable = false; mutable = false;
@ -23,10 +24,7 @@ let secrets = import ../secrets.nix; in {
Nick = secrets.znc.freenode.nick; Nick = secrets.znc.freenode.nick;
AltNick = secrets.znc.freenode.altNick; AltNick = secrets.znc.freenode.altNick;
JoinDelay = 2; JoinDelay = 2;
LoadModule = [ LoadModule = [ "simple_away" "nickserv" ];
"simple_away"
"nickserv"
];
}; };
Network.espernet = { Network.espernet = {
Server = "anarchy.esper.net +6697 ${secrets.znc.espernet.password}"; Server = "anarchy.esper.net +6697 ${secrets.znc.espernet.password}";
@ -34,10 +32,7 @@ let secrets = import ../secrets.nix; in {
Nick = secrets.znc.espernet.nick; Nick = secrets.znc.espernet.nick;
AltNick = secrets.znc.espernet.altNick; AltNick = secrets.znc.espernet.altNick;
JoinDelay = 2; JoinDelay = 2;
LoadModule = [ LoadModule = [ "simple_away" "nickserv" ];
"simple_away"
"nickserv"
];
}; };
Pass.password = { Pass.password = {
Method = secrets.znc.password.method; Method = secrets.znc.password.method;

20
configuration/hosts/samhain/services/thermal/thermal.nix
View file

@ -8,9 +8,12 @@
}; };
systemd = { systemd = {
services = { 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" ]; wantedBy = [ "multi-user.target" ];
path = [pkgs.bash pkgs.coreutils-full]; path = [ pkgs.bash pkgs.coreutils-full ];
serviceConfig = { serviceConfig = {
RemainAfterExit = "no"; RemainAfterExit = "no";
Type = "simple"; Type = "simple";
@ -19,9 +22,12 @@
User = "root"; 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" ]; wantedBy = [ "multi-user.target" ];
path = [pkgs.bash pkgs.linuxPackages.cpupower]; path = [ pkgs.bash pkgs.linuxPackages.cpupower ];
serviceConfig = { serviceConfig = {
RemainAfterExit = "yes"; RemainAfterExit = "yes";
Type = "oneshot"; Type = "oneshot";
@ -32,10 +38,12 @@
}; };
}; };
}; };
services.thermald = let cfg_file = pkgs.writeTextFile { services.thermald = let
cfg_file = pkgs.writeTextFile {
name = "cfg"; name = "cfg";
text = (builtins.readFile ./kaede-thermald.xml); text = (builtins.readFile ./kaede-thermald.xml);
}; in { };
in {
enable = true; enable = true;
configFile = "${cfg_file}"; configFile = "${cfg_file}";
}; };

3
configuration/hosts/samhain/services/torrenting.nix
View file

@ -1,7 +1,8 @@
{ config, lib, pkgs, ... }: { 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 #!${pkgs.bash}/bin/bash
set -e set -e
if [ "$TR_TORRENT_DIR"/"$TR_TORRENT_NAME" != "/" ]; then if [ "$TR_TORRENT_DIR"/"$TR_TORRENT_NAME" != "/" ]; then

11
configuration/profiles/development/default.nix
View file

@ -1,16 +1,15 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
{ {
environment.systemPackages = let python-env = python-packages: with pkgs.python38Packages; [ environment.systemPackages = let
python-env = python-packages:
with pkgs.python38Packages; [
pip pip
setuptools setuptools
psutil 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 = { home-manager.users.kat = {
programs.go.enable = true; programs.go.enable = true;