Minimize pkgs use, add stable channel for unstable systems, more separation and such

modules/system/devices/networking/default.nix

@@ -8,16 +8,17 @@
     nftables.enable = true;
     firewall.allowPing = false;
     nameservers = [
-      "1.1.1.1#one.one.one.one"
-      "1.0.0.1#one.one.one.one"
+      "9.9.9.11#dns11.quad9.net"
+      "149.112.112.11#dns11.quad9.net"
+      "2620:fe::11#dns11.quad9.net"
+      "2620:fe::fe:11#dns11.quad9.net"
     ];
   };
 
   services.resolved = {
     enable = true;
     dnssec = "true";
-    domains = [ "~." ];
-    fallbackDns = config.networking.nameservers;
     dnsovertls = "true";
+    fallbackDns = config.networking.nameservers;
   };
 }

modules/system/devices/video/nvidia/default.nix

@@ -4,21 +4,17 @@
 
   config = lib.mkIf config.system.nvidia.enable {
     hardware.nvidia = {
-      package = config.boot.kernelPackages.nvidiaPackages.beta;
       modesetting.enable = true;
       nvidiaSettings = false;
-      open = false;
+      open = true;
     };
 
     services.xserver.videoDrivers = [ "nvidia" ];
 
-    boot.kernelParams = [ "nvidia_drm.fbdev=1" ];
-
     nixpkgs.allowUnfreePackages = [ "nvidia-x11" ];
 
-    specialisation.nouveau.configuration.config = {
-      system.nvidia.enable = lib.mkForce false;
-      environment.sessionVariables.NIXOS_OZONE_WL = lib.mkForce "";
-    };
+    boot.kernelParams = [ "nvidia_drm.fbdev=1" ];
+
+    specialisation.nouveau.configuration.config.system.nvidia.enable = lib.mkForce false;
   };
 }

modules/system/programs/home-manager/default.nix

@@ -1,10 +1,11 @@
-{ unstable, nur, blender, ... }:
+{ stable, unstable, nur, blender, ... }:
 {
   home-manager = {
     useUserPackages = true;
     backupFileExtension = "bak";
     extraSpecialArgs = {
       inherit
+	stable
         unstable
         nur
         blender

modules/system/settings/nix/channels/default.nix

@@ -0,0 +1,11 @@
+{ config, lib, pkgs, stable, unstable, ... }:
+{
+  _module.args.pkgsStable = import stable {
+    inherit (pkgs.stdenv.hostPlatform) system;
+    inherit (config.nixpkgs) config;
+  };
+  _module.args.pkgsUnstable = import unstable {
+    inherit (pkgs.stdenv.hostPlatform) system;
+    inherit (config.nixpkgs) config;
+  };
+}

modules/system/settings/nix/default.nix

@@ -1,6 +1,7 @@
-{ config, lib, pkgs, unstable, ... }:
+{ pkgs, ... }:
 {
   imports = [
+    ./channels
     ./gc
     ./unfree
   ];
@@ -16,9 +17,4 @@
       trusted-users = [ "@wheel" ];
     };
   };
-
-  _module.args.pkgsUnstable = import unstable {
-    inherit (pkgs.stdenv.hostPlatform) system;
-    inherit (config.nixpkgs) config;
-  };
 }

modules/system/users/default.nix

@@ -1,7 +1,7 @@
-{ home-manager, ... }:
+{ hm, ... }:
 {
   imports = [
     ./main
-    home-manager.nixosModules.home-manager
+    hm.nixosModules.home-manager
   ];
 }