coolneng
/
zion
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use dot operator for attribute sets with 1 element

This commit is contained in:
coolneng 2021-04-15 12:34:38 +02:00
parent d5249bb625
commit cd2b98cca2
Signed by: coolneng
GPG Key ID: 9893DA236405AF57
5 changed files with 21 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/communication.nix
View File

@ -31,9 +31,7 @@
address = "http://localhost:8118"; address = "http://localhost:8118";
port = 8118; port = 8118;
}; };
bridge = { bridge.permissions."@coolneng:coolneng.duckdns.org" = "admin";
permissions = { "@coolneng:coolneng.duckdns.org" = "admin"; };
};
}; };
serviceDependencies = [ "matrix-synapse.service" ]; serviceDependencies = [ "matrix-synapse.service" ];
}; };

12
modules/datasync.nix
View File

@ -8,14 +8,10 @@
dataDir = "/vault/syncthing"; dataDir = "/vault/syncthing";
declarative = { declarative = {
devices = { devices = {
panacea = { panacea.id =
id = "UNZIABR-GEQ4AWT-XKFADLW-HW3SQ3Y-BEYZ56A-W530DLS-DXGQWKK-2QQ4RQ6";
"UNZIABR-GEQ4AWT-XKFADLW-HW3SQ3Y-BEYZ56A-W530DLS-DXGQWKK-2QQ4RQ6"; caravanserai.id =
}; "6KSGHNJ-NH4EZGP-X5HGV6B-OQ3ZFE6-WZQACOC-6WKPRGI-TTBRHJ5-U3R2AQ3";
caravanserai = {
id =
"6KSGHNJ-NH4EZGP-X5HGV6B-OQ3ZFE6-WZQACOC-6WKPRGI-TTBRHJ5-U3R2AQ3";
};
}; };
folders = { folders = {
Documents = { Documents = {

2
modules/devops.nix
View File

@ -14,6 +14,6 @@
repositoryRoot = "/vault/git"; repositoryRoot = "/vault/git";
appName = "Gitea"; appName = "Gitea";
lfs.enable = true; lfs.enable = true;
settings = { ui = { DEFAULT_THEME = "arc-green"; }; }; settings.ui.DEFAULT_THEME = "arc-green";
}; };
} }

2
modules/periodic.nix
View File

@ -20,7 +20,7 @@ in {
path = with pkgs; [ curl ]; path = with pkgs; [ curl ];
script = script =
"curl -L https://github.com/notracking/hosts-blocklists/raw/master/dnsmasq/dnsmasq.blacklist.txt -o ${blocklist}"; "curl -L https://github.com/notracking/hosts-blocklists/raw/master/dnsmasq/dnsmasq.blacklist.txt -o ${blocklist}";
serviceConfig = { Type = "oneshot"; }; serviceConfig.Type = "oneshot";
postStop = '' postStop = ''
chown -R dnsmasq ${stateDir} chown -R dnsmasq ${stateDir}
systemctl restart dnsmasq systemctl restart dnsmasq

34
modules/webstack.nix
View File

@ -92,17 +92,15 @@
ssl = true; ssl = true;
} }
]; ];
locations."/" = { proxyPass = "http://localhost:8008/"; }; locations."/".proxyPass = "http://localhost:8008/";
}; };
"element.coolneng.duckdns.org" = { "element.coolneng.duckdns.org" = {
enableACME = true; enableACME = true;
forceSSL = true; forceSSL = true;
locations."/".root = pkgs.element-web.override { locations."/".root = pkgs.element-web.override {
conf = { conf.default_server_config."m.homeserver" = {
default_server_config."m.homeserver" = { "base_url" = "https://matrix.coolneng.duckdns.org";
"base_url" = "https://matrix.coolneng.duckdns.org"; "server_name" = "coolneng.duckdns.org";
"server_name" = "coolneng.duckdns.org";
};
}; };
}; };
}; };
@ -134,25 +132,21 @@
security.acme = { security.acme = {
acceptTerms = true; acceptTerms = true;
email = "akasroua@gmail.com"; email = "akasroua@gmail.com";
certs = { certs."coolneng.duckdns.org".extraDomainNames = [
"coolneng.duckdns.org" = { "radicale.coolneng.duckdns.org"
extraDomainNames = [ "sync.coolneng.duckdns.org"
"radicale.coolneng.duckdns.org" "git.coolneng.duckdns.org"
"sync.coolneng.duckdns.org" "rss.coolneng.duckdns.org"
"git.coolneng.duckdns.org" "matrix.coolneng.duckdns.org"
"rss.coolneng.duckdns.org" "element.coolneng.duckdns.org"
"matrix.coolneng.duckdns.org" "wallabag.coolneng.duckdns.org"
"element.coolneng.duckdns.org" ];
"wallabag.coolneng.duckdns.org"
];
};
};
}; };
# Generate dhparams # Generate dhparams
security.dhparams = { security.dhparams = {
enable = true; enable = true;
params = { nginx.bits = 2048; }; params.nginx.bits = 2048;
}; };
# PostgreSQL databases configuration # PostgreSQL databases configuration