diff --git a/flake.lock b/flake.lock index 1bd519b..c8c19fa 100644 --- a/flake.lock +++ b/flake.lock @@ -128,29 +128,6 @@ "type": "github" } }, - "dae": { - "inputs": { - "flake-parts": [ - "flake-parts" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1758615062, - "narHash": "sha256-fX71EN6uogg0fEu/j/iZVjzupMqtuv2DY7Xl/xJQNbo=", - "owner": "daeuniverse", - "repo": "flake.nix", - "rev": "4fa18dd45954f8d56147594029c14822faa8ff42", - "type": "github" - }, - "original": { - "owner": "daeuniverse", - "repo": "flake.nix", - "type": "github" - } - }, "deploy-rs": { "inputs": { "flake-compat": "flake-compat", @@ -1430,7 +1407,6 @@ "inputs": { "betterfox-nix": "betterfox-nix", "chaotic": "chaotic", - "dae": "dae", "deploy-rs": "deploy-rs", "disko": "disko", "emacs-overlay": "emacs-overlay", diff --git a/flake.nix b/flake.nix index c33a7b1..6b20270 100644 --- a/flake.nix +++ b/flake.nix @@ -106,16 +106,6 @@ ref = "master"; }; - dae = { - type = "github"; - owner = "daeuniverse"; - repo = "flake.nix"; - inputs = { - nixpkgs.follows = "nixpkgs"; - flake-parts.follows = "flake-parts"; - }; - }; - flake-parts = { type = "github"; owner = "hercules-ci"; diff --git a/nixos/modules/programs/dae/config.dae b/nixos/modules/programs/dae/config.dae index 51b8383..7133c7e 100644 --- a/nixos/modules/programs/dae/config.dae +++ b/nixos/modules/programs/dae/config.dae @@ -1,6 +1,6 @@ include { - proxy.d/*.dae - local.d/*.dae + proxy.d_*.dae + local.d_*.dae } global { diff --git a/nixos/modules/programs/dae/default.nix b/nixos/modules/programs/dae/default.nix index 1f369e2..84c2b36 100644 --- a/nixos/modules/programs/dae/default.nix +++ b/nixos/modules/programs/dae/default.nix @@ -18,13 +18,12 @@ in (lib.mkIf cfg.enable { services.dae = { enable = true; - package = pkgs.dae; openFirewall = { enable = true; port = 12345; }; disableTxChecksumIpGeneric = false; - config = builtins.readFile ./config.dae; + configFile = toString ./config.dae; }; sops.secrets.url = { mode = "0444"; @@ -125,6 +124,12 @@ in ]; }; }; + dae = { + serviceConfig.LoadCredential = [ + "proxy.d:/etc/dae/proxy.d" + "local.d:/etc/dae/local.d" + ]; + }; }; }) (lib.mkIf (cfg.enable && config.youthlic.programs.juicity.client.enable) { diff --git a/nixos/modules/top-level/default.nix b/nixos/modules/top-level/default.nix index bf66b27..5438a85 100644 --- a/nixos/modules/top-level/default.nix +++ b/nixos/modules/top-level/default.nix @@ -7,7 +7,6 @@ { imports = with inputs; [ home-manager.nixosModules.home-manager - dae.nixosModules.dae sops-nix.nixosModules.sops stylix.nixosModules.stylix disko.nixosModules.disko diff --git a/overlays/modifications/dae.nix b/overlays/modifications/dae.nix deleted file mode 100644 index ed1ea31..0000000 --- a/overlays/modifications/dae.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ inputs, ... }: -_final: prev: -let - inherit (prev.stdenv.hostPlatform) system; -in -{ - dae = inputs.dae.packages."${system}".dae-unstable; -} diff --git a/overlays/modifications/default.nix b/overlays/modifications/default.nix index 7b6c28a..c8200cf 100644 --- a/overlays/modifications/default.nix +++ b/overlays/modifications/default.nix @@ -5,7 +5,6 @@ let in [ ./niri.nix - ./dae.nix ./spotifyx.nix ./radicle-explorer.nix ./wshowkeys.nix