diff options
-rw-r--r-- | modules/common/common/nix/default.nix | 2 | ||||
-rw-r--r-- | modules/common/profiles/headful.nix | 1 | ||||
-rw-r--r-- | modules/nixos/firefox/default.nix | 6 | ||||
-rw-r--r-- | modules/nixos/monitoring/default.nix | 5 | ||||
-rw-r--r-- | modules/nixos/profiles/headful.nix | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/modules/common/common/nix/default.nix b/modules/common/common/nix/default.nix index 45f8ed3..c06296d 100644 --- a/modules/common/common/nix/default.nix +++ b/modules/common/common/nix/default.nix @@ -99,7 +99,7 @@ with lib; { patches = [./patches/alejandra-no-ads.patch]; }); - inherit (pkgsPR "222519" "sha256-XQOs0rMs6GMXUZfzjYZiP7lTBOfqF3dsdWGr1rCQeH0=") grafanaPlugins; + inherit (pkgsPR "224461" "sha256-5+GjqIYkHXfOFRFOZUiy+/OJ0USHrDp5vJebv3XErbw=") ntfy-sh; } // (with super; let np = nodePackages; diff --git a/modules/common/profiles/headful.nix b/modules/common/profiles/headful.nix index 2be1b87..e5490b5 100644 --- a/modules/common/profiles/headful.nix +++ b/modules/common/profiles/headful.nix @@ -19,7 +19,6 @@ in { aria2.enable = true; emacs.enable = true; mpv.enable = true; - nullmailer.enable = true; openssh.client.enable = true; password-store.enable = true; }; diff --git a/modules/nixos/firefox/default.nix b/modules/nixos/firefox/default.nix index 4f16767..da78a1c 100644 --- a/modules/nixos/firefox/default.nix +++ b/modules/nixos/firefox/default.nix @@ -140,7 +140,7 @@ in { enable = true; "network.trr.mode" = { enable = true; - value = 5; + value = 5; # This disables DoH, which ignores system resolvers if enabled. }; }; }; @@ -176,9 +176,7 @@ in { value = true; }; }; - "1200" = { - enable = true; - }; + "1200".enable = true; "1700" = { enable = false; "1701" = { diff --git a/modules/nixos/monitoring/default.nix b/modules/nixos/monitoring/default.nix index 6f74e9f..a492a47 100644 --- a/modules/nixos/monitoring/default.nix +++ b/modules/nixos/monitoring/default.nix @@ -134,7 +134,8 @@ in { static_configs = [ { targets = - mkTargets [ + mkTargets + [ manwe varda yavanna @@ -152,7 +153,7 @@ in { [ manwe ] - config.nixfiles.modules.ntfy.port; + config.nixfiles.modules.ntfy.prometheus.port; } ]; } diff --git a/modules/nixos/profiles/headful.nix b/modules/nixos/profiles/headful.nix index 610f3c7..3bdf8fd 100644 --- a/modules/nixos/profiles/headful.nix +++ b/modules/nixos/profiles/headful.nix @@ -13,6 +13,8 @@ in { firefox.enable = true; sound.enable = true; + nullmailer.enable = true; + dwm.enable = mkDefault false; kde.enable = mkDefault true; xmonad.enable = mkDefault false; |