From b3aa2bc9ca4f5a164984495d26e08e50fb15d3a4 Mon Sep 17 00:00:00 2001
From: Christoph Hollizeck <christoph.hollizeck@hey.com>
Date: Sat, 22 Nov 2025 17:13:41 +0100
Subject: [PATCH 1/2] adguardhome: add persistent client

---
 modules/hosts/nixberry/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/modules/hosts/nixberry/default.nix b/modules/hosts/nixberry/default.nix
index c2548d1..ad0bc99 100644
--- a/modules/hosts/nixberry/default.nix
+++ b/modules/hosts/nixberry/default.nix
@@ -173,6 +173,16 @@ in
                 uid = "019aac26-684c-7c2c-a43d-2253f4407d45";
                 use_global_settings = true;
               }
+              {
+                name = "work-laptop";
+                ids = [ "192.168.178.48" ];
+                tags = [
+                  "device_pc"
+                  "os_windows"
+                ];
+                uid = "019aac55-ae29-7c5e-aac0-baadd7157f92";
+                use_global_settings = true;
+              }
             ];
           };
 

From 0647ff2d7abd455be9fa81c689bc992023487b8c Mon Sep 17 00:00:00 2001
From: Christoph Hollizeck <christoph.hollizeck@hey.com>
Date: Sat, 22 Nov 2025 17:14:02 +0100
Subject: [PATCH 2/2] fish: adjust deploy commands

---
 modules/base/fish.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/modules/base/fish.nix b/modules/base/fish.nix
index f4a91c6..d3c52ad 100644
--- a/modules/base/fish.nix
+++ b/modules/base/fish.nix
@@ -24,7 +24,12 @@
       };
 
     homeManager.base =
-      { lib, pkgs, ... }:
+      {
+        lib,
+        osConfig,
+        pkgs,
+        ...
+      }:
       {
         catppuccin.fish.enable = true;
 
@@ -50,8 +55,8 @@
             };
             functions = {
               checkHash = "nix hash to-sri --type sha256 $(nix-prefetch-url --unpack $argv)";
-              deployNixberry = "nixos-rebuild switch --flake .#nixberry --target-host nixberry --sudo --ask-sudo-password";
-              deployLoptland = "nixos-rebuild switch --flake .#loptland --target-host christophhollizeck.dev --sudo --ask-sudo-password";
+              deployNixberry = "${lib.getExe osConfig.programs.nh.package} os switch --target-host nixberry -H nixberry";
+              deployLoptland = "${lib.getExe osConfig.programs.nh.package} os switch --target-host christophhollizeck.dev -H loptland";
               checkPR = ''cd /home/cholli/projects/NixOS/nixpkgs && ${lib.getExe pkgs.nixpkgs-review} pr $argv --post-result --systems "x86_64-linux aarch64-linux"'';
             };
             plugins = with pkgs.fishPlugins; [