feat: Use nixpkgs dae module instead of dae/flake
This commit is contained in:
parent
d187a67afe
commit
1e6d5fbe02
7 changed files with 9 additions and 48 deletions
24
flake.lock
generated
24
flake.lock
generated
|
|
@ -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",
|
||||
|
|
|
|||
10
flake.nix
10
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";
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
include {
|
||||
proxy.d/*.dae
|
||||
local.d/*.dae
|
||||
proxy.d_*.dae
|
||||
local.d_*.dae
|
||||
}
|
||||
|
||||
global {
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1,8 +0,0 @@
|
|||
{ inputs, ... }:
|
||||
_final: prev:
|
||||
let
|
||||
inherit (prev.stdenv.hostPlatform) system;
|
||||
in
|
||||
{
|
||||
dae = inputs.dae.packages."${system}".dae-unstable;
|
||||
}
|
||||
|
|
@ -5,7 +5,6 @@ let
|
|||
in
|
||||
[
|
||||
./niri.nix
|
||||
./dae.nix
|
||||
./spotifyx.nix
|
||||
./radicle-explorer.nix
|
||||
./wshowkeys.nix
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue