From 18b37f92e044f9bf307404fb243037fcf824ee84 Mon Sep 17 00:00:00 2001
From: Noa Aarts <noa@voorwaarts.nl>
Date: Wed, 30 Apr 2025 21:02:50 +0200
Subject: [PATCH] fix evaluation warnings

---
 common/home/default.nix          | 3 +--
 modules/applications/zsh.nix     | 3 ---
 packages/niri-config/default.nix | 6 ++++--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/common/home/default.nix b/common/home/default.nix
index c924816..c07c448 100644
--- a/common/home/default.nix
+++ b/common/home/default.nix
@@ -289,8 +289,7 @@ in
           let
             display_config =
               let
-                display-shader = pkgs.substituteAll {
-                  src = ../../modules/automapaper/display-with_vars.glsl;
+                display-shader = pkgs.replaceVars ../../modules/automapaper/display-with_vars.glsl {
                   background = inputs.nix-colors.lib.conversions.hexToGLSLVec config.lib.stylix.colors.base00;
                   foreground = inputs.nix-colors.lib.conversions.hexToGLSLVec config.lib.stylix.colors.base0E;
                 };
diff --git a/modules/applications/zsh.nix b/modules/applications/zsh.nix
index db01ee1..ed4cafc 100644
--- a/modules/applications/zsh.nix
+++ b/modules/applications/zsh.nix
@@ -21,9 +21,6 @@ in
         nbi = "nix build -L -f .";
         ns = "nix shell -L";
       };
-      initExtra = ''
-        [[ ! -r /home/noa/.opam/opam-init/init.zsh ]] || source /home/noa/.opam/opam-init/init.zsh  > /dev/null 2> /dev/null
-      '';
       history = {
         path = "${config.xdg.dataHome}/zsh/history";
         size = 10000;
diff --git a/packages/niri-config/default.nix b/packages/niri-config/default.nix
index 1ab50d2..41d425b 100644
--- a/packages/niri-config/default.nix
+++ b/packages/niri-config/default.nix
@@ -36,8 +36,7 @@ let
     ''
   ) displays;
 in
-pkgs.substituteAll {
-  src = ./template.kdl;
+pkgs.replaceVars ./template.kdl {
   terminal = terminal;
   launcher = launcher;
   power_menu = power-menu;
@@ -45,4 +44,7 @@ pkgs.substituteAll {
 
   displays = displays-string;
   autostart = autostart-string;
+
+  DEFAULT_AUDIO_SINK = null;
+  DEFAULT_AUDIO_SOURCE = null;
 }