commit ca7857838030e8f71d60d85091d3110e23838563
parent 641fa0d4eb9f3d5555cef6417a15cb236d82e14d
Author: Katja (zaphyra) <git@ctu.cx>
Date: Tue, 27 May 2025 18:01:12 +0200
parent 641fa0d4eb9f3d5555cef6417a15cb236d82e14d
Author: Katja (zaphyra) <git@ctu.cx>
Date: Tue, 27 May 2025 18:01:12 +0200
cleanup
5 files changed, 36 insertions(+), 40 deletions(-)
M
|
64
++++++++++++++++++++++++++++++++--------------------------------
diff --git a/config/home/katja/programs/git.nix b/config/home/katja/programs/git.nix @@ -25,7 +25,7 @@ aliases = { log-gpg = "log --show-signature"; - pfusch = "push"; + pfusch = "push -f"; }; extraConfig = {
diff --git a/config/nixos/modules/presets/katja/dnsServer.nix b/config/nixos/modules/presets/katja/dnsServer.nix @@ -78,10 +78,6 @@ in #legacy-stuff (zuggeschmack server) "trabbi.infra".A = [ "94.16.104.148" ]; "trabbi.infra".AAAA = [ "2a03:4000:50:e8::1" ]; - - #legacy-stuff (old server) - "hector.infra".A = [ "194.59.205.194" ]; - "hector.infra".AAAA = [ "2a03:4000:34:23e::1" ]; }; }; "ctu.cx" = {
diff --git a/config/nixos/modules/websites/ip.zaphyra.eu.nix b/config/nixos/modules/websites/ip.zaphyra.eu.nix @@ -41,39 +41,39 @@ in extraConfig = "types { } default_type 'text/html; charset=utf-8';"; return = '' 200 ' - <!DOCTYPE html> - <html> - <head> - <title>ip.${cfg.domain}</title> - </head> - <body> - <h1>ip.${cfg.domain}</h1> - <ul> - <li><span style="user-select: none;"><b>IPv6:</b> </span><span id="ip6">Loading...</span></li> - <li><span style="user-select: none;"><b>IPv4:</b> </span><span id="ip4">Loading...</span></li> - </ul> - <p>Use bash and curl: <code>curl ip{4,6}.${cfg.domain}</code></p> - <p><small>Because any other "Whats my IP?"-tool sucks. <a href="https://git.clerie.de/clerie/ip.clerie.de">Host yourself :3</a></small></p> + <!DOCTYPE html> + <html> + <head> + <title>ip.${cfg.domain}</title> + </head> + <body> + <h1>ip.${cfg.domain}</h1> + <ul> + <li><span style="user-select: none;"><b>IPv6:</b> </span><span id="ip6">Loading...</span></li> + <li><span style="user-select: none;"><b>IPv4:</b> </span><span id="ip4">Loading...</span></li> + </ul> + <p>Use bash and curl: <code>curl ip{4,6}.${cfg.domain}</code></p> + <p><small>Because any other "Whats my IP?"-tool sucks. <a href="https://git.clerie.de/clerie/ip.clerie.de">Host yourself :3</a></small></p> - <script> - window.addEventListener("DOMContentLoaded", (event) => { - [ "ip6", "ip4" ].forEach(async (ipVersion) => { - try { - const url = "https://" + ipVersion + ".${cfg.domain}/"; - const response = await fetch(url + ((/\?/).test(url) ? "&" : "?") + (new Date()).getTime()); - if(response.status != 200) { - document.getElementById(ipVersion).innerText = "Error!"; - } else { - document.getElementById(ipVersion).innerText = await response.text(); - } - } catch { - document.getElementById(ipVersion).innerText = "Error!"; - } - }); - }); - </script> - </body> - </html>' + <script> + window.addEventListener("DOMContentLoaded", (event) => { + [ "ip6", "ip4" ].forEach(async (ipVersion) => { + try { + const url = "https://" + ipVersion + ".${cfg.domain}/"; + const response = await fetch(url + ((/\?/).test(url) ? "&" : "?") + (new Date()).getTime()); + if(response.status != 200) { + document.getElementById(ipVersion).innerText = "Error!"; + } else { + document.getElementById(ipVersion).innerText = await response.text(); + } + } catch { + document.getElementById(ipVersion).innerText = "Error!"; + } + }); + }); + </script> + </body> + </html>' ''; }; };
diff --git a/config/nixos/modules/websites/things.zaphyra.eu.nix b/config/nixos/modules/websites/things.zaphyra.eu.nix @@ -44,8 +44,8 @@ in }; services.things = { - enable = true; - storagePath = "/var/lib/things"; + enable = true; + storagePath = "/var/lib/things"; nginx.enable = true; nginx.domain = "${cfg.subdomain}.${cfg.domain}"; };
diff --git a/config/nixosModules.nix b/config/nixosModules.nix @@ -13,7 +13,7 @@ let modules = inputs.haumea.lib.load { src = ./nixos; transformer = [ - (inputs.haumea.lib.transformers.liftDefault) + inputs.haumea.lib.transformers.liftDefault ( _: lib.mapAttrs (