Skip to content

Commit

Permalink
chore: remove module overrides for nixos-unstable
Browse files Browse the repository at this point in the history
Not needed anymore since the stable input was upgraded to nixos-24.05.
  • Loading branch information
diogotcorreia committed Jun 24, 2024
1 parent d717cb2 commit 7ba65d7
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 21 deletions.
5 changes: 1 addition & 4 deletions hosts/bacchus/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,10 @@
time.timeZone = null;
services.automatic-timezoned = {
enable = true;
package = pkgs.unstable.automatic-timezoned;
package = pkgs.automatic-timezoned;
};
systemd.services.automatic-timezoned = {
serviceConfig = {
# TODO remove on nixos-24.05
ExecStart = lib.mkForce "${lib.getExe config.services.automatic-timezoned.package}";

StateDirectory = "automatic-timezoned";
StateDirectoryMode = "0755";
};
Expand Down
12 changes: 1 addition & 11 deletions hosts/hera/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,11 @@
{
config,
hostSecretsDir,
inputs,
lib,
pkgs,
profiles,
...
}: {
# Fix Docker containers not gracefully shutting down
# https://github.com/NixOS/nixpkgs/pull/248315
# TODO remove in nixos-24.05
disabledModules = ["virtualisation/oci-containers.nix"];
imports =
[
(inputs.nixpkgs-unstable + "/nixos/modules/virtualisation/oci-containers.nix")
]
++ (with profiles; [
imports = (with profiles; [
services.caddy.common
services.ssh
]);
Expand Down
6 changes: 0 additions & 6 deletions hosts/hera/transmission.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,6 @@
socksSocket = "/run/${socketDirectory}/transmission-socks-proxy";
socketDirectory = "transmission-proxy";
in {
# TODO transmission.webHome does not exist on 23.11
disabledModules = ["services/torrent/transmission.nix"];
imports = [
"${inputs.nixpkgs-unstable}/nixos/modules/services/torrent/transmission.nix"
];

age.secrets = {
# Contains:
# Host proxy
Expand Down

0 comments on commit 7ba65d7

Please sign in to comment.