WIP: router replace CoreDNS with AdGuard Home

flake.lock

@@ -23,11 +23,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1737057290,
+        "lastModified": 1736730523,
-        "narHash": "sha256-3Pe0yKlCc7EOeq1X/aJVDH0CtNL+tIBm49vpepwL1MQ=",
+        "narHash": "sha256-mvTZ7fLKA6ggGnA8GZwcXV57EvVReRTCfi26xc08Q3g=",
         "owner": "nix-community",
         "repo": "nixos-generators",
-        "rev": "d002ce9b6e7eb467cd1c6bb9aef9c35d191b5453",
+        "rev": "74b8e31dd709760c86eed16b6c1d0b88d7360937",
         "type": "github"
       },
       "original": {
@@ -38,11 +38,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1738142207,
+        "lastModified": 1736701207,
-        "narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=",
+        "narHash": "sha256-jG/+MvjVY7SlTakzZ2fJ5dC3V1PrKKrUEOEE30jrOKA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9d3ae807ebd2981d593cddd0080856873139aa40",
+        "rev": "ed4a395ea001367c1f13d34b1e01aa10290f67d6",
         "type": "github"
       },
       "original": {

flake.nix

@@ -9,13 +9,9 @@
       url = "github:nix-community/nixos-generators";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    home-manager = {
-      url = "github:nix-community/home-manager";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
   };
 
-  outputs = { self, nixpkgs, nixos-generators, home-manager }: {
+  outputs = { self, nixpkgs, nixos-generators }: {
     nixosConfigurations = {
       Yura-PC = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
@@ -31,16 +27,6 @@
           ./modules
           ./hosts/common.nix
           ./hosts/vm
-
-          home-manager.nixosModules.home-manager
-          {
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            home-manager.users.jdoe = import ./home.nix;
-
-            # Optionally, use home-manager.extraSpecialArgs to pass
-            # arguments to home.nix
-          }
         ];
       };
       router = nixpkgs.lib.nixosSystem {

hosts/Yura-PC/default.nix

@@ -23,16 +23,10 @@
     "sysrq_always_enabled=1"
   ];
 
-  # https://nixos.wiki/wiki/OSX-KVM
-  boot.extraModprobeConfig = ''
-    options kvm_amd nested=1
-    options kvm_amd emulate_invalid_guest_state=0
-    options kvm ignore_msrs=1
-  '';
-
   boot.loader.timeout = 3;
   boot.loader.systemd-boot.configurationLimit = 5;
   boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_12;
+  boot.extraModulePackages = with config.boot.kernelPackages; [ zfs ];
 
   # https://nixos.wiki/wiki/Accelerated_Video_Playback
   hardware.graphics = {
@@ -110,7 +104,6 @@
     group = "cazzzer";
     extraGroups = [ "networkmanager" "wheel" "docker" "wireshark" "geoclue" ];
     packages = with pkgs; [
-      # Python
       python3
       poetry
 
@@ -122,9 +115,6 @@
       nodejs_22
       pnpm
       bun
-
-      # Nix
-      nixd
     ];
   };
 
@@ -154,6 +144,7 @@
   virtualisation.docker.package = pkgs.docker_27;
   virtualisation.docker.storageDriver = "zfs";
   
+
   # https://discourse.nixos.org/t/firefox-does-not-use-kde-window-decorations-and-cursor/32132/3
   # programs.dconf.enable = true;
   # programs.firefox = {                  
@@ -180,6 +171,31 @@
     
     # For JetBrains stuff
     # https://github.com/NixOS/nixpkgs/issues/240444
+    curl
+    expat
+    fontconfig
+    freetype
+    fuse
+    fuse3
+    glib
+    icu
+    libclang.lib
+    libdbusmenu
+    libsecret
+    libxcrypt-legacy
+    libxml2
+    nss
+    openssl
+    python3
+    stdenv.cc.cc
+    xorg.libX11
+    xorg.libXcursor
+    xorg.libXext
+    xorg.libXi
+    xorg.libXrender
+    xorg.libXtst
+    xz
+    zlib
   ];
 
   # attempt to fix flatpak firefox cjk fonts

hosts/common.nix

@@ -1,11 +1,4 @@
-{ config, pkgs, inputs, ... }: {
+{ config, pkgs, ... }: {
-  imports = [
-    inputs.home-manager.nixosModules.home-manager
-  ];
-
-  home-manager.useGlobalPkgs = true;
-  home-manager.useUserPackages = true;
-
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
 

hosts/router/default.nix

@@ -399,7 +399,7 @@ in
     # https://adguard-dns.io/kb/general/dns-filtering-syntax/
     user_rules = [
       # DNS rewrites
-      "|grouter.${domain}^$dnsrewrite=${lan_ula_addr}"
+      "${lan_ula_addr} grouter.${domain}"
 
       # Allowed exceptions
       "@@||googleads.g.doubleclick.net"

hosts/vm/default.nix

@@ -22,6 +22,7 @@
 
   boot.loader.systemd-boot.configurationLimit = 5;
   boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_12;
+  boot.extraModulePackages = with config.boot.kernelPackages; [ zfs ];
 
   environment.etc.hosts.mode = "0644";
 

modules/workarounds/flatpak.nix

@@ -24,7 +24,7 @@ in {
       aggregated = pkgs.buildEnv {
         name = "system-fonts-and-icons";
         paths = builtins.attrValues {
-          inherit (pkgs.kdePackages) breeze;
+          inherit (pkgs.libsForQt5) breeze-qt5;
           inherit
             (pkgs)
             noto-fonts