Additional Helix & Niri configuration. Various cleanups

modules/system/default.nix

@@ -1,13 +1,9 @@
-{
-  ...
-}:
 {
   imports = [
     ./agenix.nix
     ./boot.nix
     ./desktop.nix
     ./fileSystems.nix
-    ./fonts.nix
     ./network.nix
     ./packages.nix
     ./security.nix

modules/system/desktop.nix

@@ -1,5 +1,6 @@
 {
   inputs,
+  pkgs,
   ...
 }:
 {
@@ -8,7 +9,10 @@
   ];
 
   programs = {
-    niri.enable = true;
+    niri = {
+      enable = true;
+      package = pkgs.niri-unstable;
+    };
     uwsm = {
       enable = true;
       waylandCompositors = {
@@ -20,6 +24,12 @@
     };
   };
 
+  environment.systemPackages = [ pkgs.xwayland-satellite-unstable ];
+
+  nixpkgs.overlays = [
+    inputs.niri.overlays.niri
+  ];
+
   services.displayManager = {
     gdm = {
       enable = true;

modules/system/fonts.nix

@@ -1,17 +0,0 @@
-{
-  pkgs,
-  ...
-}:
-{
-  fonts = {
-    enableDefaultPackages = true;
-    fontconfig.enable = true;
-    packages = with pkgs; [
-      nerd-fonts.fira-code
-      nerd-fonts.jetbrains-mono
-      nerd-fonts.symbols-only
-      nerd-fonts.geist-mono
-      rubik
-    ];
-  };
-}

modules/system/services.nix

@@ -81,6 +81,10 @@
 
     # Enable thermald (only necessary for Intel CPUs)
     thermald.enable = true;
+
+    fwupd.enable = true;
+
+    fprintd.enable = true;
   };
 
   powerManagement = {