WIP: home manager

flake.lock

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

flake.nix

@@ -9,9 +9,13 @@
       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 }: {
+  outputs = { self, nixpkgs, nixos-generators, home-manager }: {
     nixosConfigurations = {
       Yura-PC = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
@@ -27,6 +31,16 @@
           ./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,10 +23,16 @@
     "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 = {
@@ -104,6 +110,7 @@
     group = "cazzzer";
     extraGroups = [ "networkmanager" "wheel" "docker" "wireshark" "geoclue" ];
     packages = with pkgs; [
+      # Python
       python3
       poetry
 
@@ -115,6 +122,9 @@
       nodejs_22
       pnpm
       bun
+
+      # Nix
+      nixd
     ];
   };
 
@@ -144,7 +154,6 @@
   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 = {                  
@@ -171,31 +180,6 @@
     
     # 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,4 +1,11 @@
-{ config, pkgs, ... }: {
+{ config, pkgs, inputs, ... }: {
+  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

@@ -385,35 +385,26 @@ in
   services.resolved.enable = false;
   networking.resolvconf.enable = true;
   networking.resolvconf.useLocalResolver = true;
-  services.coredns.enable = true;
-  services.coredns.config = ''
-  . {
-      cache {
-          prefetch 100
-      }
-      # Static aliases
-      hosts /etc/coredns.hosts {
-          fallthrough
-      }
-      # Local domains to knot (ddns)
-      forward ${ldomain}. [::1]:1053
 
-      # Quad9
+  services.adguardhome.enable = true;
-      # forward . tls://[2620:fe::fe]:53 tls://9.9.9.9 tls://[2620:fe::9]:53 tls://149.112.112.112 {
+  services.adguardhome.mutableSettings = false;
-      #    tls_servername dns.quad9.net
+  services.adguardhome.settings = {
+    dns = {
+      bootstrap_dns = [ "1.1.1.1" "9.9.9.9" ];
+      upstream_dns = [
+        "quic://p0.freedns.controld.com"  # Default upstream
+        "[/${ldomain}/][::1]:1053"        # Local domains to Knot (ddns)
+      ];
+    };
+    # https://adguard-dns.io/kb/general/dns-filtering-syntax/
+    user_rules = [
+      # DNS rewrites
+      "|grouter.${domain}^$dnsrewrite=${lan_ula_addr}"
 
-      # Cloudflare (seems to be faster)
+      # Allowed exceptions
-      forward . tls://[2606:4700:4700::1112]:53 tls://1.1.1.2 tls://[2606:4700:4700::1002]:53 tls://1.0.0.2 {
+      "@@||googleads.g.doubleclick.net"
-          tls_servername security.cloudflare-dns.com
+    ];
-          health_check 5s
+  };
-      }
-  }
-  '';
-
-  environment.etc."coredns.hosts".text = ''
-    ::1 wow.${domain} hi.${domain}
-    ${lan_ula_addr} grouter.${domain}
-  '';
 
   services.knot.enable = true;
   services.knot.settings = {
@@ -465,7 +456,7 @@ in
   services.prometheus = {
     enable = true;
     exporters = {
-      # TODO: CoreDNS, Kea, Knot, other exporters
+      # TODO: DNS, Kea, Knot, other exporters
       node = {
         enable = true;
         enabledCollectors = [ "systemd" ];
@@ -484,6 +475,7 @@ in
   # https://wiki.nixos.org/wiki/Grafana#Declarative_configuration
   services.grafana = {
     enable = true;
+    settings.server.http_port = 3001;
     provision = {
       enable = true;
       datasources.settings.datasources = [

hosts/vm/default.nix

@@ -22,7 +22,6 @@
 
   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.libsForQt5) breeze-qt5;
+          inherit (pkgs.kdePackages) breeze;
           inherit
             (pkgs)
             noto-fonts