From 0e3937d99b1a3c8f9758d817ca340251c3455801 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Sun, 14 Sep 2025 19:23:26 +0800 Subject: [PATCH] vanadium: +nix-monitored --- nix/configurations/vanadium.nix | 48 +++++++++++++++++++-------------- nix/overlays/nix-monitored.nix | 11 ++++++++ npins/sources.json | 14 ++++++++++ 3 files changed, 53 insertions(+), 20 deletions(-) create mode 100644 nix/overlays/nix-monitored.nix diff --git a/nix/configurations/vanadium.nix b/nix/configurations/vanadium.nix index 864c0802..e34f3c58 100644 --- a/nix/configurations/vanadium.nix +++ b/nix/configurations/vanadium.nix @@ -8,6 +8,7 @@ in { config, lib, + pkgs, ... }: let inherit (lib.modules) mkAliasOptionModule; @@ -41,33 +42,42 @@ in rocmSupport = true; }; - overlays = map import [ - ../overlays/agenix.nix - ../overlays/disko.nix - ../overlays/nur.nix - ../overlays/wired-notify.nix - ../overlays/nix-tree.nix - ../overlays/wallpapers.nix - ../overlays/nil.nix - ../overlays/dix.nix - ../overlays/eepy.nix - ../overlays/calibre-no-mime.nix - ../overlays/fcitx5-table-extra-taiwanese.nix + overlays = + map import + [ + ../overlays/agenix.nix + ../overlays/disko.nix + ../overlays/nur.nix + ../overlays/wired-notify.nix + ../overlays/nix-tree.nix + ../overlays/wallpapers.nix + ../overlays/nil.nix + ../overlays/dix.nix + ../overlays/eepy.nix + ../overlays/calibre-no-mime.nix + ../overlays/fcitx5-table-extra-taiwanese.nix - ../overlays/iosevka.nix - ../packages/overlay.nix + ../overlays/iosevka.nix + ../packages/overlay.nix - ./vanadium/overlay.nix + ./vanadium/overlay.nix - # removed, but I need it for PLFA! - ../overlays/pin-emacs28.nix - ]; + # removed, but I need it for PLFA! + ../overlays/pin-emacs28.nix + ] + # use lix everywhere and wrap it with nom + ++ [ + (import (sources.lix-module + "/overlay.nix") {inherit (sources) lix;}) + (import ../overlays/nix-monitored.nix) + ]; # Set NIX_PATH and flake registry at the same time # https://github.com/NixOS/nixpkgs/pull/254405 flake.source = sources.nixpkgs; }; + nix.package = pkgs.nix-monitored; + system.nixos.version = lib.substring 0 8 sources.nixpkgs.revision; } @@ -113,8 +123,6 @@ in (sources.nixos-hardware + "/framework/13-inch/7040-amd") - (import (sources.lix-module + "/module.nix") {inherit (sources) lix;}) - # # home-manager # diff --git a/nix/overlays/nix-monitored.nix b/nix/overlays/nix-monitored.nix new file mode 100644 index 00000000..333d88ab --- /dev/null +++ b/nix/overlays/nix-monitored.nix @@ -0,0 +1,11 @@ +let + sources = import ../../npins; +in + # The final nix is lix in this case + final: prev: { + nix-monitored = + sources.nix-monitored.asFlake.packages.${final.system}.default + .override { + inherit (final) nix; + }; + } diff --git a/npins/sources.json b/npins/sources.json index 16ca00c5..09079b06 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -169,6 +169,20 @@ "url": "https://github.com/oxalica/nil/archive/01e573c9e31ba3be7eaa848ba7dfcbd04260163e.tar.gz", "hash": "0j8dix0a29lmszpl0gpv9whrhigs9bj4s2is3rsdwqc6gviqsq92" }, + "nix-monitored": { + "type": "Git", + "repository": { + "type": "GitHub", + "owner": "ners", + "repo": "nix-monitored" + }, + "branch": "master", + "submodules": false, + "revision": "60f3baa4701d58eab86c2d1d9c3d7e820074d461", + "url": "https://github.com/ners/nix-monitored/archive/60f3baa4701d58eab86c2d1d9c3d7e820074d461.tar.gz", + "hash": "1rdyjmxkvyqd5blbzbwfv2b99krx6rkpdzi1ckyby8i676gf9hv7", + "frozen": true + }, "nix-tree": { "type": "GitRelease", "repository": {