ctucx.git: nixfiles

ctucx' nixfiles

commit 1d9b34df10329b1f27008e6aa52652aeefce1416
parent 21cea53aae8a5cc0eb9bb0acb51837368c999725
Author: Leah (ctucx) <git@ctu.cx>
Date: Tue, 11 Jun 2024 21:20:50 +0200

configurations/linux: disable nix-channels
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/configurations/common/default.nix b/configurations/common/default.nix
@@ -34,8 +34,8 @@ in {
   ];
 
   nix = {
-    nixPath  = lib.mkForce [ "nixpkgs=${NIXPKGS_PATH}" ];
-    settings = {
+    nixPath        = lib.mkForce [ "nixpkgs=${NIXPKGS_PATH}" ];
+    settings       = {
       trusted-users         = [ "root" "leah" "@wheel" ];
       experimental-features = [ "nix-command" "flakes" ];
       extra-substituters = [
diff --git a/configurations/linux/default.nix b/configurations/linux/default.nix
@@ -25,6 +25,7 @@
   i18n.supportedLocales = ["de_DE.UTF-8/UTF-8" "en_US.UTF-8/UTF-8"];
 
   nix = {
+    channel.enable               = false;
     settings.trusted-users       = [ "@wheel" ];
     settings.auto-optimise-store = true;
     optimise     = {
diff --git a/modules/linux/vnstati/default.nix b/modules/linux/vnstati/default.nix
@@ -55,9 +55,6 @@ in {
       startAt     = "*-*-* *:0/10:00";
 
       path        = with pkgs; [ vnstat jq nix ];
-      environment = {
-        NIX_PATH = "nixpkgs=${lib.cleanSource pkgs.path}";
-      };
 
       serviceConfig = {
         User           = "vnstatd";

@@ -73,7 +70,7 @@ in {
         ifaces=$(vnstat --json | jq -r .interfaces[].name | grep -v "^lo$")
         echo $ifaces
 
-        nix eval --raw -f ${./vnstati-html.nix} html \
+        nix eval -I nixpkgs=${lib.cleanSource pkgs.path} --raw -f ${./vnstati-html.nix} html \
           --argstr ifaces "$ifaces" \
           --argstr hostname "${cfg.title}" \
           > /var/lib/vnstati/index.html