first

configuration.nix

@@ -2,24 +2,13 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
   
-{ config, inputs, pkgs, dankMaterialShell, niri, ... }:
+{ config, inputs, pkgs, dankMaterialShell, ... }:
 {
   imports = [ 
     # Include the results of the hardware scan.
-    # niri.nixosModules.niri
     dankMaterialShell.nixosModules.greeter
     /etc/nixos/hardware-configuration.nix
   ];
-
-  services.xserver = {
-    enable = true;
-    modules = [ pkgs.xorg.xf86videofbdev ];
-    videoDrivers = [ 
-      "hyperv_fb" 
-      "qemu"
-    ];
-  };
-  #services.displayManager.sddm.enable = true;
   
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
@@ -54,9 +43,17 @@
   };
 
   # Configure keymap in X11
-  services.xserver.xkb = {
-    layout = "us";
-    variant = "";
+  services.xserver = {
+    enable = true;
+    modules = [ pkgs.xorg.xf86videofbdev ];
+    videoDrivers = [ 
+      "hyperv_fb" 
+      "qemu"
+    ];
+    xkb = {
+      layout = "us";
+      variant = "";
+    };
   };
 
   # Define a user account. Don't forget to set a password with ‘passwd’.
@@ -72,6 +69,7 @@
   services.getty.autologinUser = "bangae1";
 
   services.spice-vdagentd.enable = true;
+
   services.qemuGuest.enable = true;
 
   # Allow unfree packages
@@ -89,7 +87,6 @@
     xwayland-satellite
     xdg-desktop-portal-gnome
     xdg-desktop-portal-gtk
-    #niri.packages.${pkgs.system}.sessionPackage
     nerd-fonts.jetbrains-mono
     jetbrains-mono
     kime
@@ -118,9 +115,16 @@
   #   enable = true;
   #   enableSSHSupport = true;
   # };
-  #programs.niri.enable = true;
   programs.fish.enable = true;
   programs.firefox.enable = true;
+  programs.uwsm = {
+    enable = true;
+    waylandCompositors.niri = {
+      prettyName = "Niri";
+      comment = "Niri Scrolling Managed";
+      binPath = "/etc/profiles/per-user/bangae1/bin/niri-session";
+    };
+  };
   
   programs.nano.nanorc = ''
     set tabsize 2