diff --git a/flake.lock b/flake.lock index b7eaca24..9ee6fe0a 100644 --- a/flake.lock +++ b/flake.lock @@ -239,11 +239,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1780030872, - "narHash": "sha256-j1JL8PtaAVdH84cV+Scicmrck1tX0CM60F31md5C/MM=", - "rev": "e9a7635a57597d9754eccebdfc7045e6c8600e6b", + "lastModified": 1780246643, + "narHash": "sha256-JZXtt4Ax1FiEArbgzhLRQ7xrNZQdHIrty5XSwOoXrm8=", + "rev": "3109eaae18e09d0b8aef23dc2579e7d94b8d4b4e", "type": "tarball", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1006943.e9a7635a5759/nixexprs.tar.xz?lastModified=1780030872&rev=e9a7635a57597d9754eccebdfc7045e6c8600e6b" + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1008286.3109eaae18e0/nixexprs.tar.xz?lastModified=1780246643&rev=3109eaae18e09d0b8aef23dc2579e7d94b8d4b4e" }, "original": { "type": "tarball", @@ -286,8 +286,7 @@ "nixpkgs": "nixpkgs", "simple-nixos-mailserver": "simple-nixos-mailserver", "sops": "sops", - "spicetify": "spicetify", - "tranquil": "tranquil" + "spicetify": "spicetify" } }, "rust-overlay": { @@ -389,26 +388,6 @@ "repo": "default", "type": "github" } - }, - "tranquil": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1780251096, - "narHash": "sha256-F18TqjN60KJnanUYFJknbvwuFZ2c3iir/FlWrczn26o=", - "ref": "refs/heads/main", - "rev": "22f82489d5bca90547f2bb8bc47f1eee02bd90e3", - "revCount": 397, - "type": "git", - "url": "https://tangled.org/tranquil.farm/tranquil-pds" - }, - "original": { - "type": "git", - "url": "https://tangled.org/tranquil.farm/tranquil-pds" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index f90a5a10..3ae75c51 100644 --- a/flake.nix +++ b/flake.nix @@ -87,11 +87,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - tranquil = { - url = "git+https://tangled.org/tranquil.farm/tranquil-pds"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - ### misc # declarative theme management catppuccin = { diff --git a/modules/nixos/services/tranquil.nix b/modules/nixos/services/tranquil.nix index 6a623e1a..9c01c52a 100644 --- a/modules/nixos/services/tranquil.nix +++ b/modules/nixos/services/tranquil.nix @@ -2,7 +2,6 @@ lib, self, config, - inputs, ... }: let @@ -17,8 +16,6 @@ in domain = "pds.isabelroses.com"; }; - imports = [ inputs.tranquil.nixosModules.default ]; - config = mkIf cfg.enable { sops.secrets.tranquil-env = mkSecret { file = "tranquil";