diff --git a/bert/services/http/index.nix b/bert/services/http/index.nix index c358bb0..457bfb2 100644 --- a/bert/services/http/index.nix +++ b/bert/services/http/index.nix @@ -7,7 +7,6 @@ ./home.chandlerswift.com.nix ./isaacswift.com.nix ./katherineandchandler.com.nix - ./lawrencedeerclub.chandlerswift.com.nix ./maps.chandlerswift.com.nix ./music.chandlerswift.com.nix ./preview.chandlerswift.com.nix diff --git a/bert/services/http/lawrencedeerclub.chandlerswift.com.nix b/bert/services/http/lawrencedeerclub.chandlerswift.com.nix deleted file mode 100644 index 90baa16..0000000 --- a/bert/services/http/lawrencedeerclub.chandlerswift.com.nix +++ /dev/null @@ -1,18 +0,0 @@ - -{ - services.caddy.virtualHosts."lawrencedeerclub.chandlerswift.com".extraConfig = '' - encode zstd gzip - file_server - root * /srv/www/lawrencedeerclub.chandlerswift.com - # hide .git # ??? - - handle_errors { - respond "{err.status_code} {err.status_text}" - } - ''; - systemd.tmpfiles.settings."10-lawrencedeerclub-chandlerswift-com" = { - "/srv/www/lawrencedeerclub.chandlerswift.com" = { - d = {}; - }; - }; -} diff --git a/bert/services/monitoring.nix b/bert/services/monitoring.nix index 51c4b7e..8f524c4 100644 --- a/bert/services/monitoring.nix +++ b/bert/services/monitoring.nix @@ -18,22 +18,6 @@ ]; }]; } - { - job_name = "bigbird_zfs"; - static_configs = [{ - targets = [ - "bigbird:9134" - ]; - }]; - } - { - job_name = "bigbird"; - static_configs = [{ - targets = [ - "bigbird:9100" - ]; - }]; - } ]; exporters.node = { enable = true; diff --git a/bigbird/configuration.nix b/bigbird/configuration.nix index 0bac923..5a05bb6 100644 --- a/bigbird/configuration.nix +++ b/bigbird/configuration.nix @@ -37,17 +37,6 @@ services.openssh.settings.PasswordAuthentication = false; users.users.root.openssh.authorizedKeys.keys = [''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEhPyyqS3BGYor3zLbjc8hZuhem3mS8TNmvWogXcnz/b chandler@chandlerswift.com'' ]; - services.prometheus.exporters = { - node = { - enable = true; - enabledCollectors = [ - "systemd" - "zfs" - ]; - openFirewall = true; - }; - }; - # Open ports in the firewall. # networking.firewall.allowedTCPPorts = [ ... ]; # networking.firewall.allowedUDPPorts = [ ... ]; diff --git a/oscar/configuration.nix b/oscar/configuration.nix index c690607..896bcbf 100644 --- a/oscar/configuration.nix +++ b/oscar/configuration.nix @@ -137,8 +137,7 @@ gnome-sound-recorder josm kate - # kicad # https://github.com/NixOS/nixpkgs/issues/335003 - (import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/13456ccaf2874c921891b04fe0c39fc79aa7357f.tar.gz") {}).kicad + kicad libreoffice-qt prismlauncher prusa-slicer @@ -226,19 +225,6 @@ signing.key = null; # "let GnuPG decide what signing key to use depending on commit's author" }; - programs.ssh = { - enable = true; - addKeysToAgent = "yes"; - matchBlocks = { - bigbird = { - user = "root"; - }; - }; - includes = [ - "config.d/*" - ]; - }; - programs.firefox = { enable = true; # profiles = {