From db2e913daa69c86c2041d5d34aa17baf8eaa2a82 Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Mon, 23 Mar 2026 14:48:48 +0800 Subject: [PATCH] feat: Use dae flake for unstable version --- flake.lock | 179 +++++++++++++++++-------- flake.nix | 7 + nixos/modules/nix.nix | 1 + nixos/modules/programs/dae/config.dae | 4 +- nixos/modules/programs/dae/default.nix | 11 +- nixos/modules/top-level/default.nix | 1 + overlays/modifications/dae.nix | 5 + overlays/modifications/default.nix | 1 + 8 files changed, 144 insertions(+), 65 deletions(-) create mode 100644 overlays/modifications/dae.nix diff --git a/flake.lock b/flake.lock index 673bab0..1620fb9 100644 --- a/flake.lock +++ b/flake.lock @@ -115,6 +115,25 @@ "type": "github" } }, + "dae-flake": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1771591323, + "narHash": "sha256-uX6uAWdCdfzgv6dQ+O2Lj5QzkfN6BflyOsxj1pEael0=", + "owner": "daeuniverse", + "repo": "flake.nix", + "rev": "62d55a8172c5ec028b21d50ea54c7c73107db6aa", + "type": "github" + }, + "original": { + "owner": "daeuniverse", + "repo": "flake.nix", + "type": "github" + } + }, "deploy-rs": { "inputs": { "flake-compat": "flake-compat", @@ -175,7 +194,7 @@ }, "emacs-overlay": { "inputs": { - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { @@ -297,16 +316,14 @@ }, "flake-parts": { "inputs": { - "nixpkgs-lib": [ - "nixpkgs" - ] + "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1772408722, - "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", + "lastModified": 1767609335, + "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", + "rev": "250481aafeb741edfe23d29195671c19b36b6dca", "type": "github" }, "original": { @@ -318,7 +335,6 @@ "flake-parts_2": { "inputs": { "nixpkgs-lib": [ - "neovim-nightly", "nixpkgs" ] }, @@ -338,7 +354,10 @@ }, "flake-parts_3": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib" + "nixpkgs-lib": [ + "neovim-nightly", + "nixpkgs" + ] }, "locked": { "lastModified": 1772408722, @@ -373,6 +392,24 @@ } }, "flake-parts_5": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_3" + }, + "locked": { + "lastModified": 1772408722, + "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_6": { "inputs": { "nixpkgs-lib": [ "nixvim", @@ -393,7 +430,7 @@ "type": "github" } }, - "flake-parts_6": { + "flake-parts_7": { "inputs": { "nixpkgs-lib": [ "nur", @@ -536,7 +573,7 @@ }, "helix": { "inputs": { - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "rust-overlay": "rust-overlay" }, "locked": { @@ -577,7 +614,7 @@ "lanzaboote": { "inputs": { "crane": "crane", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "pre-commit": "pre-commit", "rust-overlay": "rust-overlay_2" }, @@ -598,9 +635,9 @@ }, "neovim-nightly": { "inputs": { - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts_3", "neovim-src": "neovim-src", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1773792437, @@ -695,8 +732,8 @@ "cachyos-kernel": "cachyos-kernel", "cachyos-kernel-patches": "cachyos-kernel-patches", "flake-compat": "flake-compat_3", - "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_5" + "flake-parts": "flake-parts_4", + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1773804995, @@ -737,9 +774,9 @@ }, "nix-gaming": { "inputs": { - "flake-parts": "flake-parts_4", + "flake-parts": "flake-parts_5", "git-hooks": "git-hooks", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1773801820, @@ -797,11 +834,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1773734432, - "narHash": "sha256-IF5ppUWh6gHGHYDbtVUyhwy/i7D261P7fWD1bPefOsw=", + "lastModified": 1767767207, + "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cda48547b432e8d3b18b4180ba07473762ec8558", + "rev": "5912c1772a44e31bf1c63c0390b90501e5026886", "type": "github" }, "original": { @@ -812,6 +849,21 @@ } }, "nixpkgs-lib": { + "locked": { + "lastModified": 1765674936, + "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixpkgs-lib_2": { "locked": { "lastModified": 1772328832, "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=", @@ -826,7 +878,7 @@ "type": "github" } }, - "nixpkgs-lib_2": { + "nixpkgs-lib_3": { "locked": { "lastModified": 1772328832, "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=", @@ -901,6 +953,22 @@ } }, "nixpkgs_10": { + "locked": { + "lastModified": 1770107345, + "narHash": "sha256-tbS0Ebx2PiA1FRW8mt8oejR0qMXmziJmPaU1d4kYY9g=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "4533d9293756b63904b7238acb84ac8fe4c8c2c4", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { "locked": { "lastModified": 1773734432, "narHash": "sha256-IF5ppUWh6gHGHYDbtVUyhwy/i7D261P7fWD1bPefOsw=", @@ -916,7 +984,7 @@ "type": "github" } }, - "nixpkgs_11": { + "nixpkgs_12": { "locked": { "lastModified": 1773389992, "narHash": "sha256-wLdaFm1T0uzQya3eG/5+LPbmyB92jE/AnMtVY6re818=", @@ -929,7 +997,7 @@ "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" } }, - "nixpkgs_12": { + "nixpkgs_13": { "locked": { "lastModified": 1770107345, "narHash": "sha256-tbS0Ebx2PiA1FRW8mt8oejR0qMXmziJmPaU1d4kYY9g=", @@ -946,6 +1014,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1773734432, + "narHash": "sha256-IF5ppUWh6gHGHYDbtVUyhwy/i7D261P7fWD1bPefOsw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "cda48547b432e8d3b18b4180ba07473762ec8558", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1759381078, "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", @@ -961,7 +1045,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1764950072, "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", @@ -977,7 +1061,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1773628058, "narHash": "sha256-hpXH0z3K9xv0fHaje136KY872VT2T5uwxtezlAskQgY=", @@ -993,7 +1077,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1773738184, "narHash": "sha256-zWRjT5oPabNCiC1A3QkFXpfnsgUjyg6fUZWC+IiiZH0=", @@ -1009,7 +1093,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1773507054, "narHash": "sha256-Q8U5VXgrcxmCxPtCCJCIZkcAX3FCZwGh1GNVIXxMND0=", @@ -1025,7 +1109,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1773734432, "narHash": "sha256-IF5ppUWh6gHGHYDbtVUyhwy/i7D261P7fWD1bPefOsw=", @@ -1041,7 +1125,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1770380644, "narHash": "sha256-P7dWMHRUWG5m4G+06jDyThXO7kwSk46C1kgjEWcybkE=", @@ -1057,26 +1141,10 @@ "type": "github" } }, - "nixpkgs_9": { - "locked": { - "lastModified": 1770107345, - "narHash": "sha256-tbS0Ebx2PiA1FRW8mt8oejR0qMXmziJmPaU1d4kYY9g=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "4533d9293756b63904b7238acb84ac8fe4c8c2c4", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixvim": { "inputs": { - "flake-parts": "flake-parts_5", - "nixpkgs": "nixpkgs_8", + "flake-parts": "flake-parts_6", + "nixpkgs": "nixpkgs_9", "systems": "systems_4" }, "locked": { @@ -1139,8 +1207,8 @@ }, "nur": { "inputs": { - "flake-parts": "flake-parts_6", - "nixpkgs": "nixpkgs_10" + "flake-parts": "flake-parts_7", + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1773838371, @@ -1222,10 +1290,11 @@ }, "root": { "inputs": { + "dae-flake": "dae-flake", "deploy-rs": "deploy-rs", "disko": "disko", "emacs-overlay": "emacs-overlay", - "flake-parts": "flake-parts", + "flake-parts": "flake-parts_2", "helix": "helix", "home-manager": "home-manager", "lanzaboote": "lanzaboote", @@ -1236,7 +1305,7 @@ "nix-gaming": "nix-gaming", "nix4nvchad": "nix4nvchad", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "nixpkgs-patch-rqbit-bump": "nixpkgs-patch-rqbit-bump", "nixpkgs-patcher": "nixpkgs-patcher", "nixvim": "nixvim", @@ -1331,7 +1400,7 @@ }, "spicetify-nix": { "inputs": { - "nixpkgs": "nixpkgs_11", + "nixpkgs": "nixpkgs_12", "systems": "systems_6" }, "locked": { @@ -1572,7 +1641,7 @@ }, "treefmt-nix": { "inputs": { - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1772660329, @@ -1590,7 +1659,7 @@ }, "treefmt-nix_2": { "inputs": { - "nixpkgs": "nixpkgs_12" + "nixpkgs": "nixpkgs_13" }, "locked": { "lastModified": 1773297127, diff --git a/flake.nix b/flake.nix index b10fb58..046d39b 100644 --- a/flake.nix +++ b/flake.nix @@ -41,6 +41,7 @@ "https://cache.nixos.org" "https://cache.nixos-cuda.org" "https://attic.xuyh0120.win/lantian" + "https://cache.garnix.io" ]; }; }; @@ -237,5 +238,11 @@ owner = "Gerg-L"; repo = "spicetify-nix"; }; + + dae-flake = { + type = "github"; + owner = "daeuniverse"; + repo = "flake.nix"; + }; }; } diff --git a/nixos/modules/nix.nix b/nixos/modules/nix.nix index e8bd529..fdcfd8d 100644 --- a/nixos/modules/nix.nix +++ b/nixos/modules/nix.nix @@ -49,6 +49,7 @@ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "cache.nixos-cuda.org:74DUi4Ye579gUqzH4ziL9IyiJBlDpMRn9MBN8oNan9M=" "lantian:EeAUQ+W+6r7EtwnmYjeVwx5kOGEBpjlBfPlzGlTNvHc=" + "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" ]; auto-optimise-store = lib.mkDefault true; experimental-features = [ diff --git a/nixos/modules/programs/dae/config.dae b/nixos/modules/programs/dae/config.dae index 21f4ae0..8eafd28 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 518b2af..2556b73 100644 --- a/nixos/modules/programs/dae/default.nix +++ b/nixos/modules/programs/dae/default.nix @@ -16,12 +16,13 @@ in { (lib.mkIf cfg.enable { services.dae = { enable = true; + package = pkgs.dae; openFirewall = { enable = true; port = 12345; }; disableTxChecksumIpGeneric = false; - configFile = toString ./config.dae; + config = builtins.readFile ./config.dae; }; sops.secrets.url = { mode = "0444"; @@ -44,7 +45,7 @@ in { echo "" > ''${config} { echo 'subscription {' - echo \ \ wget:\ \"file://proxy.d_''${num}.txt\" + echo \ \ wget:\ \"file://proxy.d/''${num}.txt\" echo "}" } >> ''${config} if [[ ! -s ''${txt} ]]; then @@ -120,12 +121,6 @@ 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 95d7c30..9561fa5 100644 --- a/nixos/modules/top-level/default.nix +++ b/nixos/modules/top-level/default.nix @@ -10,6 +10,7 @@ stylix.nixosModules.stylix disko.nixosModules.disko nixvim.nixosModules.nixvim + dae-flake.nixosModules.dae ./.. ]; diff --git a/overlays/modifications/dae.nix b/overlays/modifications/dae.nix new file mode 100644 index 0000000..b314be1 --- /dev/null +++ b/overlays/modifications/dae.nix @@ -0,0 +1,5 @@ +{inputs, ...}: _final: prev: let + inherit (prev.stdenv.hostPlatform) system; +in { + dae = inputs.dae-flake.packages.${system}.dae-unstable; +} diff --git a/overlays/modifications/default.nix b/overlays/modifications/default.nix index 038d7c4..b61f7f4 100644 --- a/overlays/modifications/default.nix +++ b/overlays/modifications/default.nix @@ -8,6 +8,7 @@ in ./radicle-explorer.nix ./wshowkeys.nix # ./QQ.nix + ./dae.nix ./helix.nix ./zulip.nix ./nautilus.nix