feat: Use nixpkgs dae module instead of dae/flake

This commit is contained in:
ulic-youthlic 2025-10-28 23:22:41 +08:00
parent d187a67afe
commit 1e6d5fbe02
Signed by: youthlic
GPG key ID: 63E86C3C14A0D721
7 changed files with 9 additions and 48 deletions

24
flake.lock generated
View file

@ -128,29 +128,6 @@
"type": "github" "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": { "deploy-rs": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
@ -1430,7 +1407,6 @@
"inputs": { "inputs": {
"betterfox-nix": "betterfox-nix", "betterfox-nix": "betterfox-nix",
"chaotic": "chaotic", "chaotic": "chaotic",
"dae": "dae",
"deploy-rs": "deploy-rs", "deploy-rs": "deploy-rs",
"disko": "disko", "disko": "disko",
"emacs-overlay": "emacs-overlay", "emacs-overlay": "emacs-overlay",

View file

@ -106,16 +106,6 @@
ref = "master"; ref = "master";
}; };
dae = {
type = "github";
owner = "daeuniverse";
repo = "flake.nix";
inputs = {
nixpkgs.follows = "nixpkgs";
flake-parts.follows = "flake-parts";
};
};
flake-parts = { flake-parts = {
type = "github"; type = "github";
owner = "hercules-ci"; owner = "hercules-ci";

View file

@ -1,6 +1,6 @@
include { include {
proxy.d/*.dae proxy.d_*.dae
local.d/*.dae local.d_*.dae
} }
global { global {

View file

@ -18,13 +18,12 @@ in
(lib.mkIf cfg.enable { (lib.mkIf cfg.enable {
services.dae = { services.dae = {
enable = true; enable = true;
package = pkgs.dae;
openFirewall = { openFirewall = {
enable = true; enable = true;
port = 12345; port = 12345;
}; };
disableTxChecksumIpGeneric = false; disableTxChecksumIpGeneric = false;
config = builtins.readFile ./config.dae; configFile = toString ./config.dae;
}; };
sops.secrets.url = { sops.secrets.url = {
mode = "0444"; 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) { (lib.mkIf (cfg.enable && config.youthlic.programs.juicity.client.enable) {

View file

@ -7,7 +7,6 @@
{ {
imports = with inputs; [ imports = with inputs; [
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
dae.nixosModules.dae
sops-nix.nixosModules.sops sops-nix.nixosModules.sops
stylix.nixosModules.stylix stylix.nixosModules.stylix
disko.nixosModules.disko disko.nixosModules.disko

View file

@ -1,8 +0,0 @@
{ inputs, ... }:
_final: prev:
let
inherit (prev.stdenv.hostPlatform) system;
in
{
dae = inputs.dae.packages."${system}".dae-unstable;
}

View file

@ -5,7 +5,6 @@ let
in in
[ [
./niri.nix ./niri.nix
./dae.nix
./spotifyx.nix ./spotifyx.nix
./radicle-explorer.nix ./radicle-explorer.nix
./wshowkeys.nix ./wshowkeys.nix