From 46e3af4b065ec0c83faf948d83814053d68bcac0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Jan 2025 22:48:12 +0100 Subject: [PATCH] set gladtherescake.eu mail options for proton migration and add some firefox bookmarks --- .../desktop/package-configs/firefox.nix | 28 +++++++++++++++++-- home-manager/hosts/EDI/lillian.nix | 2 +- home-manager/hosts/GLaDOS/lillian.nix | 2 +- home-manager/hosts/iso/lillian.nix | 2 +- home-manager/hosts/iso_server/lillian.nix | 2 +- home-manager/hosts/queen/lillian.nix | 2 +- home-manager/hosts/shodan/lillian.nix | 2 +- nixos/desktop/default.nix | 1 + nixos/hosts/EDI/configuration.nix | 2 +- nixos/hosts/GLaDOS/configuration.nix | 3 +- nixos/hosts/queen/configuration.nix | 2 +- nixos/hosts/shodan/configuration.nix | 2 +- .../dashboard/grafana/default.nix | 14 +++++----- .../dashboard/prometheus/default.nix | 20 ++++++------- .../package-configs/mail-server/default.nix | 11 ++++++++ 15 files changed, 64 insertions(+), 31 deletions(-) diff --git a/home-manager/desktop/package-configs/firefox.nix b/home-manager/desktop/package-configs/firefox.nix index 16ad709..d4e7342 100644 --- a/home-manager/desktop/package-configs/firefox.nix +++ b/home-manager/desktop/package-configs/firefox.nix @@ -26,9 +26,31 @@ }; bookmarks = [ { - name = "estrogen production"; - tags = ["chemistry" "oestrogen" "estrogen" "diy"]; - url = "https://crimethinc.com/2022/12/15/producing-transdermal-estrogen-a-do-it-yourself-guide"; + name = "DIY HRT"; + toolbar = false; + bookmarks = [ + { + name = "estrogen production"; + tags = ["chemistry" "oestrogen" "estrogen" "diy"]; + url = "https://crimethinc.com/2022/12/15/producing-transdermal-estrogen-a-do-it-yourself-guide"; + } + { + name = "DIY HRT info"; + tags = ["guides" "wiki" "information" "DIY" "HRT" "estrogen" "testosterone"]; + url = "https://diyhrt.info/"; + } + ]; + } + { + name = "repair resources"; + toolbar = false; + bookmarks = [ + { + name = "manuals library"; + tags = ["repair" "manuals" "documentation"]; + url = "https://manualslib.com/"; + } + ]; } { name = "Nix sites"; diff --git a/home-manager/hosts/EDI/lillian.nix b/home-manager/hosts/EDI/lillian.nix index f0cd853..1922c62 100644 --- a/home-manager/hosts/EDI/lillian.nix +++ b/home-manager/hosts/EDI/lillian.nix @@ -19,5 +19,5 @@ ]; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "24.11"; + home.stateVersion = "25.05"; } diff --git a/home-manager/hosts/GLaDOS/lillian.nix b/home-manager/hosts/GLaDOS/lillian.nix index 6985482..4599605 100644 --- a/home-manager/hosts/GLaDOS/lillian.nix +++ b/home-manager/hosts/GLaDOS/lillian.nix @@ -27,5 +27,5 @@ }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "24.11"; + home.stateVersion = "25.05"; } diff --git a/home-manager/hosts/iso/lillian.nix b/home-manager/hosts/iso/lillian.nix index f0cd853..1922c62 100644 --- a/home-manager/hosts/iso/lillian.nix +++ b/home-manager/hosts/iso/lillian.nix @@ -19,5 +19,5 @@ ]; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "24.11"; + home.stateVersion = "25.05"; } diff --git a/home-manager/hosts/iso_server/lillian.nix b/home-manager/hosts/iso_server/lillian.nix index 278806e..2b344a4 100644 --- a/home-manager/hosts/iso_server/lillian.nix +++ b/home-manager/hosts/iso_server/lillian.nix @@ -18,5 +18,5 @@ ]; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "24.11"; + home.stateVersion = "25.05"; } diff --git a/home-manager/hosts/queen/lillian.nix b/home-manager/hosts/queen/lillian.nix index 5acc4b0..9bd29f7 100644 --- a/home-manager/hosts/queen/lillian.nix +++ b/home-manager/hosts/queen/lillian.nix @@ -35,5 +35,5 @@ }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "24.11"; + home.stateVersion = "25.05"; } diff --git a/home-manager/hosts/shodan/lillian.nix b/home-manager/hosts/shodan/lillian.nix index 2fa258f..5dc5094 100644 --- a/home-manager/hosts/shodan/lillian.nix +++ b/home-manager/hosts/shodan/lillian.nix @@ -106,5 +106,5 @@ }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "24.11"; + home.stateVersion = "25.05"; } diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 741eca6..528036f 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -200,6 +200,7 @@ boot = { # tss group has access to TPM devices bootspec.enable = true; + binfmt.emulatedSystems = ["aarch64-linux"]; #boot.kernelPackages = lib.mkForce pkgs.linuxPackages_latest; #boot.supportedFilesystems = ["bcachefs"]; extraModulePackages = with config.boot.kernelPackages; [v4l2loopback.out]; diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index 9d35006..18fa6ab 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -47,5 +47,5 @@ }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "24.11"; + system.stateVersion = "25.05"; } diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index d76725c..c93a152 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -88,7 +88,6 @@ boot = { loader.systemd-boot.enable = true; - binfmt.emulatedSystems = ["aarch64-linux"]; }; # boot.lanzaboote = { @@ -99,5 +98,5 @@ users.users.lillian.extraGroups = ["gamemode"]; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "24.11"; + system.stateVersion = "25.05"; } diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index ecd5ca2..a48deca 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -194,5 +194,5 @@ }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "24.11"; + system.stateVersion = "25.05"; } diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 0979338..bf2886f 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -250,5 +250,5 @@ }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "24.11"; + system.stateVersion = "25.05"; } diff --git a/nixos/server/package-configs/dashboard/grafana/default.nix b/nixos/server/package-configs/dashboard/grafana/default.nix index 2ea84c6..41f696e 100644 --- a/nixos/server/package-configs/dashboard/grafana/default.nix +++ b/nixos/server/package-configs/dashboard/grafana/default.nix @@ -18,13 +18,13 @@ url = "http://localhost:${toString config.services.prometheus.port}"; isDefault = true; } - # { - # name = "Loki"; - # type = "loki"; - # access = "proxy"; - # url = "http://localhost:${config.services.loki.port}"; - # isDefault = true; - # } + { + name = "Loki"; + type = "loki"; + access = "proxy"; + url = "http://localhost:3100"; + isDefault = true; + } ]; }; }; diff --git a/nixos/server/package-configs/dashboard/prometheus/default.nix b/nixos/server/package-configs/dashboard/prometheus/default.nix index 36710a1..fd08b3e 100644 --- a/nixos/server/package-configs/dashboard/prometheus/default.nix +++ b/nixos/server/package-configs/dashboard/prometheus/default.nix @@ -1,4 +1,4 @@ -{...}: { +{config, ...}: { services.prometheus = { enable = true; port = 9001; @@ -16,19 +16,19 @@ job_name = "GrafanaService system"; static_configs = [ { - targets = ["127.0.0.1:9002"]; + targets = ["127.0.0.1:${toString config.services.prometheus.exporters.node.port}"]; } ]; } # Scrape the Loki service - # { - # job_name = "Loki service"; - # static_configs = [ - # { - # targets = ["127.0.0.1:3100"]; - # } - # ]; - # } + { + job_name = "Loki service"; + static_configs = [ + { + targets = ["127.0.0.1:3100"]; + } + ]; + } ]; }; } diff --git a/nixos/server/package-configs/mail-server/default.nix b/nixos/server/package-configs/mail-server/default.nix index 878be36..9f249ed 100644 --- a/nixos/server/package-configs/mail-server/default.nix +++ b/nixos/server/package-configs/mail-server/default.nix @@ -14,11 +14,21 @@ "nextcloud.gladtherescake.eu" "akkoma.gladtherescake.eu" "social.gladtherescake.eu" + "gladtherescake.eu" "lillianviolet.dev" "git.lillianviolet.dev" ]; loginAccounts = { + "me@gladtherescake.eu" = { + hashedPasswordFile = config.sops.secrets."mailpass".path; + aliases = [ + "@gladtherescake.eu" + ]; + catchAll = [ + "gladtherescake.eu" + ]; + }; "no-reply@nextcloud.gladtherescake.eu" = { hashedPasswordFile = config.sops.secrets."mailpass".path; }; @@ -81,6 +91,7 @@ "mail.lillianviolet.dev" "pop3.lillianviolet.dev" "lillianviolet.dev" + "gladtherescake.eu" "mail.gladtherescake.eu" ]; };